From f7d286cec2a2c6f8eb00a24f2238c86978358d8e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 十月 2025 11:19:41 +0800
Subject: [PATCH] 更新
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue | 2 +-
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrderDetail.vue | 6 +++---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue"
index d23d3f9..e68dacb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue"
@@ -250,7 +250,7 @@
type: "string",
width: 80,
align: "left",
- bind: { key: "enableEnum", data: [] },
+ bind: { key: "", data: [{key:0,value:'鍚�'},{key:1,value:'鏄�'}] },
},
{
field: "overInQuantity",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrderDetail.vue"
index f9a8ab3..ef5754f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrderDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrderDetail.vue"
@@ -40,8 +40,8 @@
{ title: "鍐呭寘鍙�", field: "bagNo",type:"like" },
{ title: "浜у搧缂栫爜", field: "productCode", type: "like" },
{ title: "鏄惁绮惧搧", field: "isFineWorks" ,type: "select",
- dataKey: "enableEnum",
- data: [],},
+ dataKey: "",
+ data: [{key:0,value:'鍚�'},{key:1,value:'鏄�'}],},
{ title: "鐗堟湰", field: "productVersion",type:"like" },
],
[
@@ -73,7 +73,7 @@
type: "string",
width: 80,
align: "left",
- bind: { key: "enableEnum", data: [] },
+ bind: { key: "", data: [{key:0,value:'鍚�'},{key:1,value:'鏄�'}] },
},
{
field: "overInQuantity",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs"
index 12f8f19..092924b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs"
@@ -27,6 +27,7 @@
List<Dt_ProStockInfo>? proStockInfos = null;
bool isCanLot= string.IsNullOrEmpty(proOutOrderDetail.PLot);
bool isCanVer = string.IsNullOrEmpty(proOutOrderDetail.OutSpecifyVer);
+ isFineWorks = !isFineWorks;
////鍒ゆ柇瀹㈡埛鍑哄叆瑙勫垯
//Dt_CustomerInfo customerInfo = _basicRepository.CustomerInfoRepository.QueryFirst(x=>x.Code== proOutOrderDetail.Customer);
//if (customerInfo==null)
@@ -56,7 +57,7 @@
v.ProductCode == proOutOrderDetail.PCode
&& v.ProductVersion.StartsWith(proOutOrderDetail.PVer.Substring(0,1))
&& (isCanLot ? isCanLot : v.ProductCode == proOutOrderDetail.PLot)
- && (isFineWorks ? !isCanLot : v.IsFineWorks == 1)
+ && (isFineWorks ? isFineWorks : v.IsFineWorks == 1)
))
.ToList();
//}
--
Gitblit v1.9.3