新增文件导入导出功能

controllers/Validation.go

@@ -2,7 +2,9 @@ package controllers
 
 import (
 	"ERP_storage/conf"
+	"ERP_storage/logs"
 	"ERP_storage/models/Account"
+	"ERP_storage/models/Basic"
 	"ERP_storage/models/Stock"
 	"ERP_storage/models/validationtool"
 	"encoding/json"
@@ -10,10 +12,15 @@ import (
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"github.com/xuri/excelize/v2"
 	userlibs "gogs.baozhida.cn/zoie/ERP_libs/User"
 	"gogs.baozhida.cn/zoie/ERP_libs/lib"
 	"math"
+	"net/url"
+	"os"
+	"strconv"
 	"strings"
+	"time"
 )
 
 type ValidationController struct {
@@ -30,14 +37,14 @@ func (c *ValidationController) AddValidation() {
 	var ValidationList []validationtool.AddValidationTool
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &ValidationList)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "json 序列化失败!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "json 序列化失败!", Data: nil}
 		c.ServeJSON()
 		return
 	}
 	vali := validationtool.NewValidationTool(orm.NewOrm())
 	for _, tool := range ValidationList {
 		if len(tool.T_sn) <= 0 {
-			c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_sn不能为空!", Data: nil}
+			c.Data["json"] = lib.JSONS{Code: 1201, Msg: "T_sn不能为空!", Data: nil}
 			c.ServeJSON()
 			return
 		}
@@ -45,6 +52,7 @@ func (c *ValidationController) AddValidation() {
 		if err != nil {
 			if errors.Is(err, orm.ErrNoRows) {
 				var validataiontool validationtool.ValidationTool
+				atoi, _ := strconv.Atoi(tool.T_class)
 				user := Stock.Read_MqttUser(tool.T_sn)
 				validataiontool.T_iccid = user.Iccid
 				validataiontool.T_imei = user.Imei
@@ -53,9 +61,10 @@ func (c *ValidationController) AddValidation() {
 				validataiontool.T_sn = tool.T_sn
 				validataiontool.T_remark = tool.T_remark
 				validataiontool.T_state = 2
+				validataiontool.T_class = atoi
 				_, err := vali.ADDValidationTool(validataiontool)
 				if err != nil {
-					c.Data["json"] = lib.JSONS{Code: 201, Msg: "入库失败!", Data: nil}
+					c.Data["json"] = lib.JSONS{Code: 1201, Msg: "入库失败!", Data: nil}
 					c.ServeJSON()
 					return
 				}
@@ -74,7 +83,7 @@ func (c *ValidationController) AddValidation() {
 			con["lend_user"] = ""
 			err = vali.UpdateValidationTool(r.T_sn, con)
 			if err != nil {
-				c.Data["json"] = lib.JSONS{Code: 201, Msg: "入库失败!", Data: nil}
+				c.Data["json"] = lib.JSONS{Code: 1201, Msg: "入库失败!", Data: nil}
 				c.ServeJSON()
 				return
 			}
@@ -104,9 +113,10 @@ func (c *ValidationController) ValidationList() {
 	t_imei := c.GetString("t_imei")
 	LendUser := c.GetString("LendUser")
 	T_project := c.GetString("T_project")
+	T_class := c.GetString("T_class")
 	vali := validationtool.NewValidationTool(orm.NewOrm())
 
-	R_List, R_cnt := vali.Read_Validation_List(validationnumber, T_sn, t_iccid, t_imei, T_state, LendUser, T_project, page, page_z)
+	R_List, R_cnt := vali.Read_Validation_List(validationnumber, T_sn, t_iccid, t_imei, T_state, LendUser, T_project, T_class, page, page_z)
 
 	var r_jsons lib.R_JSONS
 	r_jsons.Num = R_cnt
@@ -121,14 +131,14 @@ func (c *ValidationController) ValidationList() {
 func (c *ValidationController) DeleteValidationTool() {
 	id := c.GetString("t_sn")
 	if len(id) <= 0 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "t_sn不能为空!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "t_sn不能为空!", Data: nil}
 		c.ServeJSON()
 		return
 	}
 	vali := validationtool.NewValidationTool(orm.NewOrm())
 	err := vali.DeleteValidationTool(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "删除失败!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "删除失败!", Data: nil}
 		c.ServeJSON()
 		return
 	}
@@ -139,21 +149,21 @@ func (c *ValidationController) UpdateValidationTool() {
 	var lendValidationList []validationtool.LendValidationTool
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &lendValidationList)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "json 序列化失败!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "json 序列化失败!", Data: nil}
 		c.ServeJSON()
 		return
 	}
 	vali := validationtool.NewValidationTool(orm.NewOrm())
 	for _, tool := range lendValidationList {
 		if len(tool.T_sn) <= 0 {
-			c.Data["json"] = lib.JSONS{Code: 201, Msg: "T_sn不能为空!", Data: nil}
+			c.Data["json"] = lib.JSONS{Code: 1201, Msg: "T_sn不能为空!", Data: nil}
 			c.ServeJSON()
 			return
 		}
 		r, err := vali.ReadValidationBytSn(tool.T_sn)
 		sprintf := fmt.Sprintf("当前sn:%v 未入库", tool.T_sn)
 		if err != nil || r.T_state != 2 {
-			c.Data["json"] = lib.JSONS{Code: 201, Msg: sprintf, Data: nil}
+			c.Data["json"] = lib.JSONS{Code: 1201, Msg: sprintf, Data: nil}
 			c.ServeJSON()
 			return
 		}
@@ -174,7 +184,7 @@ func (c *ValidationController) UpdateValidationTool() {
 		}
 		err = vali.UpdateValidationTool(tool.T_sn, con)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 201, Msg: "修改失败!", Data: nil}
+			c.Data["json"] = lib.JSONS{Code: 1201, Msg: "修改失败!", Data: nil}
 			c.ServeJSON()
 			return
 		}
@@ -188,14 +198,14 @@ func (c *ValidationController) UpdateValidationTool() {
 func (c *ValidationController) GetValidationToolBySn() {
 	sn := c.GetString("sn")
 	if len(sn) <= 0 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "sn不能为空!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "sn不能为空!", Data: nil}
 		c.ServeJSON()
 		return
 	}
 	vali := validationtool.NewValidationTool(orm.NewOrm())
 	r, err := vali.ReadValidationBytSn(sn)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "当前设备不存在!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "当前设备不存在!", Data: nil}
 		c.ServeJSON()
 		return
 	}
@@ -210,13 +220,14 @@ func (c *ValidationController) UpdateValidationToolBySn() {
 	Validationnumber := c.GetString("Validationnumber")
 	T_remark := c.GetString("T_remark")
 	T_state := c.GetString("T_state")
+	T_class := c.GetString("T_class")
 	if len(sn) <= 0 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "sn不能为空!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "sn不能为空!", Data: nil}
 		c.ServeJSON()
 		return
 	}
 	if len(Id) <= 0 {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "Id不能为空!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "Id不能为空!", Data: nil}
 		c.ServeJSON()
 		return
 	}
@@ -230,6 +241,9 @@ func (c *ValidationController) UpdateValidationToolBySn() {
 	if len(T_state) > 0 {
 		con["t_state"] = T_state
 	}
+	if len(T_class) > 0 {
+		con["t_class"] = T_class
+	}
 	vali := validationtool.NewValidationTool(orm.NewOrm())
 	r, err := vali.ReadValidationById(Id)
 	if !strings.EqualFold(r.T_sn, sn) {
@@ -240,10 +254,147 @@ func (c *ValidationController) UpdateValidationToolBySn() {
 	}
 	err = vali.UpdateValidationToolById(Id, con)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "当前设备不存在!", Data: nil}
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "当前设备不存在!", Data: nil}
+		c.ServeJSON()
+		return
+	}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "成功!", Data: nil}
+	c.ServeJSON()
+}
+func (c *ValidationController) ImportExecl() {
+	// 获取上传的文件
+	vali := validationtool.NewValidationTool(orm.NewOrm())
+	f, _, err := c.GetFile("excelFile")
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "读取文件失败!", Data: nil}
+		c.ServeJSON()
+		return
+	}
+	defer f.Close()
+
+	// 读取 Excel 文件
+	reader, err := excelize.OpenReader(f)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "打开文件失败!", Data: nil}
 		c.ServeJSON()
 		return
 	}
+	defer func() {
+		if err := reader.Close(); err != nil {
+			c.Data["json"] = lib.JSONS{Code: 1201, Msg: "关闭文件失败!", Data: nil}
+			c.ServeJSON()
+			return
+		}
+	}()
+	// 读取工作表中的数据
+	rows, err := reader.GetRows("Sheet1")
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 1201, Msg: "读取文件失败!", Data: nil}
+		c.ServeJSON()
+		return
+	}
+	for i, row := range rows {
+		if i == 0 {
+			continue // 忽略第一排
+		}
+		if len(row) >= 4 {
+			atoi, _ := strconv.Atoi(row[2])
+			isout, _ := strconv.Atoi(row[3])
+			user := Stock.Read_MqttUser(row[0])
+			tool := validationtool.ValidationTool{
+				T_sn:             row[0],
+				T_class:          atoi,
+				Validationnumber: row[1],
+				T_uuid:           c.User.T_uuid,
+				T_state:          isout,
+				T_iccid:          user.Iccid,
+				T_imei:           user.Imei,
+			}
+			_, err := vali.ADDValidationTool(tool)
+			if err != nil {
+				sprintf := fmt.Sprintf("设备sn添加失败%v", row[0])
+				c.Data["json"] = lib.JSONS{Code: 1201, Msg: sprintf, Data: nil}
+				c.ServeJSON()
+				return
+			}
+		}
+	}
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "成功!", Data: nil}
 	c.ServeJSON()
 }
