Merge branch 'test'

@@ -177,10 +177,10 @@ func (srv ExcelDataService) ImportProduct(importDataCommand *command.ImportDataC
 	excelImport := excel.NewExcelImport()
 	excelImport.RowBegin = 3 //第二行开始读取
 	excelImport.DataFields = []excel.DataField{
-		{EnName: "productCode", CnName: "产品编号"},
-		{EnName: "productName", CnName: "*品名"},
-		{EnName: "unit", CnName: "*规格"},
-		{EnName: "productCategory", CnName: "*类别"},
+		{EnName: "productCode", CnName: "*产品编号"},
+		{EnName: "productName", CnName: "品名"},
+		{EnName: "unit", CnName: "规格"},
+		{EnName: "productCategory", CnName: "类别"},
 		{EnName: "unitWeight", CnName: "投入单份重量"},
 	}
 	excelData, err := converter.OpenImportFileFromIoReader(excelImport, importDataCommand.Reader, importDataCommand.FileExt) //excelImport.OpenExcelFromIoReader(importDataCommand.Reader)
@@ -483,7 +483,7 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import
 		domain.ImportDividendsOrders:       "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743206_NPYTKw6RGhXn4TpYNEQhGGdCkXKXTnxM.xlsx",
 		domain.ImportCooperationUser:       "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210926/object/1632635345_SbfzmkXjQHhCwPw4MB7zb5EBBtdp2MSE.xlsx",
 		domain.ImportDividendsReturnOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743214_rNHm6ZBXZaC5xKTrsE7M4h45MY6n6Ff3.xlsx",
-		domain.ImportProducts:              "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20220120/object/1642670543_cbraNKjNPHcbN6RNBYQBrwhC7BXGbDWp.xlsx",
+		domain.ImportProducts:              "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/opportunity/dev_online/20220628/object/1656396441_5Ms2hRRk2Z7fTW32RWjwdKfhA5wM5YeZ.xlsx",
 		domain.ImportDevices:               "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20220126/object/1643184320_hT6sY5BKHmBa4TynfSGSCGyZ2KTTtzkj.xlsx",
 		domain.ImportCosts:                 "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/opportunity/dev_online/20220616/object/1655349687_CjpXGrjD4EH2jrw4SXJmHkaQZXKQcT56.xlsx",
 	}

@@ -22,6 +22,10 @@ func init() {
 	web.Post("/v1/manufacture-weigh/product-plans/submit-product-record", middleware.RedirectManufactureWeigh())
 	// 车间员工
 	web.Post("/v1/manufacture-weigh/product-groups/employee-signing", middleware.RedirectManufactureWeigh())
+	// 生产记录撤回
+	web.Post("/v1/manufacture-weigh/product-records/cancel", middleware.RedirectManufactureWeigh())
+	// 历史记录
+	web.Post("/v1/manufacture-weigh/product-records/history", middleware.RedirectManufactureWeigh())
 
 	// 车间生产效率
 	web.Post("/v1/manufacture-weigh/statistics/workshop-production-efficiency-statistics", middleware.RedirectManufactureWeigh())