From 653cf80f0c9c89d1265aa913d711cf5ccd026742 Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Tue, 4 Mar 2025 17:35:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PDA/PDA/components/Card.vue | 4 + PDA/PDA/components/StocktakingCard.vue | 4 + PDA/PDA/pages/bind/bind.vue | 21 ++++- .../dist/dev/app-plus/app-service.js | 80 ++++++++++++++---- WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs | 6 ++ WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs | 6 ++ .../DbModels/STZL/MatDetailStocktakingInfo.cs | 6 ++ .../Service/BatchBindMatDetailService.cs | 5 ++ .../Service/MatDetailCurrentInfoService.cs | 6 ++ .../Services/Service/StockTakingService.cs | 9 ++ .../MatDetailCurrentInfoImportModel.cs | 2 + .../MatDetailCurrentInfo.cs | 2 + .../MatDetailHistoryInfoModel.cs | 2 + .../PDAMatBind/BindMatDetailRequest.cs | 5 ++ .../MatDetailStocktakingInfoModel.cs | 2 + .../MatDetailCurrenInfoController.cs | 1 + .../Controllers/PDAMatBindController.cs | 2 + .../PDAProductionLineCallInController.cs | 1 + .../PDAProductionLineCallOutController.cs | 2 + .../Controllers/PDAStocktakingController.cs | 1 + .../Resources/物料绑定导入模板.xlsx | Bin 10266 -> 10299 bytes 货架标准上位机/ViewModels/MainViewModel.cs | 8 +- .../Views/BatchBindMatDetailView.xaml | 1 + .../Views/MatDetailCurrentInfoView.xaml | 1 + .../Views/MatDetailHistoryInfoView.xaml | 1 + .../Views/MatDetailStocktakingInfoUpdateView.xaml | 16 ++++ .../Views/MatDetailStocktakingInfoUpdateView.xaml.cs | 1 + .../Views/MatDetailStocktakingInfoView.xaml | 3 + 28 files changed, 178 insertions(+), 20 deletions(-) diff --git a/PDA/PDA/components/Card.vue b/PDA/PDA/components/Card.vue index a232a7a..c36df81 100644 --- a/PDA/PDA/components/Card.vue +++ b/PDA/PDA/components/Card.vue @@ -11,6 +11,10 @@ 名称: {{item.matName}} + + 批次: + {{item.matBatch}} + 规格: {{item.matSpec}} diff --git a/PDA/PDA/components/StocktakingCard.vue b/PDA/PDA/components/StocktakingCard.vue index 2c32723..961a719 100644 --- a/PDA/PDA/components/StocktakingCard.vue +++ b/PDA/PDA/components/StocktakingCard.vue @@ -11,6 +11,10 @@ 名称: {{item.matName}} + + 批次: + {{item.matBatch}} + 规格: {{item.matSpec}} diff --git a/PDA/PDA/pages/bind/bind.vue b/PDA/PDA/pages/bind/bind.vue index cf34894..d25230a 100644 --- a/PDA/PDA/pages/bind/bind.vue +++ b/PDA/PDA/pages/bind/bind.vue @@ -92,6 +92,8 @@ {{matName}} + + @@ -102,6 +104,20 @@ {{matSpec}} + + + + + + 物料批次： + + + + + + + + @@ -183,8 +199,9 @@ shelfCode: '', matCode: '', matName: '', + matBatch:'', matSpec: '', - matQty: 100, //默认数量值 + matQty: 0, //默认数量值 // 货架区域选项 shelfAreaOptions: [{ @@ -355,6 +372,7 @@ "shelfCode": this.shelfCode, "matBaseInfoId": this.matBaseInfoId, "matCode": this.matCode, + "matBatch": this.matBatch, "qty": this.matQty, "userName": this.userName, "deviceType": "PDA" @@ -644,6 +662,7 @@ this.matCode = ''; this.matName = ''; this.matSpec = ''; + this.matQty = 0; }, handlePopupClose() { // 弹出层关闭后的处理逻辑 diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js index 904638a..5e0eb15 100644 --- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js +++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js @@ -792,8 +792,9 @@ if (uni.restoreGlobal) { shelfCode: "", matCode: "", matName: "", + matBatch: "", matSpec: "", - matQty: 100, + matQty: 0, //默认数量值 // 货架区域选项 shelfAreaOptions: [{ @@ -817,10 +818,10 @@ if (uni.restoreGlobal) { this.userName = getConfig("userName", "admin"); const self = this; recive(function(res) { - formatAppLog("log", "at pages/bind/bind.vue:211", "Success:" + res.data); + formatAppLog("log", "at pages/bind/bind.vue:228", "Success:" + res.data); self.analysisScanCode(res.data); }, function(err) { - formatAppLog("log", "at pages/bind/bind.vue:214", "Error:", JSON.stringify(err)); + formatAppLog("log", "at pages/bind/bind.vue:231", "Error:", JSON.stringify(err)); }); }, methods: { @@ -828,11 +829,11 @@ if (uni.restoreGlobal) { cameraScanCode() { uni.scanCode({ success: (res) => { - formatAppLog("log", "at pages/bind/bind.vue:222", "扫码结果:", res.result); + formatAppLog("log", "at pages/bind/bind.vue:239", "扫码结果:", res.result); this.analysisScanCode(res.result); }, fail: (err) => { - formatAppLog("error", "at pages/bind/bind.vue:226", "扫码失败:", err); + formatAppLog("error", "at pages/bind/bind.vue:243", "扫码失败:", err); } }); }, @@ -924,12 +925,12 @@ if (uni.restoreGlobal) { } }, complete: (event) => { - formatAppLog("log", "at pages/bind/bind.vue:330", "请求完成", event); + formatAppLog("log", "at pages/bind/bind.vue:347", "请求完成", event); } }); }, bindSelectedMat: function(item) { - formatAppLog("log", "at pages/bind/bind.vue:336", "用户选择了项目:", item); + formatAppLog("log", "at pages/bind/bind.vue:353", "用户选择了项目:", item); this.matCode = item.matCode; this.matName = item.matName; this.matSpec = item.matSpec; @@ -952,6 +953,7 @@ if (uni.restoreGlobal) { "shelfCode": this.shelfCode, "matBaseInfoId": this.matBaseInfoId, "matCode": this.matCode, + "matBatch": this.matBatch, "qty": this.matQty, "userName": this.userName, "deviceType": "PDA" @@ -993,7 +995,7 @@ if (uni.restoreGlobal) { }); }, complete: (event) => { - formatAppLog("log", "at pages/bind/bind.vue:404", "请求完成", event); + formatAppLog("log", "at pages/bind/bind.vue:422", "请求完成", event); } }); }, @@ -1098,7 +1100,7 @@ if (uni.restoreGlobal) { }); }, complete: (event) => { - formatAppLog("log", "at pages/bind/bind.vue:518", "请求完成", event); + formatAppLog("log", "at pages/bind/bind.vue:536", "请求完成", event); } }); }, @@ -1189,7 +1191,7 @@ if (uni.restoreGlobal) { }); }, complete: (event) => { - formatAppLog("log", "at pages/bind/bind.vue:620", "请求完成", event); + formatAppLog("log", "at pages/bind/bind.vue:638", "请求完成", event); } }); }, @@ -1213,9 +1215,10 @@ if (uni.restoreGlobal) { this.matCode = ""; this.matName = ""; this.matSpec = ""; + this.matQty = 0; }, handlePopupClose() { - formatAppLog("log", "at pages/bind/bind.vue:650", "弹出层已关闭"); + formatAppLog("log", "at pages/bind/bind.vue:669", "弹出层已关闭"); } } }; @@ -1384,6 +1387,33 @@ if (uni.restoreGlobal) { /* TEXT */ ) ]), + vue.createElementVNode("view", { + class: "diy-flex-inforow", + style: { "flex": "1" } + }, [ + vue.createElementVNode("view", { style: { "flex": "5" } }), + vue.createElementVNode("view", { style: { "flex": "35" } }, "物料批次："), + vue.createElementVNode("view", { + class: "uni-input-wrapper", + style: { "flex": "80" } + }, [ + vue.withDirectives(vue.createElementVNode( + "input", + { + class: "uni-input", + style: { "font-size": "40rpx" }, + placeholder: "请输入批次", + "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => $data.matBatch = $event) + }, + null, + 512 + /* NEED_PATCH */ + ), [ + [vue.vModelText, $data.matBatch] + ]) + ]), + vue.createElementVNode("view", { style: { "flex": "10" } }) + ]), vue.createElementVNode("view", { class: "diy-flex-inforow", style: { "flex": "1" } @@ -1401,7 +1431,7 @@ if (uni.restoreGlobal) { type: "number", style: { "font-size": "40rpx" }, placeholder: "请输入物料数量", - "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => $data.matQty = $event) + "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => $data.matQty = $event) }, null, 512 @@ -1412,7 +1442,7 @@ if (uni.restoreGlobal) { ]), vue.createElementVNode("view", { style: { "flex": "40" } }, [ vue.createElementVNode("button", { - onClick: _cache[6] || (_cache[6] = (...args) => $options.bind && $options.bind(...args)), + onClick: _cache[7] || (_cache[7] = (...args) => $options.bind && $options.bind(...args)), class: "mini-btn", style: { "margin-left": "10rpx" }, type: "warn", @@ -1429,7 +1459,7 @@ if (uni.restoreGlobal) { range: $data.shelfAreaOptions, "range-key": "locationAreaName", value: $data.selectedShelfAreaIndex, - onChange: _cache[7] || (_cache[7] = (...args) => $options.onShelfAreaChange && $options.onShelfAreaChange(...args)), + onChange: _cache[8] || (_cache[8] = (...args) => $options.onShelfAreaChange && $options.onShelfAreaChange(...args)), style: { "font-size": "35rpx" } }, [ vue.createElementVNode( @@ -1444,7 +1474,7 @@ if (uni.restoreGlobal) { vue.createElementVNode("button", { style: { "font-size": "40rpx", "margin": "15rpx", "background-color": "green" }, size: "mini", - onClick: _cache[8] || (_cache[8] = (...args) => $options.sendShelfBack && $options.sendShelfBack(...args)) + onClick: _cache[9] || (_cache[9] = (...args) => $options.sendShelfBack && $options.sendShelfBack(...args)) }, "送货架") ]) ]) @@ -2266,6 +2296,16 @@ if (uni.restoreGlobal) { /* TEXT */ ) ]), + vue.createElementVNode("view", { class: "content-item" }, [ + vue.createElementVNode("text", null, "批次:"), + vue.createElementVNode( + "text", + null, + vue.toDisplayString($props.item.matBatch), + 1 + /* TEXT */ + ) + ]), vue.createElementVNode("view", { class: "content-item" }, [ vue.createElementVNode("text", null, "规格:"), vue.createElementVNode( @@ -3392,6 +3432,16 @@ if (uni.restoreGlobal) { /* TEXT */ ) ]), + vue.createElementVNode("view", { class: "content-item" }, [ + vue.createElementVNode("text", null, "批次:"), + vue.createElementVNode( + "text", + null, + vue.toDisplayString($props.item.matBatch), + 1 + /* TEXT */ + ) + ]), vue.createElementVNode("view", { class: "content-item" }, [ vue.createElementVNode("text", null, "规格:"), vue.createElementVNode( diff --git a/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs index 5cf491f..42a0ea3 100644 --- a/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs +++ b/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs @@ -58,6 +58,12 @@ namespace WCS.BLL.DbModels [SugarColumn(ColumnName = "mat_name", Length = 128, IsNullable = true, ColumnDescription = "物料名称")] public string MatName { get; set; } + /// + /// 物料批次 + /// + [SugarColumn(ColumnName = "mat_batch", Length = 64, IsNullable = true, ColumnDescription = "物料批次")] + public string? MatBatch { get; set; } + /// /// 物料规格 /// diff --git a/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs index 2f50bd5..540aade 100644 --- a/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs +++ b/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs @@ -54,6 +54,12 @@ namespace WCS.BLL.DbModels [SugarColumn(ColumnName = "mat_name", Length = 150, IsNullable = true, ColumnDescription = "物料名称")] public string MatName { get; set; } + /// + /// 物料批次 + /// + [SugarColumn(ColumnName = "mat_batch", Length = 64, IsNullable = true, ColumnDescription = "物料批次")] + public string? MatBatch { get; set; } + /// /// 物料规格 /// diff --git a/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs index 8be2d9b..97f8298 100644 --- a/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs +++ b/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs @@ -60,6 +60,12 @@ namespace WCS.BLL.DbModels [SugarColumn(ColumnName = "mat_name", Length = 150, IsNullable = true, ColumnDescription = "物料名称")] public string MatName { get; set; } + /// + /// 物料批次 + /// + [SugarColumn(ColumnName = "mat_batch", Length = 64, IsNullable = true, ColumnDescription = "物料批次")] + public string? MatBatch { get; set; } + /// /// 物料规格 /// diff --git a/WCS.BLL/Services/Service/BatchBindMatDetailService.cs b/WCS.BLL/Services/Service/BatchBindMatDetailService.cs index 2349cd5..6cae0b2 100644 --- a/WCS.BLL/Services/Service/BatchBindMatDetailService.cs +++ b/WCS.BLL/Services/Service/BatchBindMatDetailService.cs @@ -58,6 +58,7 @@ namespace WCS.BLL.Services.Service MatCode = mci.MatCode, MatName = mci.MatName, + MatBatch = mci.MatBatch, MatSpec = mci.MatSpec, MatUnit = mci.MatUnit, MatCustomer = mci.MatCustomer, @@ -133,6 +134,7 @@ namespace WCS.BLL.Services.Service MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, MatSpec = matDetailCurrentInfo.MatSpec, MatCustomer = matDetailCurrentInfo?.MatCustomer, MatSupplier = matDetailCurrentInfo?.MatSupplier, @@ -206,6 +208,7 @@ namespace WCS.BLL.Services.Service MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, MatSpec = matDetailCurrentInfo.MatSpec, MatCustomer = matDetailCurrentInfo?.MatCustomer, MatSupplier = matDetailCurrentInfo?.MatSupplier, @@ -422,6 +425,7 @@ namespace WCS.BLL.Services.Service MatCode = matBaseInfo.MatCode, MatName = matBaseInfo.MatName, + MatBatch = info.物料批次, MatSpec = matBaseInfo.MatSpec, MatUnit = matBaseInfo.MatUnit, MatSupplier = matBaseInfo.MatSupplier, @@ -446,6 +450,7 @@ namespace WCS.BLL.Services.Service MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, MatSpec = matDetailCurrentInfo.MatSpec, MatCustomer = matDetailCurrentInfo?.MatCustomer, MatSupplier = matDetailCurrentInfo?.MatSupplier, diff --git a/WCS.BLL/Services/Service/MatDetailCurrentInfoService.cs b/WCS.BLL/Services/Service/MatDetailCurrentInfoService.cs index 700d2cb..19d6173 100644 --- a/WCS.BLL/Services/Service/MatDetailCurrentInfoService.cs +++ b/WCS.BLL/Services/Service/MatDetailCurrentInfoService.cs @@ -54,6 +54,7 @@ namespace WCS.BLL.Services.Service MatCode = mci.MatCode, MatName = mci.MatName, + MatBatch = mci.MatBatch, MatSpec = mci.MatSpec, MatUnit = mci.MatUnit, MatCustomer = mci.MatCustomer, @@ -125,6 +126,8 @@ namespace WCS.BLL.Services.Service MatCode = mci.MatCode, MatName = mci.MatName, + MatBatch = mci.MatBatch, + MatSpec = mci.MatSpec, MatUnit = mci.MatUnit, MatCustomer = mci.MatCustomer, @@ -196,6 +199,8 @@ namespace WCS.BLL.Services.Service MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, + MatSpec = matDetailCurrentInfo.MatSpec, MatCustomer = matDetailCurrentInfo?.MatCustomer, MatSupplier = matDetailCurrentInfo?.MatSupplier, @@ -271,6 +276,7 @@ namespace WCS.BLL.Services.Service MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, MatSpec = matDetailCurrentInfo.MatSpec, MatCustomer = matDetailCurrentInfo?.MatCustomer, MatSupplier = matDetailCurrentInfo?.MatSupplier, diff --git a/WCS.BLL/Services/Service/StockTakingService.cs b/WCS.BLL/Services/Service/StockTakingService.cs index e738010..61b3e82 100644 --- a/WCS.BLL/Services/Service/StockTakingService.cs +++ b/WCS.BLL/Services/Service/StockTakingService.cs @@ -1084,6 +1084,8 @@ namespace WCS.BLL.Services.Service ShelfArea = "", MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, + MatSpec = matDetailCurrentInfo.MatSpec, MatQty = matDetailCurrentInfo.MatQty, StocktakingQty = request.StocktakingQty, @@ -1126,6 +1128,7 @@ namespace WCS.BLL.Services.Service MatCode = mci.MatCode, MatName = mci.MatName, + MatBatch = mci.MatBatch, MatSpec = mci.MatSpec, MatQty = mci.MatQty, StocktakingQty = mci.StocktakingQty, @@ -1195,6 +1198,8 @@ namespace WCS.BLL.Services.Service MatCode = mci.MatCode, MatName = mci.MatName, + MatBatch = mci.MatBatch, + MatSpec = mci.MatSpec, MatQty = mci.MatQty, StocktakingQty = mci.StocktakingQty, @@ -1288,6 +1293,7 @@ namespace WCS.BLL.Services.Service MatCode = mci.MatCode, MatName = mci.MatName, + MatBatch = mci.MatBatch, MatSpec = mci.MatSpec, MatUnit = mci.MatUnit, MatCustomer = mci.MatCustomer, @@ -1481,6 +1487,7 @@ namespace WCS.BLL.Services.Service MatCode = matCurrentInfo.MatCode, MatName = matCurrentInfo.MatName, + MatBatch = matCurrentInfo.MatBatch, MatSpec = matCurrentInfo.MatSpec, MatCustomer = matCurrentInfo?.MatCustomer, MatSupplier = matCurrentInfo?.MatSupplier, @@ -1512,6 +1519,8 @@ namespace WCS.BLL.Services.Service MatCode = matCurrentInfo.MatCode, MatName = matCurrentInfo.MatName, + MatBatch = matCurrentInfo.MatBatch, + MatSpec = matCurrentInfo.MatSpec, MatCustomer = matCurrentInfo?.MatCustomer, MatSupplier = matCurrentInfo?.MatSupplier, diff --git a/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs b/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs index 21663bd..738122d 100644 --- a/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs +++ b/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs @@ -10,6 +10,8 @@ namespace WCS.Model.ApiModel.BatchBindMatDetail public string 单据编号 { get; set; } public string 物料编码 { get; set; } public string 物料名称 { get; set; } + + public string 物料批次 { get; set; } public string 物料规格 { get; set; } public int? 数量 { get; set; } public string 货架编码 { get; set; } diff --git a/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs b/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs index a0cc98c..45cc7d7 100644 --- a/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs +++ b/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs @@ -26,6 +26,8 @@ namespace WCS.Model.ApiModel.MatDetailCurrentInfo public string? MatName { get; set; } = string.Empty; + public string? MatBatch { get; set; } = string.Empty; + public string? MatSpec { get; set; } = string.Empty; public string? MatUnit { get; set; } = string.Empty; diff --git a/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs b/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs index 2cef1fa..04d3dd1 100644 --- a/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs +++ b/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs @@ -22,6 +22,8 @@ namespace WCS.Model.ApiModel.MatDetailHistoryInfo public string MatName { get; set; } + public string MatBatch { get; set; } + public string MatSpec { get; set; } public int BeforeQty { get; set; } diff --git a/WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs b/WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs index 230ae2d..94f34e6 100644 --- a/WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs +++ b/WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs @@ -36,6 +36,11 @@ namespace WCS.Model.ApiModel.PDAMatBind /// public string MatCode { get; set;} + /// + /// 物料批次 + /// + public string MatBatch{ get; set; } + /// /// 物料数量 /// diff --git a/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs b/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs index 851c8c4..acf5c6a 100644 --- a/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs +++ b/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs @@ -50,6 +50,8 @@ namespace WCS.Model.ApiModel.Stocktaking /// public string MatName { get; set; } + public string MatBatch { get; set; } + /// /// 物料规格 /// diff --git a/WCS.WebApi/Controllers/MatDetailCurrenInfoController.cs b/WCS.WebApi/Controllers/MatDetailCurrenInfoController.cs index d1ab164..a82c825 100644 --- a/WCS.WebApi/Controllers/MatDetailCurrenInfoController.cs +++ b/WCS.WebApi/Controllers/MatDetailCurrenInfoController.cs @@ -47,6 +47,7 @@ namespace WCS.WebApi.Controllers new ExportableColumn("位置编号","LocationCode"), new ExportableColumn("物料编码","MatCode"), new ExportableColumn("物料名称","MatName"), + new ExportableColumn("物料批次","MatBatch"), new ExportableColumn("物料规格","MatSpec"), new ExportableColumn("数量", "MatQty"), new ExportableColumn("更新人", "ModifyUser"), diff --git a/WCS.WebApi/Controllers/PDAMatBindController.cs b/WCS.WebApi/Controllers/PDAMatBindController.cs index e0d6850..dda1c49 100644 --- a/WCS.WebApi/Controllers/PDAMatBindController.cs +++ b/WCS.WebApi/Controllers/PDAMatBindController.cs @@ -370,6 +370,7 @@ namespace WCS.WebApi.Controllers MatCode = matBaseInfo.MatCode, MatName = matBaseInfo.MatName, + MatBatch = request.MatBatch, MatSupplier = matBaseInfo.MatSupplier, MatCustomer = matBaseInfo.MatCustomer, MatSpec = matBaseInfo.MatSpec, @@ -387,6 +388,7 @@ namespace WCS.WebApi.Controllers MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, MatSpec = matDetailCurrentInfo.MatSpec, MatCustomer = matDetailCurrentInfo?.MatCustomer, MatSupplier = matDetailCurrentInfo?.MatSupplier, diff --git a/WCS.WebApi/Controllers/PDAProductionLineCallInController.cs b/WCS.WebApi/Controllers/PDAProductionLineCallInController.cs index 5927b30..12fb642 100644 --- a/WCS.WebApi/Controllers/PDAProductionLineCallInController.cs +++ b/WCS.WebApi/Controllers/PDAProductionLineCallInController.cs @@ -182,6 +182,7 @@ namespace WCS.WebApi.Controllers MatCode = mci.MatCode, MatName = mci.MatName, + MatBatch = mci.MatBatch, MatSpec = mci.MatSpec, MatUnit = mci.MatUnit, MatCustomer = mci.MatCustomer, diff --git a/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs b/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs index aabafc6..ddb115d 100644 --- a/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs +++ b/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs @@ -171,6 +171,7 @@ namespace WCS.WebApi.Controllers MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, MatSpec = matDetailCurrentInfo.MatSpec, MatCustomer = matDetailCurrentInfo?.MatCustomer, MatSupplier = matDetailCurrentInfo?.MatSupplier, @@ -329,6 +330,7 @@ namespace WCS.WebApi.Controllers MatCode = matDetailCurrentInfo.MatCode, MatName = matDetailCurrentInfo.MatName, + MatBatch = matDetailCurrentInfo.MatBatch, MatSpec = matDetailCurrentInfo.MatSpec, MatCustomer = matDetailCurrentInfo?.MatCustomer, MatSupplier = matDetailCurrentInfo?.MatSupplier, diff --git a/WCS.WebApi/Controllers/PDAStocktakingController.cs b/WCS.WebApi/Controllers/PDAStocktakingController.cs index 3a81b5a..db67068 100644 --- a/WCS.WebApi/Controllers/PDAStocktakingController.cs +++ b/WCS.WebApi/Controllers/PDAStocktakingController.cs @@ -95,6 +95,7 @@ namespace WCS.WebApi.Controllers new ExportableColumn("序号","RowNumber"), new ExportableColumn("物料编码","MatCode"), new ExportableColumn("物料名称","MatName"), + new ExportableColumn("物料批次","MatBatch"), new ExportableColumn("物料规格","MatSpec"), new ExportableColumn("货架编号","ShelfCode"), new ExportableColumn("货架区域","ShelfArea"), diff --git a/货架标准上位机/Resources/物料绑定导入模板.xlsx b/货架标准上位机/Resources/物料绑定导入模板.xlsx index caa392e042cdc1ea2892e87d01a1e50d91f73e91..52383f6556e15c936a30264d27b5bd43f6de796f 100644 GIT binary patch delta 3331 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 delta 3377 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 E2jPF>DF6Tf diff --git a/货架标准上位机/ViewModels/MainViewModel.cs b/货架标准上位机/ViewModels/MainViewModel.cs index f29affa..094d178 100644 --- a/货架标准上位机/ViewModels/MainViewModel.cs +++ b/货架标准上位机/ViewModels/MainViewModel.cs @@ -95,10 +95,10 @@ namespace 智慧物流软件系统.ViewModel { ScannerManager.InitScanners(); }), - new Tuple("初始化WebSocket连接..", "初始化WebSocket连接失败，请联系管理员", () => - { - WebSocket.InitWebSocket(); - }), + //new Tuple("初始化WebSocket连接..", "初始化WebSocket连接失败，请联系管理员", () => + //{ + // WebSocket.InitWebSocket(); + //}), }; MainLoadWindow.TaskSleepTime = 200; diff --git a/货架标准上位机/Views/BatchBindMatDetailView.xaml b/货架标准上位机/Views/BatchBindMatDetailView.xaml index f94de67..fb2b60c 100644 --- a/货架标准上位机/Views/BatchBindMatDetailView.xaml +++ b/货架标准上位机/Views/BatchBindMatDetailView.xaml @@ -192,6 +192,7 @@ + diff --git a/货架标准上位机/Views/MatDetailCurrentInfoView.xaml b/货架标准上位机/Views/MatDetailCurrentInfoView.xaml index 5beb7ee..11e9992 100644 --- a/货架标准上位机/Views/MatDetailCurrentInfoView.xaml +++ b/货架标准上位机/Views/MatDetailCurrentInfoView.xaml @@ -180,6 +180,7 @@ + diff --git a/货架标准上位机/Views/MatDetailHistoryInfoView.xaml b/货架标准上位机/Views/MatDetailHistoryInfoView.xaml index 5415373..a8847da 100644 --- a/货架标准上位机/Views/MatDetailHistoryInfoView.xaml +++ b/货架标准上位机/Views/MatDetailHistoryInfoView.xaml @@ -161,6 +161,7 @@ + diff --git a/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml b/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml index bbe403f..ae3ce52 100644 --- a/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml +++ b/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml @@ -73,6 +73,22 @@ HorizontalAlignment="Stretch" Style="{StaticResource TextBoxExtend}"> + + + + +