+func (c *ValidationController) ExportValidationListExecl() {
+
+	// 分页参数 初始化
+	page, _ := c.GetInt("page")
+	if page < 1 {
+		page = 1
+	}
+	page_z, _ := c.GetInt("page_z")
+	if page_z < 1 {
+		page_z = 9999
+	}
+
+	T_state := c.GetString("T_state")
+	validationnumber := c.GetString("validationnumber")
+	T_sn := c.GetString("T_sn")
+	t_iccid := c.GetString("t_iccid")
+	t_imei := c.GetString("t_imei")
+	LendUser := c.GetString("LendUser")
+	T_project := c.GetString("T_project")
+	T_class := c.GetString("T_class")
+	vali := validationtool.NewValidationTool(orm.NewOrm())
+
+	R_List, _ := vali.Read_Validation_List(validationnumber, T_sn, t_iccid, t_imei, T_state, LendUser, T_project, T_class, page, page_z)
+
+	f := excelize.NewFile() //设置单元格值
+	// 这里设置表头ÒÒ
+	f.SetCellValue("Sheet1", "A1", "序号")
+	f.SetCellValue("Sheet1", "B1", "SN")
+	f.SetCellValue("Sheet1", "C1", "编号")
+	f.SetCellValue("Sheet1", "D1", "模组imei")
+	f.SetCellValue("Sheet1", "E1", "物联网卡号")
+	f.SetCellValue("Sheet1", "F1", "设备类型")
+	f.SetCellValue("Sheet1", "G1", "借出人")
+	f.SetCellValue("Sheet1", "H1", "借出项目")
+	f.SetCellValue("Sheet1", "I1", "备注")
+
+	// 设置列宽
+	f.SetColWidth("Sheet1", "A", "A", 6)
+	f.SetColWidth("Sheet1", "B", "B", 20)
+	f.SetColWidth("Sheet1", "C", "C", 15)
+	f.SetColWidth("Sheet1", "D", "D", 15)
+	f.SetColWidth("Sheet1", "E", "E", 30)
+	f.SetColWidth("Sheet1", "F", "F", 15)
+	f.SetColWidth("Sheet1", "G", "G", 15)
+	f.SetColWidth("Sheet1", "H", "H", 30)
+	f.SetColWidth("Sheet1", "I", "J", 15)
+
+	line := 1
+	for i, v := range R_List {
+		line++
+		r, _ := Basic.Read_ProductClass_ById(v.T_class)
+		f.SetCellValue("Sheet1", fmt.Sprintf("A%d", line), i+1)
+		f.SetCellValue("Sheet1", fmt.Sprintf("B%d", line), v.T_sn)
+		f.SetCellValue("Sheet1", fmt.Sprintf("C%d", line), v.Validationnumber)
+		f.SetCellValue("Sheet1", fmt.Sprintf("D%d", line), v.T_imei)
+		f.SetCellValue("Sheet1", fmt.Sprintf("E%d", line), v.T_iccid)
+		f.SetCellValue("Sheet1", fmt.Sprintf("F%d", line), r.T_name)
+		f.SetCellValue("Sheet1", fmt.Sprintf("G%d", line), v.LendUser)
+		f.SetCellValue("Sheet1", fmt.Sprintf("H%d", line), v.T_project)
+		f.SetCellValue("Sheet1", fmt.Sprintf("I%d", line), v.T_remark)
+	}
+	timeStr := time.Now().Format("20060102150405")
+	fileName := fmt.Sprintf("验证工具记录表%v.xlsx", timeStr)
+	filePath := "ofile/" + "验证工具记录表" + timeStr + ".xlsx"
+	// 保存文件
+	if err := f.SaveAs(filePath); err != nil {
+		logs.Error("文件失败:", err)
+	}
+	defer func() {
+		os.Remove(filePath)
+	}()
+	c.Ctx.Output.Header("Content-Type", "application/vnd.ms-excel;charset=utf8")
+	c.Ctx.Output.Header("Content-Disposition", "attachment; filename="+url.PathEscape(fileName))
+	c.Ctx.Output.Header("Content-Transfer-Encoding", "binary")
+	c.Ctx.Output.Download(filePath, fileName)
+}

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/smartystreets/goconvey v1.8.1
 	github.com/vmihailenco/msgpack/v5 v5.3.5
