allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 e280e66c077a5d1ecdf7d2705c6fe9f34ee5abbf 2 个父辈 17d7ed59 74c1064f

Merge branch 'test'

内嵌 并排对比
正在显示 2 个修改的文件 包含 9 行增加 和 5 行删除
@@ -177,10 +177,10 @@ func (srv ExcelDataService) ImportProduct(importDataCommand *command.ImportDataC @@ -177,10 +177,10 @@ func (srv ExcelDataService) ImportProduct(importDataCommand *command.ImportDataC
177 excelImport := excel.NewExcelImport() 177 excelImport := excel.NewExcelImport()
178 excelImport.RowBegin = 3 //第二行开始读取 178 excelImport.RowBegin = 3 //第二行开始读取
179 excelImport.DataFields = []excel.DataField{ 179 excelImport.DataFields = []excel.DataField{
180 - {EnName: "productCode", CnName: "产品编号"},  
181 - {EnName: "productName", CnName: "*品名"},  
182 - {EnName: "unit", CnName: "*规格"},  
183 - {EnName: "productCategory", CnName: "*类别"}, 180 + {EnName: "productCode", CnName: "*产品编号"},
  181 + {EnName: "productName", CnName: "品名"},
  182 + {EnName: "unit", CnName: "规格"},
  183 + {EnName: "productCategory", CnName: "类别"},
184 {EnName: "unitWeight", CnName: "投入单份重量"}, 184 {EnName: "unitWeight", CnName: "投入单份重量"},
185 } 185 }
186 excelData, err := converter.OpenImportFileFromIoReader(excelImport, importDataCommand.Reader, importDataCommand.FileExt) //excelImport.OpenExcelFromIoReader(importDataCommand.Reader) 186 excelData, err := converter.OpenImportFileFromIoReader(excelImport, importDataCommand.Reader, importDataCommand.FileExt) //excelImport.OpenExcelFromIoReader(importDataCommand.Reader)
@@ -483,7 +483,7 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import @@ -483,7 +483,7 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import
483 domain.ImportDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743206_NPYTKw6RGhXn4TpYNEQhGGdCkXKXTnxM.xlsx", 483 domain.ImportDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743206_NPYTKw6RGhXn4TpYNEQhGGdCkXKXTnxM.xlsx",
484 domain.ImportCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210926/object/1632635345_SbfzmkXjQHhCwPw4MB7zb5EBBtdp2MSE.xlsx", 484 domain.ImportCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210926/object/1632635345_SbfzmkXjQHhCwPw4MB7zb5EBBtdp2MSE.xlsx",
485 domain.ImportDividendsReturnOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743214_rNHm6ZBXZaC5xKTrsE7M4h45MY6n6Ff3.xlsx", 485 domain.ImportDividendsReturnOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743214_rNHm6ZBXZaC5xKTrsE7M4h45MY6n6Ff3.xlsx",
486 - domain.ImportProducts: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20220120/object/1642670543_cbraNKjNPHcbN6RNBYQBrwhC7BXGbDWp.xlsx", 486 + domain.ImportProducts: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/opportunity/dev_online/20220628/object/1656396441_5Ms2hRRk2Z7fTW32RWjwdKfhA5wM5YeZ.xlsx",
487 domain.ImportDevices: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20220126/object/1643184320_hT6sY5BKHmBa4TynfSGSCGyZ2KTTtzkj.xlsx", 487 domain.ImportDevices: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20220126/object/1643184320_hT6sY5BKHmBa4TynfSGSCGyZ2KTTtzkj.xlsx",
488 domain.ImportCosts: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/opportunity/dev_online/20220616/object/1655349687_CjpXGrjD4EH2jrw4SXJmHkaQZXKQcT56.xlsx", 488 domain.ImportCosts: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/opportunity/dev_online/20220616/object/1655349687_CjpXGrjD4EH2jrw4SXJmHkaQZXKQcT56.xlsx",
489 } 489 }
@@ -22,6 +22,10 @@ func init() { @@ -22,6 +22,10 @@ func init() {
22 web.Post("/v1/manufacture-weigh/product-plans/submit-product-record", middleware.RedirectManufactureWeigh()) 22 web.Post("/v1/manufacture-weigh/product-plans/submit-product-record", middleware.RedirectManufactureWeigh())
23 // 车间员工 23 // 车间员工
24 web.Post("/v1/manufacture-weigh/product-groups/employee-signing", middleware.RedirectManufactureWeigh()) 24 web.Post("/v1/manufacture-weigh/product-groups/employee-signing", middleware.RedirectManufactureWeigh())
  25 + // 生产记录撤回
  26 + web.Post("/v1/manufacture-weigh/product-records/cancel", middleware.RedirectManufactureWeigh())
  27 + // 历史记录
  28 + web.Post("/v1/manufacture-weigh/product-records/history", middleware.RedirectManufactureWeigh())
25 29
26 // 车间生产效率 30 // 车间生产效率
27 web.Post("/v1/manufacture-weigh/statistics/workshop-production-efficiency-statistics", middleware.RedirectManufactureWeigh()) 31 web.Post("/v1/manufacture-weigh/statistics/workshop-production-efficiency-statistics", middleware.RedirectManufactureWeigh())