From 0195b27cf5b6420c2d8f8642f4509acf409eec4d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 16 十二月 2022 20:07:32 +0800
Subject: [PATCH] CLOUD单据上传方法增加是否为私有云模式参数判断
---
DLL/Pub_Class.dll | 0
CLOUDWEB/WebService1.asmx.cs | 1028 ++++++++++++++++++++++++++++++++++++---------------------
2 files changed, 648 insertions(+), 380 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 9d652ce..0faab8b 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -4351,7 +4351,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HPRDORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -4513,7 +4513,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -4523,16 +4532,7 @@
else
{
string sJson_ZYMESFLAG = ""; //鐢熶骇姹囨姤鍗曞悓姝ES鏍囪
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Sc_ICMOReportBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
sJson_ZYMESFLAG = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FHZYMESFLAG"]);
@@ -4559,6 +4559,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_EntryCustom = "";
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -4574,6 +4576,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -4661,8 +4675,8 @@
" \"FCOSTRATE\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCOSTRATE"]) + "," +
" \"FSNUNITID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSNUNITID"]) + "\"}," +
//" \"FSNQty\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSNQty"]) + "," +
- //\"FProduceDate\":\"1900-01-01\",
- //\"FExpiryDate\":\"1900-01-01\",
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
" \"FISBACKFLUSH\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISBACKFLUSH"]) + "," +
" \"FMOMAINENTRYID\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMOMAINENTRYID"]) + "," +
" \"FQAIP\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQAIP"]) + "\"," +
@@ -6887,7 +6901,7 @@
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -7301,7 +7315,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -7310,16 +7333,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MoveStockBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -7366,6 +7380,8 @@
string sJson_DestBatchNo = ""; //璋冨叆鎵瑰彿
string sJson_SrcStockPlace = "";
string sJson_DestStockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -7382,6 +7398,18 @@
{
sJson_BatchNo = "";
sJson_DestBatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -7431,11 +7459,11 @@
" \"FSrcStockStatusId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcStockStatusId"]) + "\"}," +
//\"FDeliChkQualifyType\":\"\",
//\"FAmount\":\"0\",
- //\"FProduceDate\":\"1900-01-01\",
+ sJson_FProduceDate +
" \"FDestStockStatusId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestStockStatusId"]) + "\"}," +
" \"FMtoNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMtoNo"]) + "\"," +
" \"FBusinessDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBusinessDate"]) + "\"," +
- //\"FExpiryDate\":\"1900-01-01\",
+ sJson_FExpiryDate +
" \"FOwnerTypeOutId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerTypeOutId"]) + "\"," +
" \"FOwnerOutId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerOutId"]) + "\"}," +
" \"FOwnerTypeId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerTypeId"]) + "\"," +
@@ -7670,7 +7698,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -7679,16 +7716,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MoveStockBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -8083,7 +8111,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -8092,16 +8129,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MoveStockBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -8475,7 +8503,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_CLD");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_PUBCLD");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_CLD");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -8485,16 +8522,7 @@
else
{
string sJson_StockStyle = "";
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MoveStockBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
@@ -8539,6 +8567,8 @@
string sJson_BatchNo = "";
string sJson_SrcStockPlace = "";
string sJson_DestStockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -8553,6 +8583,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//璋冨叆浠撲綅銆佽皟鍑轰粨浣�
@@ -8616,6 +8658,8 @@
"\"FSrcStockStatusId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcStockStatusId"]) + "\" }," +
"\"FDestStockStatusId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestStockStatusId"]) + "\" }," +
// "\"FBusinessDate\":\"" + oMain.HDate.ToShortDateString() + "\"," +
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
"\"FOwnerTypeOutId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerTypeOutId"]) + "\"," +
"\"FOwnerOutId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerOutId"]) + "\" }," +
"\"FOwnerTypeId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerTypeId"]) + "\"," +
@@ -8969,7 +9013,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -9151,7 +9195,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -9160,16 +9213,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -9230,6 +9274,22 @@
sJson_DestBatchNo = "";
}
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ sJson_FDestProduceDate = " \"FDestProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestProduceDate"]) + "\",";
+ sJson_FDestExpiryDate = " \"FDESTEXPIRYDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDESTEXPIRYDATE"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
+ sJson_FDestProduceDate = "";
+ sJson_FDestExpiryDate = "";
+ }
+
//杈呭姪灞炴��
sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
@@ -9251,22 +9311,6 @@
else
{
sJson_DestStockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestStockLocId"]) + "\"}},";
- }
-
- //鏄惁鍚敤淇濊川鏈熸帶鍒�
- if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
- {
- sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
- sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
- sJson_FDestProduceDate = " \"FDestProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestProduceDate"]) + "\",";
- sJson_FDestExpiryDate = " \"FDESTEXPIRYDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDESTEXPIRYDATE"]) + "\",";
- }
- else
- {
- sJson_FProduceDate = "";
- sJson_FExpiryDate = "";
- sJson_FDestProduceDate = "";
- sJson_FDestExpiryDate = "";
}
sJson_Entry = sJson_Entry + " {" +
@@ -9518,7 +9562,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_CLD");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_PUBCLD");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_CLD");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -9528,16 +9581,7 @@
else
{
string sJson_Custom = "";
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
if (oSystemParameterMain.WMS_CampanyName == "鍥涚淮灏�")//绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
@@ -9593,6 +9637,10 @@
string sJson_BatchNo = "";
string sJson_SrcStockPlace = "";
string sJson_DestStockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
+ string sJson_FDestProduceDate = ""; //璋冨叆鐢熶骇鏃ユ湡
+ string sJson_FDestExpiryDate = ""; //璋冨叆鏈夋晥鏈熻嚦
string sJson_EntryCustom = "";
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -9608,6 +9656,22 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ sJson_FDestProduceDate = " \"FDestProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestProduceDate"]) + "\",";
+ sJson_FDestExpiryDate = " \"FDESTEXPIRYDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDESTEXPIRYDATE"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
+ sJson_FDestProduceDate = "";
+ sJson_FDestExpiryDate = "";
}
//杈呭姪灞炴��
@@ -9664,7 +9728,7 @@
"\"FSrcStockStatusId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcStockStatusId"]) + "\" }," +
//"\"FDELICHKQUALIFYTYPE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDELICHKQUALIFYTYPE"]) + "\"," +
"\"FDestStockStatusId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestStockStatusId"]) + "\" }," +
- //\"FProduceDate\":\"1900-01-01\",
+ sJson_FProduceDate +
//\"FBusinessDate\":\"1900-01-01\",
"\"FOwnerTypeId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerTypeId"]) + "\"," +
"\"FOwnerId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerId"]) + "\" }," +
@@ -9693,6 +9757,9 @@
"\"FRowType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FRowType"]) + "\"," +
"\"FSTOCKOUTFLAG\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKOUTFLAG"]) + "\"," +
"\"FSRCTYPE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSRCTYPE"]) + "\"," +
+ sJson_FExpiryDate +
+ sJson_FDestProduceDate +
+ sJson_FDestExpiryDate +
sJson_EntryCustom +
sJson_SubCustom +
@@ -9894,7 +9961,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_CLD");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_PUBCLD");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_CLD");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -9903,16 +9979,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -9954,6 +10021,10 @@
string sJson_BatchNo = "";
string sJson_SrcStockPlace = "";
string sJson_DestStockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
+ string sJson_FDestProduceDate = ""; //璋冨叆鐢熶骇鏃ユ湡
+ string sJson_FDestExpiryDate = ""; //璋冨叆鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -9968,6 +10039,22 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ sJson_FDestProduceDate = " \"FDestProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestProduceDate"]) + "\",";
+ sJson_FDestExpiryDate = " \"FDESTEXPIRYDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDESTEXPIRYDATE"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
+ sJson_FDestProduceDate = "";
+ sJson_FDestExpiryDate = "";
}
//杈呭姪灞炴��
@@ -10016,7 +10103,7 @@
"\"FSrcStockStatusId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcStockStatusId"]) + "\" }," +
//"\"FDELICHKQUALIFYTYPE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDELICHKQUALIFYTYPE"]) + "\"," +
"\"FDestStockStatusId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestStockStatusId"]) + "\" }," +
- //\"FProduceDate\":\"1900-01-01\",
+ sJson_FProduceDate +
//\"FBusinessDate\":\"1900-01-01\",
"\"FOwnerTypeId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerTypeId"]) + "\"," +
"\"FOwnerId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerId"]) + "\" }," +
@@ -10045,7 +10132,10 @@
"\"FRowType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FRowType"]) + "\"," +
"\"FSTOCKOUTFLAG\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKOUTFLAG"]) + "\"," +
"\"FSRCTYPE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSRCTYPE"]) + "\"," +
- sJson_SubCustom +
+ sJson_FExpiryDate +
+ sJson_FDestProduceDate +
+ sJson_FDestExpiryDate +
+ sJson_SubCustom +
//\"FSerialSubEntity\":[{\"FDetailID\":\"0\",
//\"FSerialNo\":\"\",
@@ -10169,7 +10259,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -10323,7 +10413,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_CLD");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_PUBCLD");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_CLD");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -10333,16 +10432,7 @@
else
{
string sJson_Custom = "";
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MoveStockStepInBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
if (oSystemParameterMain.WMS_CampanyName == "鍥涚淮灏�")//绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
@@ -10397,6 +10487,10 @@
string sJson_BatchNo = "";
string sJson_SrcStockPlace = "";
string sJson_DestStockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
+ string sJson_FSrcProduceDate = ""; //璋冨嚭鐢熶骇鏃ユ湡
+ string sJson_FSrcExpiryDate = ""; //璋冨嚭鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -10421,6 +10515,22 @@
else
{
sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ sJson_FSrcProduceDate = " \"FSrcProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcProduceDate"]) + "\",";
+ sJson_FSrcExpiryDate = " \"FSrcExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
+ sJson_FSrcProduceDate = "";
+ sJson_FSrcExpiryDate = "";
}
//璋冨叆浠撲綅
@@ -10456,7 +10566,7 @@
//\"FDestLot\":{\"FNumber\":\"\"},
"\"FSrcStockId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcStockId"]) + "\" }," +
"\"FDestStockId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDestStockId"]) + "\" }," +
- //\"FProduceDate\":\"1900-01-01\",
+ sJson_FProduceDate +
sJson_SrcStockPlace +
"\"FSrcStockStatusId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcStockStatusId"]) + "\" }," +
//\"FBOMID\":{\"FNumber\":\"\"},
@@ -10474,12 +10584,12 @@
//\"FBusinessDate\":\"1900-01-01\",
"\"FSrcMaterialId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMaterialId"]) + "\" }," +
//"\"FSecUnitID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSecUnitID"]) + "\" }," +
- //\"FSrcProduceDate\":\"1900-01-01\",
+ sJson_FSrcProduceDate +
sJson_BatchNo +
//\"FSRCBOMID\":{\"FNumber\":\"\"},
//"\"FBaseQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseQty"]) + "\"," +
//\"FSRCMTONO\":\"\",
- //\"FSrcExpiryDate\":\"1900-01-01\",
+ sJson_FSrcExpiryDate +
//\"FExtAuxUnitId\":{\"FNumber\":\"\"},
//\"FExtAuxUnitQty\":\"0\",
//\"FWayAuxUnitQty\":\"0\",
@@ -10497,7 +10607,8 @@
"\"FRowType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FRowType"]) + "\"," +
"\"FSTOCKOUTFLAG\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKOUTFLAG"]) + "\"," +
"\"FSRCTYPE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSRCTYPE"]) + "\"," +
- sJson_SubCustom +
+ sJson_FExpiryDate +
+ sJson_SubCustom +
//\"FSerialSubEntity\":[{\"FDetailID\":\"0\",
//\"FSerialNo\":\"\",
@@ -10817,7 +10928,7 @@
string sHBillNo = "";
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -11755,7 +11866,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -11764,16 +11884,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_SellOutBackBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\", " +
@@ -11856,18 +11967,8 @@
sJson_BatchNo = "";
}
- //杈呭姪灞炴��
- if (oSystemParameterMain.WMS_CampanyName == "鍑礉濂堢壒") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
- {
- sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100001\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
- }
- else
- {
- sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
- }
-
//鏄惁鍚敤淇濊川鏈熸帶鍒�
- if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
{
sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
@@ -11876,6 +11977,16 @@
{
sJson_FProduceDate = "";
sJson_FExpiryDate = "";
+ }
+
+ //杈呭姪灞炴��
+ if (oSystemParameterMain.WMS_CampanyName == "鍑礉濂堢壒") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100001\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
+ }
+ else
+ {
+ sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
}
//浠撲綅
@@ -12163,7 +12274,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -12172,16 +12292,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_SellOutBackBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\", " +
@@ -13021,7 +13132,7 @@
string sHBillNo = "";
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -13823,7 +13934,16 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -13832,16 +13952,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_SellOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -14245,7 +14356,16 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -14254,17 +14374,8 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
string sIsEntryBatchFill = "True"; //鏄惁鎵归噺濉厖鍒嗗綍锛岄粯璁rue锛堥潪蹇呭綍锛�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_SellOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
if (oSystemParameterMain.WMS_CampanyName == "鍗氭棩绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
@@ -15522,7 +15633,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -15861,7 +15972,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -15870,16 +15990,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MateOutBackBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\", " +
@@ -15929,6 +16040,18 @@
sJson_BatchNo = "";
}
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
+ }
+
//杈呭姪灞炴��
if (oSystemParameterMain.WMS_CampanyName == "鍑礉濂堢壒") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -15947,18 +16070,6 @@
else
{
sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
- }
-
- //鏄惁鍚敤淇濊川鏈熸帶鍒�
- if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
- {
- sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
- sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
- }
- else
- {
- sJson_FProduceDate = "";
- sJson_FExpiryDate = "";
}
sJson_Entry = sJson_Entry + "{" +
@@ -16354,7 +16465,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -16739,7 +16850,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -16748,16 +16868,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MateOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -16791,8 +16902,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
- string sJson_FProduceDate = "";
- string sJson_FExpiryDate = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -17509,7 +17620,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -17645,13 +17756,23 @@
", " + oMain.HSTOCKORGID.ToString() + "," + oMain.HOWNERID.ToString() +
") ");
//鏇存柊鍏宠仈鏁伴噺
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_PPBomToMateReplenishOut_Add " + oMain.HInterID.ToString());
sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + oMain.HOWNERID.ToString(), "h_p_Kf_GetMateReplenishOutBill_PPBom_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateReplenishOutBill_PPBom_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateReplenishOutBill_PPBom_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -17660,16 +17781,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_MateReplenishOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -17702,6 +17814,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -17716,6 +17830,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -17763,7 +17889,7 @@
//\"FFeedReasonId\":{\"FNumber\":\"\"},
//\"FEntrtyDescription\":\"\",
"\"FStockStatusId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockStatusId"]) + "\"}," +
- //\"FProduceDate\":\"1900-01-01\",
+ sJson_FProduceDate +
"\"FMtoNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMtoNo"]) + "\"," +
"\"FProjectNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProjectNo"]) + "\"," +
"\"FMoBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMoBillNo"]) + "\"," +
@@ -17791,7 +17917,7 @@
"\"FKeeperTypeId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKeeperTypeId"]) + "\"," +
"\"FKeeperId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKeeperId"]) + "\"}," +
"\"FOwnerId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOwnerId"]) + "\"}," +
- //\"FExpiryDate\":\"1900-01-01\",
+ sJson_FExpiryDate +
"\"FEntrySrcInterId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntrySrcInterId"]) + "\"," +
"\"FEntrySrcBillType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntrySrcBillType"]) + "\"," +
"\"FEntrySrcEnteryId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntrySrcEnteryId"]) + "\"," +
@@ -18460,7 +18586,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -18804,7 +18930,16 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -18813,16 +18948,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_EntrustOutBackBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\", " +
@@ -18856,6 +18982,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -18870,6 +18998,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -18939,8 +19079,8 @@
"\"FMtoNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMtoNo"]) + "\"," +
"\"FProjectNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProjectNo"]) + "\"," +
"\"FStockStatusId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockStatusId"]) + "\"}," +
- //\"FProduceDate\":\"1900-01-01\",
- //\"FExpiryDate\":\"1900-01-01\",
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
"\"FKeeperTypeId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKeeperTypeId"]) + "\"," +
"\"FKeeperId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKeeperId"]) + "\"}," +
"\"FProcessId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProcessId"]) + "\"}," +
@@ -19276,7 +19416,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -19627,7 +19767,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -19636,16 +19785,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_EntrustOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -19677,6 +19817,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -19691,6 +19833,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -19760,8 +19914,8 @@
" \"FKEEPERTYPEID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERTYPEID"]) + "\"," +
" \"FKEEPERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERID"]) + "\"}," +
" \"FSTOCKSTATUSID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKSTATUSID"]) + "\"}," +
- //\"FProduceDate\":\"1900-01-01\",
- //\"FExpiryDate\":\"1900-01-01\",
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
//\"FAllowOverQty\":\"0\",
" \"FOWNERTYPEID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOWNERTYPEID"]) + "\"," +
" \"FOWNERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOWNERID"]) + "\"}," +
@@ -20253,7 +20407,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -20658,7 +20812,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -21034,7 +21188,16 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -21043,16 +21206,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_OtherOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
@@ -21354,7 +21508,16 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_CLD");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_PUBCLD");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_CLD");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -21364,16 +21527,7 @@
else
{
string sJson_StockStyle = "";
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_OtherOutBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
@@ -21418,6 +21572,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -21432,6 +21588,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//浠撲綅
@@ -21488,7 +21656,8 @@
//"\"FEntryNote\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntryNote"]) + "," +
//"\"FBomId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBomId"]) + "\"}," +
//"\"FProjectNo\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProjectNo"]) + "," +
- //"\"FProduceDate\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "," +
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
//"\"FServiceContext\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FServiceContext"]) + "," +
"\"FStockStatusId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockStatusId"]) + "\"}," +
//"\"FMtoNo\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMtoNo"]) + "," +
@@ -22096,7 +22265,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -22478,7 +22647,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -22487,16 +22665,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_POStockInBackBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\", " +
@@ -22566,6 +22735,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -22580,6 +22751,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -22640,8 +22823,8 @@
"\"FBOMID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBOMID"]) + "\"}," +
"\"FSupplierLot\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSupplierLot"]) + "\"," +
sJson_BatchNo +
- //\"FProduceDate\":\"1900-01-01\",
- //\"FEXPIRYDATE\":\"1900-01-01\",
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
//\"FAUXUNITQTY\":\"0\",
"\"FENTRYTAXRATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FENTRYTAXRATE"]) + "\"," +
"\"FDISCOUNTRATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FDISCOUNTRATE"]) + "\"," +
@@ -22873,7 +23056,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -22882,16 +23074,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_POStockInBackBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\", " +
@@ -22958,6 +23141,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -22972,6 +23157,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -23032,8 +23229,8 @@
"\"FBOMID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBOMID"]) + "\"}," +
//\"FSupplierLot\":\"\",
sJson_BatchNo +
- //\"FProduceDate\":\"1900-01-01\",
- //\"FEXPIRYDATE\":\"1900-01-01\",
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
//\"FAUXUNITQTY\":\"0\",
//\"FENTRYTAXRATE\":\"0\",
//\"FDISCOUNTRATE\":\"0\",
@@ -23919,7 +24116,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -24309,7 +24506,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -24319,16 +24525,7 @@
else
{
string sJson_Custom = ""; //鑷畾涔夊瓧娈�
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_POStockInBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
if (oSystemParameterMain.WMS_CampanyName == "鍦ｉ緳") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
@@ -24730,7 +24927,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -24739,16 +24945,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_POStockInBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -24811,6 +25008,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -24825,6 +25024,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -24868,7 +25079,7 @@
"\"FMtoNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMtoNo"]) + "\"," +
"\"FGiveAway\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FGiveAway"]) + "," +
//\"FNote\":\"\",
- //"\"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\"," +
+ sJson_FProduceDate +
"\"FExtAuxUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExtAuxUnitId"]) + "\"}," +
//\"FExtAuxUnitQty\":\"0\",
"\"FCheckInComing\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCheckInComing"]) + "," +
@@ -24890,7 +25101,7 @@
//\"FCostPrice\":\"0\",
"\"FBOMId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBOMId"]) + "\"}," +
"\"FSupplierLot\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSupplierLot"]) + "\"," +
- //"\"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\"," +
+ sJson_FExpiryDate +
"\"FAuxUnitQty\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAuxUnitQty"]) + "," +
//\"FBeforeDisPriceQty\":\"0\",
//
@@ -26265,7 +26476,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -27054,7 +27265,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -27063,16 +27283,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_ProductInBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -27104,6 +27315,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -27118,6 +27331,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//杈呭姪灞炴��
@@ -27180,9 +27405,9 @@
" \"FMOMAINENTRYID\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMOMAINENTRYID"]) + "," +
" \"FKEEPERTYPEID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERTYPEID"]) + "\"," +
" \"FKEEPERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERID"]) + "\"}," +
- //\"FProduceDate\":\"1900-01-01\",
+ sJson_FProduceDate +
//\"FSelReStkQty\":\"0\",
- //\"FExpiryDate\":\"1900-01-01\",
+ sJson_FExpiryDate +
//\"FBaseSelReStkQty\":\"0\",
" \"FSNUNITID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSNUNITID"]) + "\"}," +
" \"FQAIP\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQAIP"]) + "\"," +
@@ -27386,7 +27611,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -27395,16 +27629,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if(sCheckFlag!="")
- {
- oSystemParameterMain.Kf_ProductInBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -27746,7 +27971,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -27756,7 +27990,6 @@
else
{
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -28364,7 +28597,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -28847,7 +29080,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -29171,7 +29404,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_CLD_New");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_CLD_New");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -29180,16 +29422,7 @@
}
else
{
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_EntrustInBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
@@ -29851,7 +30084,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -30281,7 +30514,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
@@ -30629,7 +30862,16 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_CLD");
+ if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_PUBCLD");
+ sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+ }
+ else
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_CLD");
+ sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+ }
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -30639,16 +30881,7 @@
else
{
string sJson_StockStyle = "";
- string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
-
- //鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
- sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
- if (sCheckFlag != "")
- {
- oSystemParameterMain.Kf_OtherInBill_AutoCheck = sCheckFlag;
- }
-
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
@@ -30692,6 +30925,8 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
string sJson_FAUXPROPID = "";
string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
@@ -30706,6 +30941,18 @@
else
{
sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
}
//浠撲綅
@@ -30760,7 +31007,8 @@
sJson_BatchNo +
"\"FEntryNote\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntryNote"]) + "\"," +
//"\"FBOMID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBOMID"]) + "\"}," +
- //"\"FPRODUCEDATE\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPRODUCEDATE"]) + "," +
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
//"\"FMTONO\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMTONO"]) + "," +
"\"FExtAuxUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExtAuxUnitId"]) + "\"}," +
//"\"FProjectNo\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProjectNo"]) + "," +
@@ -41639,6 +41887,7 @@
}
}
}
+ oBar.HBarType = "婧愬崟鏉＄爜";
oBar.HMulSourceFlag = sMulSourceFlag;
oBar.HSourceBillType = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillType"]);
oBar.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillNo"]);
@@ -41782,7 +42031,7 @@
//鍏堣繘鍏堝嚭鎺у埗
if (oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl == "Y") //绯荤粺鍙傛暟 濮斿鍑哄簱鍗�-鍏堣繘鍏堝嚭鎺у埗
{
- DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_EntrustOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString(), "h_p_WMS_AddSourceFIFO_EntrustOut");
+ DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_EntrustOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceFIFO_EntrustOut");
if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
{
sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘瓨鍏ュ厛杩涘厛鍑轰复鏃惰〃澶辫触锛�";
@@ -41797,6 +42046,25 @@
}
}
}
+ //鍏堣繘鍏堝嚭涓嬫灦娓呭崟
+ else if (oSystemParameter.omodel.Kf_EntrustOutBill_FIFOList == "Y") //绯荤粺鍙傛暟 濮斿鍑哄簱鍗�-鍏堣繘鍏堝嚭涓嬫灦娓呭崟
+ {
+ DataSet FIFOList = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFOList_EntrustOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceFIFOList_EntrustOut");
+ if (FIFOList == null || FIFOList.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘瓨鍏ュ厛杩涘厛鍑轰笅鏋舵竻鍗曞け璐ワ紒";
+ return null;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(FIFOList.Tables[0].Rows[0][0]) == 1)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + DBUtility.ClsPub.isStrNull(FIFOList.Tables[0].Rows[0]["HRemark"]);
+ return null;
+ }
+ }
+ }
+ oBar.HBarType = "婧愬崟鏉＄爜";
oBar.HMulSourceFlag = sMulSourceFlag;
oBar.HSourceBillType = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillType"]);
oBar.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillNo"]);
@@ -43853,8 +44121,8 @@
}
}
- //搴撳瓨鎺у埗-ERP璐熷簱瀛樻帶鍒�
- if (oSystemParameterMain.WMS_ERPStockCtl == "Y")
+ //搴撳瓨鎺у埗-ERP璐熷簱瀛樻帶鍒� 绉佹湁浜戞ā寮�
+ if (oSystemParameterMain.WMS_ERPStockCtl == "Y" && oSystemParameterMain.WMS_CloudMode == "Y")
{
//鍒ゆ柇ERP搴撳瓨 杩斿洖ERP搴撳瓨鏁伴噺
DataSet DsERP = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetERPICInventory " + HInterID.ToString() + ",'" + HBillType + "','" + HMaterNumber + "'," + omodel_View.HAuxPropID.ToString() + ",'" + omodel_View.HBatchNo + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_GetERPICInventory");
@@ -43976,7 +44244,7 @@
if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && sOneScanCtl == "Y")
{
//涓�娆℃壂鐮佹帶鍒讹紝鍚屼竴鏉＄爜銆佸悓涓�鍗曟嵁绫诲瀷锛屽湪WMS琛ㄥ拰TEMP琛ㄩ噷锛屽彧鍏佽杩涜涓�娆℃壂鐮�
- DataSet dsOneScan = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_OneScan '" + omodel_View.HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + ",0,0,'" + HMaker + "'", "h_p_WMS_AddBarCode_OneScan");
+ DataSet dsOneScan = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_OneScan '" + omodel_View.HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + ",0,0,'" + HMaker + "'", "h_p_WMS_AddBarCode_OneScan");
if (dsOneScan == null || dsOneScan.Tables[0].Rows.Count == 0)
{
}
@@ -44603,8 +44871,8 @@
}
}
- //鍒ゆ柇ERP搴撳瓨 搴撳瓨鎺у埗-ERP璐熷簱瀛樻帶鍒�
- if (oSystemParameterMain.WMS_ERPStockCtl == "Y" && HBillType != "1251")
+ //鍒ゆ柇ERP搴撳瓨 搴撳瓨鎺у埗-ERP璐熷簱瀛樻帶鍒� 绉佹湁浜戞ā寮�
+ if (oSystemParameterMain.WMS_ERPStockCtl == "Y" && oSystemParameterMain.WMS_CloudMode == "Y" && HBillType != "1251")
{
//鍒ゆ柇ERP搴撳瓨 杩斿洖ERP搴撳瓨鏁伴噺
DataSet DsERP = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetERPICInventory " + HBillID.ToString() + ",'" + HBillType + "','" + HMaterNumber + "'," + omodel_View.HAuxPropID.ToString() + ",'" + omodel_View.HBatchNo + "'," + HSCWHID.ToString() + "," + HSCSPID.ToString() + "," + HStockOutOrgID.ToString(), "h_p_WMS_AddBarCode_GetERPICInventory");
@@ -44642,15 +44910,15 @@
if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && sOneScanCtl == "Y")
{
//涓�娆℃壂鐮佹帶鍒讹紝鍚屼竴鏉＄爜銆佸悓涓�鍗曟嵁绫诲瀷锛屽湪WMS琛ㄥ拰TEMP琛ㄩ噷锛屽彧鍏佽杩涜涓�娆℃壂鐮�
- DataSet ds = oCn.RunProcReturn("exec h_p_WMS_CheckBarCodeOneScan " + HBillID.ToString() + ",'" + omodel_View.HBarCode + "','" + HBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HSCWHID.ToString() + "," + HSCSPID.ToString() + ",'" + HMaker + "'", "h_p_WMS_CheckBarCodeOneScan");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ DataSet dsOneScan = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_OneScan '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HSCWHID.ToString() + "," + HSCSPID.ToString() + ",'" + HMaker + "'", "h_p_WMS_AddBarCode_OneScan");
+ if (dsOneScan == null || dsOneScan.Tables[0].Rows.Count == 0)
{
}
else
{
- if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
+ if (DBUtility.ClsPub.isLong(dsOneScan.Tables[0].Rows[0][0]) == 1)
{
- sErrMsg = "瀵逛笉璧凤紝鎮ㄦ壂鎻忕殑鏉″舰鐮佸凡琚壂鎻忚繃锛屼笉绗﹀悎涓�娆℃壂鐮佺郴缁熷弬鏁扮殑瑕佹眰锛�";
+ sErrMsg = DBUtility.ClsPub.isStrNull(dsOneScan.Tables[0].Rows[0]["HRemark"]);
return false;
}
}
diff --git a/DLL/Pub_Class.dll b/DLL/Pub_Class.dll
index a0fb680..d20f114 100644
--- a/DLL/Pub_Class.dll
+++ b/DLL/Pub_Class.dll
Binary files differ
--
Gitblit v1.9.1