-	github.com/xuri/excelize/v2 v2.7.1
+	github.com/xuri/excelize/v2 v2.9.0
 	gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20241029034120-31ca607abb2e
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/gorm v1.25.11
@@ -47,19 +47,19 @@ require (
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/qiniu/go-sdk/v7 v7.14.0 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
-	github.com/richardlehane/msoleps v1.0.3 // indirect
+	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/signintech/gopdf v0.16.1 // indirect
 	github.com/smarty/assertions v1.15.0 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
-	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
-	golang.org/x/crypto v0.8.0 // indirect
-	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
+	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -290,8 +290,8 @@ github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs
 github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
-github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN0AQoVM=
-github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
+github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00=
+github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -325,7 +325,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
@@ -337,16 +336,15 @@ github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
-github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 h1:6932x8ltq1w4utjmfMPVj09jdMlkY0aiA6+Skbtl3/c=
-github.com/xuri/efp v0.0.0-20220603152613-6918739fd470/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
-github.com/xuri/excelize/v2 v2.7.1 h1:gm8q0UCAyaTt3MEF5wWMjVdmthm2EHAWesGSKS9tdVI=
-github.com/xuri/excelize/v2 v2.7.1/go.mod h1:qc0+2j4TvAUrBw36ATtcTeC1VCM0fFdAXZOmcF4nTpY=
-github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 h1:OAmKAfT06//esDdpi/DZ8Qsdt4+M5+ltca05dA5bG2M=
-github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
+github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d h1:llb0neMWDQe87IzJLS4Ci7psK/lVsjIS2otl+1WyRyY=
+github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQE=
+github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE=
+github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 h1:hPVCafDV85blFTabnqKgNhDCkJX25eik94Si9cTER4A=
+github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -364,8 +362,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
-golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -378,8 +376,7 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
-golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
+golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -398,8 +395,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -433,10 +428,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -453,10 +446,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -500,15 +491,10 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -516,10 +502,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
@@ -564,8 +548,6 @@ golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

models/validationtool/validation.go

@@ -14,6 +14,7 @@ import (
 type ValidationTool struct {
 	Id                int       `orm:"column(ID);size(11);auto;pk"`
 	T_contract_number string    `orm:"size(256);null"`                                        // 合同编号
+	T_class           int       `orm:"size(20);default(0)"`                                   // 产品分类 T_class=0 冷链验证
 	T_product_id      int       `orm:"size(20);null"`                                         // 产品id
 	Validationnumber  string    `orm:"size(256);null"`                                        // 验证工具编号
 	T_out_number      string    `orm:"size(256);null"`                                        // 出库编号
@@ -53,6 +54,7 @@ type AddValidationTool struct {
 	T_sn             string `json:"T_sn"`
 	Validationnumber string `json:"Validationnumber"`
 	T_remark         string `json:"T_remark"`
+	T_class          string `json:"T_class"`
 }
 type LendValidationTool struct {
 	T_sn             string `json:"T_sn"`
@@ -158,7 +160,7 @@ func (dao *ValidationImpl) ReadValidationById(id string) (r ValidationTool, err
 	return
 }
 
-func (dao *ValidationImpl) Read_Validation_List(Validationnumber, T_sn, T_iccid, T_imei, T_State, LendUser, T_project string, page, page_z int) (r []ValidationTool, cnt int64) {
+func (dao *ValidationImpl) Read_Validation_List(Validationnumber, T_sn, T_iccid, T_imei, T_State, LendUser, T_project, T_class string, page, page_z int) (r []ValidationTool, cnt int64) {
 	var offset int
 	if page <= 1 {
 		offset = 0
@@ -189,6 +191,9 @@ func (dao *ValidationImpl) Read_Validation_List(Validationnumber, T_sn, T_iccid,
 	if len(T_project) > 0 {
 		sqlWhere += " AND t_project like \"%" + T_project + "%\""
 	}
+	if len(T_class) > 0 {
+		sqlWhere += " AND t_class like \"%" + T_class + "%\""
+	}
 	var maps_z []orm2.ParamsList
 	// 获取总条数
 	sql := "SELECT COUNT(*) FROM ValidationTool"

routers/vaildationTool.go

@@ -14,6 +14,8 @@ func init() {
 		beego.NSRouter("/update", &controllers.ValidationController{}, "*:UpdateValidationTool"),               // 修改验证工具
 		beego.NSRouter("/readvaildation", &controllers.ValidationController{}, "*:GetValidationToolBySn"),      // 修改验证工具
 		beego.NSRouter("/updatevaildation", &controllers.ValidationController{}, "*:UpdateValidationToolBySn"), // 修改验证工具
+		beego.NSRouter("/ImportExecl", &controllers.ValidationController{}, "*:ImportExecl"),                   // 读取文件
+		beego.NSRouter("/exportExecl", &controllers.ValidationController{}, "*:ExportValidationListExecl"),     // 读取文件
 	)
 	beego.AddNamespace(vaildationTool)
 }