From 83b9213dc893bec8f94e04cad121abb6649886dd Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 13 十月 2024 17:55:04 +0800
Subject: [PATCH] 修改业务需求问题
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 95 ++++++++++++++++++++++++++++++-----------------
1 files changed, 60 insertions(+), 35 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 34dfe6f..b91e930 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -20,6 +20,8 @@
using WMS.BLL.SysServer;
using System.Threading.Tasks;
using System.Security.Policy;
+using WMS.Entity.DataEntity;
+using WMS.Entity.BllQualityEntity;
namespace WMS.BLL.BllAsnServer
{
@@ -262,7 +264,7 @@
string sqlString = string.Empty;
string sqlDetailStr = string.Empty;
//0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- var TypeLot = "1, 2, 5, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
+ var TypeLot = "2, 5, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
var addOder = new List<ResponseOrderTaskModel>();
try
@@ -284,13 +286,13 @@
}
//鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- if (model.Type == "1" || model.Type == "4")
- {
- if (!string.IsNullOrWhiteSpace(model.LotNo))
- {
- throw new Exception("閲囪喘鍏ュ簱鎴栦綑鏂欓��鍥炰笉鍙緭鍏ユ壒娆★紝涓嶅彲缂栬緫!");
- }
- }
+ //if (model.Type == "1" || model.Type == "4")
+ //{
+ // if (!string.IsNullOrWhiteSpace(model.LotNo))
+ // {
+ // throw new Exception("閲囪喘鍏ュ簱鎴栦綑鏂欓��鍥炰笉鍙緭鍏ユ壒娆★紝涓嶅彲缂栬緫!");
+ // }
+ //}
sqlString += "Insert into BllArrivalNotice (ASNNo,Type,Origin,CustomerNo,";
sqlString += "CustomerName,LotNo,LotText,SupplierLot,CreateUser) values ( ";
@@ -320,9 +322,19 @@
//鍒ゆ柇鏄惁涓轰笉闄愬埗鎵规鍗曟嵁
if (!TypeLot.Contains(model.Type))
{
- strMessage = "-1:鎵规鍙蜂笉鍙负绌�;";
+ strMessage = "-1:杩涘巶缂栧彿涓嶅彲涓虹┖;";
continue;
}
+ }
+ if (detailModel.LotNo.Length!= 10)
+ {
+ strMessage = "-1:杩涘巶缂栧彿浣嶆暟闀垮害鏈夎;";
+ continue;
+ }
+ if (model.Type == "1" && string.IsNullOrWhiteSpace(detailModel.SupplierLot)) //閲囪喘鍒拌揣鍗曞師鍘傛壒鍙凤紙渚涜揣鎵规锛変笉鑳戒负绌�
+ {
+ strMessage = "-1:鍘熷巶鎵瑰彿涓嶅彲涓虹┖;";
+ continue;
}
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ綋鍓嶆槑缁�
string sqlCount = $"SELECT COUNT(ID) FROM BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' ";
@@ -330,7 +342,7 @@
var com = new Common().GetRowCount(sqlCount);
if (com > 0)
{
- strMessage = "-1:鐗╂枡鍜屾壒娆″彿閲嶅;";
+ strMessage = "-1:鐗╂枡鍜岃繘鍘傜紪鍙烽噸澶�;";
continue;
}
if (detailModel.Price == null)
@@ -345,7 +357,7 @@
sqlDetailStr += $"'{detailModel.LotNo}','{detailModel.LotText}','{detailModel.Qty}','{detailModel.PackagNo}','{detailModel.Price}', ";
sqlDetailStr += $"{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";
- if (model.Type == "1")
+ if (model.Type == "0")//鎴愬搧鍏ュ簱鍗曚笅鍙慦CS淇℃伅
{
addOder.Add(new ResponseOrderTaskModel()
{
@@ -377,34 +389,34 @@
{
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", model.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕model.ASNNo}鐨勫崟鎹俊鎭�", Convert.ToInt32(model.CreateUser));
- if (addOder.Count > 0)
- {
- // 姝ｅ紡杩愯绋嬪簭鏀惧紑
- var jsonData = JsonConvert.SerializeObject(addOder);
- string response = "";
+ //if (addOder.Count > 0)
+ //{
+ // // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ // var jsonData = JsonConvert.SerializeObject(addOder);
+ // string response = "";
- try
- {
- var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
- response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ // try
+ // {
+ // var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ // //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
+ // response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
- //////瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == 0)
- {
+ // //////瑙ｆ瀽杩斿洖鏁版嵁
+ // var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ // if (wcsModel.StatusCode == 0)
+ // {
- }
- if (wcsModel.StatusCode == -1)
- {
+ // }
+ // if (wcsModel.StatusCode == -1)
+ // {
- }
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- }
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // throw new Exception(ex.Message);
+ // }
+ //}
return strMessage;
}
else
@@ -1053,6 +1065,19 @@
{
throw new Exception("澶嶆牳澶辫触锛屽鏍镐汉鍛樺拰鍏抽棴璁㈠崟浜哄憳涓嶈兘鐩稿悓锛�");
}
+ //鍗曟嵁绫诲瀷鏄� 鎴愬搧鍏ュ簱鎴栭噰璐叆搴� 鍒ゆ柇鍏ュ簱鐗╂枡鏄惁鍚堟牸
+ if (notice.Type == "0" || notice.Type == "1")
+ {
+ foreach (var item in detail)
+ {
+ var instStatus = Db.Queryable<BllQualityInspect>().Count(m => m.IsDel == "0" && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.IsQualified == "1");
+ if (instStatus == 0)
+ {
+ throw new Exception($"{item.SkuNo}銆亄item.LotNo}璐ㄩ噺鐘舵�佷笉鏄悎鏍肩殑锛屼笉鑳藉洖浼狅紒");
+ }
+ }
+
+ }
var list = new List<AsnDetail>();
foreach (var d in detail)
{
--
Gitblit v1.8.0