From 85b3cf035caaea1908f4420a66e7d742367578c8 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 29 十二月 2021 18:46:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/POInStockController.cs | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index fa4c1f5..e23c6b5 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -19,6 +19,8 @@
{
private JsonResult objJsonResult = new JsonResult();
private json objjson = new json();
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
/// <summary>
/// 鏇存柊鎵撳嵃娆℃暟
@@ -287,7 +289,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+
string UserName = "";
ListModels oListModels = new ListModels();
@@ -310,14 +312,26 @@
oItem.HMainSourceInterID = oItem.HInterID;
oItem.HInterID = 0;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- if (DBUtility.ClsPub.isStrNull(oItem.HDHDate) == "")
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊～鍐欓璁″埌璐ф棩鏈燂紝鏃犳硶淇濆瓨锛�";
- objJsonResult.data = 1;
- return objJsonResult;
+ if (DBUtility.ClsPub.isStrNull(oItem.HDHDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊～鍐欓璁″埌璐ф棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(oItem.HDeliveryNo) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊～鍐欑墿娴佸崟鍙凤紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
}
+
oBill.omodel = oItem;
}
//琛ㄤ綋鏁版嵁
@@ -348,13 +362,16 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓鎵瑰彿锛�";
- objJsonResult.data = 1;
- return objJsonResult;
+ if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓鎵瑰彿锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
}
oItemSub.HEntryID = i;
--
Gitblit v1.9.1