From 8fe57c6ee4357225cddec528675b07c0048fd817 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 25 四月 2023 13:35:16 +0800
Subject: [PATCH] WMS扫码添加注释，工序出站汇报PDA保存时若为多工位的情况操作员改为非必填项
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 31 ++++++++++-----
WebAPI/Controllers/POStockInBillController.cs | 36 ++++++++++-------
2 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index c16c7e4..151d2a4 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -176,14 +176,6 @@
objJsonResult.data = null;
return objJsonResult;
}
- //if (HEmpID == 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
//if (HQCCheckID == 0)
//{
// objJsonResult.code = "0";
@@ -197,8 +189,8 @@
string Ret = "";
if (oSystemParameter.ShowBill(ref Ret))
{
- //鍒ゆ柇瀹㈡埛
- if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤") //绯荤粺鍙傛暟
+ //鍒ゆ柇瀹㈡埛涓嶄负榫欏北姹介厤
+ if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤") //绯荤粺鍙傛暟
{
if (HSourceID == 0)
{
@@ -207,10 +199,27 @@
objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
+ }
+ }
+ //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
+ else if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ {
+ //鍒ゆ柇鏄惁涓哄宸ヤ綅
+ ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where 宸ュ簭ID = " + HProcID + " and 鐗╂枡ID = " + HMaterID + " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'", "h_v_GetStationOutBill_Detail");
+ if (ds != null && ds.Tables[0].Rows.Count <= 1)
+ {
+ if (HEmpID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
}
-
}
+
//if (HCenterID == 0)
//{
// objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 6416cdc..1569fde 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -928,7 +928,8 @@
WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
string text = "";
string text1 = "";
- bool flag = HBillType == "1201";
+ //gy_billnumber 鍗曟嵁绫诲瀷琛�
+ bool flag = HBillType == "1201"; //WMS 閲囪喘鍏ュ簱
if (flag)
{
string[] array = sBarCodeNew.Split(new char[]
@@ -946,11 +947,12 @@
string str3 = ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HNumber"]);
-
+ //鐢ㄦ媶鍒嗗嚭鏉ョ殑鐗╂枡浠ｇ爜鏌ヨ鐗╂枡琛ㄩ噷鐨勬柊鐗╂枡缂栫爜
DataSet Dss7;
Dss7 = clsCN.RunProcReturn(" select * from AIS20220914133941..T_BD_MATERIAL where FNumber = '" + str + "'", "T_BD_MATERIAL");
if (Dss7 == null || Dss7.Tables[0].Rows.Count == 0)
{
+ //鏂扮墿鏂欒〃閲屾病鏈夎繑鍥炴暟鎹垯鏌ヨ鐗╂枡琛ㄩ噷鐨勬棫鐗╂枡缂栫爜
DataSet Dss8;
Dss8 = clsCN.RunProcReturn(" select * from AIS20220914133941..T_BD_MATERIAL where FOldNumber = '" + str + "'", "T_BD_MATERIAL");
str = DBUtility.ClsPub.isStrNull(Dss8.Tables[0].Rows[0]["FNumber"]);
@@ -968,6 +970,7 @@
long num3 = (long)ClsPub.isInt(dataSet2.Tables[0].Rows[0]["HUnitID"]);
text = str3 + num2.ToString() + text2 + "#" + num;
text1 = str3 + num2.ToString() + text2;
+ //鎵炬簮鍗�
DataSet dataSet3 = clsCN.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + str2 + "' and FLOT_TEXT = '" + text2 + "' and FMATERIALID = " + num2.ToString(), "h_v_RECEIVEQuery");
//DataSet dataSet3 = clsCN.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FLOT_TEXT= '" + text2 + "' and FPRODUCEDATE = '" + dateTime + "' and FMATERIALID = " + num2.ToString(), "h_v_RECEIVEQuery");
num2 = ClsPub.isLong(dataSet3.Tables[0].Rows[0]["FMATERIALID"]);
@@ -980,6 +983,7 @@
{
DataSet dataSet5 = clsCN.RunProcReturn(string.Concat(new string[]
{
+ //鎵爜涓存椂璁板綍琛�
" select * from KF_PonderationBillMain_Temp where HInterID = ",
hinterid.ToString(),
" and HBillType = '",
@@ -992,6 +996,7 @@
if (!flag3)
{
POStockInBillController postockInBillController = new POStockInBillController();
+ //鎵簮鍗曟柟娉�
postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
//WEBSController webscontroller4 = new WEBSController();
@@ -1066,7 +1071,7 @@
}
}
}
- bool flag5 = HBillType == "1202";
+ bool flag5 = HBillType == "1202"; //WMS 鐢熶骇鍏ュ簱
if (flag5)
{
string text6 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 4);
@@ -1074,14 +1079,14 @@
bool flag6 = text7.Contains("W") || text7.Contains("N");
if (flag6)
{
- string text8 = sBarCodeNew.Substring(0, 10);
- string str4 = sBarCodeNew.Substring(10, 10);
+ string text8 = sBarCodeNew.Substring(0, 10);//鍟嗗搧鐮�
+ string str4 = sBarCodeNew.Substring(10, 10);//鐗╂枡浠ｇ爜
string text9 = "20" + sBarCodeNew.Substring(20, 6);
long num8 = (long)ClsPub.isInt(text9.Substring(0, 4));
long num9 = (long)ClsPub.isInt(text9.Substring(4, 2));
long num10 = (long)ClsPub.isInt(text9.Substring(6, 2));
- long num11 = (long)ClsPub.isInt(sBarCodeNew.Remove(0, sBarCodeNew.Length - 3));
- string text10 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 10);
+ long num11 = (long)ClsPub.isInt(sBarCodeNew.Remove(0, sBarCodeNew.Length - 3));//鍚庝笁浣嶆案杩滈兘鏄暟瀛�
+ string text10 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 10);//澶辨晥鏃ユ湡+涓�浣嶅瓧姣�+涓変綅鏁板瓧
string text11 = "20" + text10.Substring(0, 6);
long num12 = (long)ClsPub.isInt(text11.Substring(0, 4));
long num13 = (long)ClsPub.isInt(text11.Substring(4, 2));
@@ -1236,7 +1241,8 @@
}
else
{
- string str6 = sBarCodeNew.Substring(0, 10);
+ /*鍓嶅崄浣嶇墿鏂欎唬鐮侊紝鍚庡叚浣嶇敓鏁堟棩鏈燂紝鍊掓暟鍓嶄笁浣嶆槸鏁板瓧鍓嶅叚浣嶆槸澶辨晥鏃ユ湡 鎵瑰彿鏀逛负鍔ㄦ�佽幏鍙�*/
+ string str6 = sBarCodeNew.Substring(0, 10);//鐗╂枡浠ｇ爜
string text17 = "20" + sBarCodeNew.Substring(10, 6);
long num21 = (long)ClsPub.isInt(text17.Substring(0, 4));
long num22 = (long)ClsPub.isInt(text17.Substring(4, 2));
@@ -1381,7 +1387,7 @@
}
}
}
- bool flag13 = HBillType == "1244";
+ bool flag13 = HBillType == "1244"; //WMS 鐢熶骇閫�鏂欏崟
if (flag13)
{
bool flag14 = sBarCodeNew.Contains("@");
@@ -1672,7 +1678,7 @@
}
}
}
- bool flag19 = HBillType == "1207";
+ bool flag19 = HBillType == "1207"; //WMS 鐩存帴璋冩嫧
if (flag19)
{
bool flag20 = sBarCodeNew.Contains("@");
@@ -1947,7 +1953,7 @@
}
}
}
- bool flag25 = HBillType == "1206";
+ bool flag25 = HBillType == "1206"; //WMS 閿�鍞嚭搴�
if (flag25)
{
bool flag26 = sBarCodeNew.Contains("@");
@@ -2235,8 +2241,8 @@
}
}
}
- }
- bool flag31 = HBillType == "1204";
+ }
+ bool flag31 = HBillType == "1204"; //WMS 鐢熶骇棰嗘枡
if (flag31)
{
bool flag32 = sBarCodeNew.Contains("@");
@@ -2526,7 +2532,7 @@
}
}
}
- bool flag37 = HBillType == "1254" || HBillType == "1211" || HBillType == "1255";
+ bool flag37 = HBillType == "1254" /*鐢熶骇琛ユ枡*/ || HBillType == "1211" || HBillType == "1255";
if (flag37)
{
bool flag38 = sBarCodeNew.Contains("@");
@@ -2815,7 +2821,7 @@
}
}
}
- bool flag43 = HBillType == "1205";
+ bool flag43 = HBillType == "1205";
if (flag43)
{
bool flag44 = sBarCodeNew.Contains("@");
--
Gitblit v1.9.1