From 77c5c0b820513fee5d83ea1957012d3bfdac926f Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 08 十二月 2025 21:20:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 2 +-
项目代码/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue | 30 +-----------------------------
2 files changed, 2 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
index ff9e92c..2b97cf8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
@@ -81,13 +81,6 @@
align: "left",
},
{
- field: "stockId",
- title: "搴撳瓨淇℃伅涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- },
- {
field: "materielCode",
title: "鐗╂枡缂栧彿",
type: "string",
@@ -102,24 +95,10 @@
align: "left",
},
{
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
field: "batchNo",
title: "鎵规鍙�",
type: "string",
width: 90,
- align: "left",
- },
- {
- field: "serialNumber",
- title: "搴忓垪鍙�",
- type: "int",
- width: 120,
align: "left",
},
{
@@ -135,14 +114,7 @@
type: "string",
width: 120,
align: "left",
- },
- {
- field: "barcode",
- title: "鏉＄爜",
- type: "string",
- width: 120,
- align: "left",
- },
+ },
{
field: "stockQuantity",
title: "搴撳瓨鏁伴噺",
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 12d0d4c..ad5c134 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"
@@ -3033,7 +3033,7 @@
if (materielGroupDTO.orderTypes == InOrderTypeEnum.ReCheck.ObjToInt())
{
var dborder = _reCheckOrderService.Db.Queryable<Dt_ReCheckOrder>().First(x => x.OrderNo == materielGroupDTO.OrderNo);
- if (dborder != null && dborder.SignSeq == 0)
+ if (dborder != null && (dborder.SignSeq == 0 || dborder.SignSeq == 1))
{
return content.Error("鍙湁鎷垮埌閲嶆缁撴灉鎵嶈兘鍏ュ簱锛�");
}
--
Gitblit v1.9.3