From ef96a52b953e3ce094bba9f644a00a3698e48726 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期三, 21 一月 2026 19:29:12 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 6 +++++-
项目代码/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue | 36 +++++++++++++++++++-----------------
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
index 2e9884a..455d8e3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
@@ -34,11 +34,12 @@
{ title: "鎵樼洏鍙�", field: "palleCode", type: "like" },
{ title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
{ title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+ { title: "鍏ュ簱鏉＄爜", field: "barcode", type: "like" },
// { title: "鍙樺姩绫诲瀷", field: "changeType", type: "selectList", dataKey: "stockChangeType", data: [], },
],
[
- { title: "鍘熸潯鐮�", field: "originalSerilNumber", type: "like" },
- { title: "浠诲姟鍙�", field: "taskNum", type: "like" },
+ { title: "鍑哄簱鍘熸潯鐮�", field: "originalSerilNumber", type: "like" },
+ { title: "鎷嗗寘鏂版潯鐮�", field: "newSerilNumber", type: "like" },
{ title: "鎵规鍙�", field: "batchNo", type: "like" },
],
]);
@@ -59,12 +60,6 @@
type: "string",
width: 90,
align: "left",
- }, {
- field: "taskNum",
- title: "浠诲姟鍙�",
- type: "string",
- width: 70,
- align: "left",
},
{
field: "palleCode",
@@ -80,23 +75,30 @@
width: 150,
align: "left",
},
- // {
- // field: "materielName",
- // title: "鐗╂枡鍚嶇О",
- // type: "decimal",
- // width: 90,
- // align: "left",
- // },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "barcode",
+ title: "鍏ュ簱鏉＄爜",
+ type: "string",
+ width: 180,
+ align: "left",
+ },
{
field: "originalSerilNumber",
- title: "鍘熸潯鐮�",
+ title: "鍑哄簱鍘熸潯鐮�",
type: "string",
width: 180,
align: "left",
},
{
field: "newSerilNumber",
- title: "鏂版潯鐮�",
+ title: "鎷嗗寘鏂版潯鐮�",
type: "string",
width: 180,
align: "left",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
index 534a7df..ce1dd2c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
@@ -2322,6 +2322,10 @@
{
return WebResponseContent.Instance.Error("鏈壘鍒版弧瓒冲嚭搴撴潯浠剁殑鍑哄簱鍗�");
}
+ if(outboundOrder.IsBatch == 0)
+ {
+ return WebResponseContent.Instance.Error("璇ュ崟鎹笉灞炰簬鍒嗘壒鍥炰紶鍗曟嵁锛屼笉鍏佽铏氭嫙鍑哄叆搴�");
+ }
//鍏堟竻绌哄崟鎹櫄鎷熷嚭鍏ュ簱鏁伴噺杩涜璁＄畻
foreach (var item in outboundOrder.Details)
{
@@ -2717,7 +2721,7 @@
List<Barcodes> documentsNOList = new List<Barcodes>();
if (!string.IsNullOrEmpty(item.ReturnJsonData))
{
- barcodesList = JsonConvert.DeserializeObject<List<Barcodes>>(item.documentsNO) ?? new List<Barcodes>();
+ barcodesList = JsonConvert.DeserializeObject<List<Barcodes>>(item.ReturnJsonData) ?? new List<Barcodes>();
}
if (!string.IsNullOrEmpty(item.documentsNO) && item.documentsNO!="")
{
--
Gitblit v1.9.3