From 980b9ef92fd9ea8f5402708eb4dd0c7e8a05bede Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 23 十月 2025 16:59:29 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 8c1bab7..501707c 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -640,24 +640,24 @@
// 2. 灏嗗瓧绗︿覆绫诲瀷鐨処sControlled杞崲涓篵ool锛堟牴鎹疄闄呭彇鍊艰鍒欒皟鏁达級
// 姣斿锛�"1"琛ㄧず鍙楁帶锛�"0"琛ㄧず涓嶅彈鎺э紱鎴�"True"/"False"锛涙垨"鏄�"/"鍚�"
- bool isControlled;
- if (!bool.TryParse(material.IsControlled, out isControlled))
- {
- // 澶勭悊闈炴爣鍑嗘牸寮忥紙濡�"1"/"0"锛�
- isControlled = material.IsControlled == "1" ||
- string.Equals(material.IsControlled, "鏄�", StringComparison.OrdinalIgnoreCase);
- }
+ //bool isControlled;
+ //if (!bool.TryParse(material.IsControlled, out isControlled))
+ //{
+ // // 澶勭悊闈炴爣鍑嗘牸寮忥紙濡�"1"/"0"锛�
+ // isControlled = material.IsControlled == "1" ||
+ // string.Equals(material.IsControlled, "鏄�", StringComparison.OrdinalIgnoreCase);
+ //}
// 3. 鏍规嵁鍙楁帶鐘舵�侀獙璇佹棩鏈�
- if (isControlled)
+ if (material.IsControlled=="0")
{
// 鍙楁帶鐘舵�侊細鐢熶骇鏃ユ湡蹇呭～
if (string.IsNullOrWhiteSpace(detailModel.Lot1))
- return $"-1:鐗╂枡{detailModel.SkuNo}涓哄彈鎺х墿鏂欙紝鐢熶骇鏃ユ湡涓嶅彲涓虹┖;";
+ return $"-1:鐗╂枡{detailModel.SkuNo}涓洪渶璇烽獙鐗╂枡锛岀敓浜ф棩鏈熶笉鍙负绌�;";
// 鍙楁帶鐘舵�侊細杩囨湡鏃ユ湡蹇呭～
if (string.IsNullOrWhiteSpace(detailModel.Lot2))
- return $"-1:鐗╂枡{detailModel.SkuNo}涓哄彈鎺х墿鏂欙紝杩囨湡鏃ユ湡涓嶅彲涓虹┖;";
+ return $"-1:鐗╂枡{detailModel.SkuNo}涓洪渶璇烽獙鐗╂枡锛岃繃鏈熸棩鏈熶笉鍙负绌�;";
// 楠岃瘉鏃ユ湡鏍煎紡鏈夋晥鎬�
if (!DateTime.TryParse(detailModel.Lot1, out DateTime productionDate))
@@ -673,14 +673,14 @@
// 涓嶅彈鎺х姸鎬侊細鏃ユ湡闈炲繀濉紝鏃犻渶楠岃瘉
// 鍘熸湁鎵规鐩稿叧楠岃瘉锛堜繚鐣欙級
- if (TypeLot.Contains(model.Type))
- {
- if (string.IsNullOrWhiteSpace(detailModel.Lot1))
- throw new Exception("鐢熶骇鏃ユ湡涓嶅彲涓虹┖!");
+ //if (TypeLot.Contains(model.Type))
+ //{
+ // if (string.IsNullOrWhiteSpace(detailModel.Lot1))
+ // throw new Exception("鐢熶骇鏃ユ湡涓嶅彲涓虹┖!");
- if (string.IsNullOrWhiteSpace(detailModel.Lot2))
- throw new Exception("杩囨湡鏃ユ湡涓嶅彲涓虹┖!");
- }
+ // if (string.IsNullOrWhiteSpace(detailModel.Lot2))
+ // throw new Exception("杩囨湡鏃ユ湡涓嶅彲涓虹┖!");
+ //}
// 楠岃瘉鐗╂枡鍜屾壒娆″彿鏄惁閲嶅
if (dbDetailModels.Any(m => m.SkuNo == detailModel.SkuNo
--
Gitblit v1.8.0