From 099c78d289f33f38faceeecaeb86d92f1e6c9945 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 02 七月 2025 16:20:58 +0800
Subject: [PATCH] 新增PDA装箱、组托、拆箱、拆托模块相关调用方法，凯贝超聚变客户条码生成规则变更
---
PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0
PayM/bin/x86/Debug/SQLHelper.dll | 0
WarM/条码打印/Gy_CusBarCodeBill_KaiBei.cs | 8 +
PayM/bin/x86/Debug/Model.pdb | 0
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 4
PayM/bin/x86/Debug/BLL.dll | 0
PayM/bin/x86/Debug/DAL.dll | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 232 +++++++++++++++++++++++++++++++++++++++++++++
PayM/bin/x86/Debug/DBUtility.pdb | 0
PayM/bin/x86/Debug/Pub_Control.pdb | 0
PayM/bin/x86/Debug/Newtonsoft.Json.dll | 0
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 1
PayM/bin/x86/Debug/BLL.pdb | 0
PayM/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll | 0
PayM/bin/x86/Debug/DAL.pdb | 0
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
PayM/bin/x86/Debug/Pub_Class.pdb | 0
PayM/bin/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/Pub_Control.dll | 0
PayM/bin/x86/Debug/PayM.pdb | 0
PayM/bin/x86/Debug/DBUtility.dll | 0
PayM/bin/x86/Debug/Model.dll | 0
PayM/bin/x86/Debug/Pub_Class.dll | 0
PayM/bin/x86/Debug/SQLHelper.pdb | 0
24 files changed, 239 insertions(+), 6 deletions(-)
diff --git a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
new file mode 100644
index 0000000..7a37dd0
--- /dev/null
+++ b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
new file mode 100644
index 0000000..29ab464
--- /dev/null
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
new file mode 100644
index 0000000..fa7165c
--- /dev/null
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
new file mode 100644
index 0000000..bde5880
--- /dev/null
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
new file mode 100644
index 0000000..1d1c2c3
--- /dev/null
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
new file mode 100644
index 0000000..6957f9d
--- /dev/null
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
new file mode 100644
index 0000000..fb12e9d
--- /dev/null
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
new file mode 100644
index 0000000..1971640
--- /dev/null
+++ b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll b/PayM/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll
new file mode 100644
index 0000000..25dd347
--- /dev/null
+++ b/PayM/bin/x86/Debug/Kingdee.BOS.WebApi.Client.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
new file mode 100644
index 0000000..cc54fe0
--- /dev/null
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
new file mode 100644
index 0000000..cdf3cfe
--- /dev/null
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Newtonsoft.Json.dll b/PayM/bin/x86/Debug/Newtonsoft.Json.dll
new file mode 100644
index 0000000..416bd37
--- /dev/null
+++ b/PayM/bin/x86/Debug/Newtonsoft.Json.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
new file mode 100644
index 0000000..9464eae
--- /dev/null
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
new file mode 100644
index 0000000..c9d7da3
--- /dev/null
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
new file mode 100644
index 0000000..1bdff77
--- /dev/null
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
new file mode 100644
index 0000000..a16b963
--- /dev/null
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
new file mode 100644
index 0000000..f204bca
--- /dev/null
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
new file mode 100644
index 0000000..1eaf696
--- /dev/null
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
new file mode 100644
index 0000000..3c54236
--- /dev/null
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
new file mode 100644
index 0000000..153ecce
--- /dev/null
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 0570502..1ae017b 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -3935,6 +3935,10 @@
{
omodel.Sc_PackUnionBill_SourceBillNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_PackUnionBill_MaterialCtl")
+ {
+ omodel.Sc_PackUnionBill_MaterialCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========下架单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MaterialLowerBill_MustQtyCtl")
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index b7f2ab9..b52fc83 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -450,6 +450,7 @@
public string Sc_PackUnionBill_SaveAutoAddnew; //保存后变为新增状态
public string Sc_PackUnionBill_SourceBillTypeCtl; //未入库条码进行组托时，进行同源单类型控制（Y为控制）
public string Sc_PackUnionBill_SourceBillNoCtl; //未入库条码进行组托时，进行同源单控制（Y为控制）
+ public string Sc_PackUnionBill_MaterialCtl; //组托时托条码对应物料与需要组托的条码对应物料要一致（Y为需一致）
public string Sc_PackUnionBill_DeleterAndMakerMustSame; //生产组托单暂存删除人必须是制单人
//下架单
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
index 9ab3a30..3fe31d0 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
@@ -677,7 +677,8 @@
return;
}
//瓒呰仛鍙樻暟瀛楁妧鏈湁闄愬叕鍙� 鏉＄爜缂栧彿锛堝叡26浣嶏級 = 浠ｇ爜锛�1浣嶅浐瀹氣�楽鈥欙級 + 鍘傚晢浠ｇ爜锛�2浣嶅浐瀹氣�榊3鈥欙級 + 骞达紙2浣嶅勾鍚庝袱浣嶏級 + 鏈堬紙1浣�10=A,11=B,12=C锛� + 娴佹按鍙凤紙7浣嶏級 + 浠ｅ彿锛�2浣嶅浐瀹氣��1P鈥欙級 + 瀹㈡埛浠ｇ爜锛�8浣嶅彇閲戣澏瀹㈡埛鐗╂枡瀵瑰簲琛ㄥ鎴风墿鏂欑紪鐮侊級 + 鐗╂枡鐗堟湰锛�3浣嶅彇鐗╂枡缂栫爜鍚庝笁浣嶏級
- TM = "SY3" + sYear + sPeriod + LSH2 + "1P" + sHCusModelName + HMaterNumber;
+ TM = "SY3" + sYear + sPeriod + LSH2 + "1P" + sHCusModelName;
+ //TM = "SY3" + sYear + sPeriod + LSH2 + "1P" + sHCusModelName + HMaterNumber;
HEntryID = j + 1;
HBarCode = TM.ToUpper();
@@ -700,11 +701,12 @@
HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
+ HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
HSno = ClsPub.isStrNull(LSH);
HBoxNo = sTMNumber;
sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // 鐣岄潰涓婅緭鍏ョ殑鎵规浣�
- //瓒呰仛鍙樻暟瀛楁妧鏈湁闄愬叕鍙� 瀹㈡埛鐗╂枡缂栫爜HCusModelName銆佹祦姘村彿HSno銆佹祦姘村彿HSupNumber銆佹祦姘村彿鐢熸垚鍓嶇紑HBoxNo
+ //瓒呰仛鍙樻暟瀛楁妧鏈湁闄愬叕鍙� 瀹㈡埛鐗╂枡缂栫爜HCusModelName銆佹祦姘村彿HSno銆佹祦姘村彿HSupNumber銆佹祦姘村彿鐢熸垚鍓嶇紑HBoxNo銆佺墿鏂欑増鏈琀Code3
oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
"(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
@@ -881,7 +883,7 @@
grdMain.Columns[HBaNoCol].Visible = false;
grdMain.Columns[HCode1Col].Visible = false;
grdMain.Columns[HCode2Col].Visible = false;
- grdMain.Columns[HCode3Col].Visible = false;
+ //grdMain.Columns[HCode3Col].Visible = false;
grdMain.Columns[HInnerBillNoCol].Visible = false;
//璁剧疆鍙紪杈戝垪
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 92184d2..9bcbd83 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -4028,7 +4028,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + " 淇濆瓨鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -4045,7 +4045,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鐢熸垚鐢熶骇缁勬墭鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "鐢熸垚鍗曟嵁澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -6956,6 +6956,56 @@
#endregion
+ #region 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿绠憋紙鎵橈級鏉＄爜 20250630
+
+ /// <summary>
+ /// 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿绠憋紙鎵橈級鏉＄爜
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json")]
+ [HttpGet]
+ public object get_PackBarCode_PackUnionBill_New_Json(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鎵樻潯鐮佸彂鐢熼敊璇紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鎵樻潯鐮佸け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿鎵樻潯鐮佸搴斿崟涓潯鐮�
/// <summary>
@@ -6990,6 +7040,76 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿鎵樻潯鐮佸搴旀潯鐮� 20250630
+
+ /// <summary>
+ /// 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿鎵樻潯鐮佸搴旀潯鐮�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Get_BarCode_PackUnionBill_New_Json")]
+ [HttpGet]
+ public object get_BarCode_PackUnionBill_New_Json(string HBarCode, Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HMaterNumber_Pack, string HMaker, Int64 HStockOrgID)
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
+ {
+ string sMaterialCtl = "Y"; //缁勬墭鏃舵墭鏉＄爜瀵瑰簲鐗╂枡涓庨渶瑕佺粍鎵樼殑鏉＄爜瀵瑰簲鐗╂枡瑕佷竴鑷达紙Y涓洪渶涓�鑷达級
+ string sSourceBillTypeCtl = "Y"; //鏈叆搴撴潯鐮佽繘琛岀粍鎵樻椂锛岃繘琛屽悓婧愬崟绫诲瀷鎺у埗锛圷涓烘帶鍒讹級
+ string sSourceBillNoCtl = "Y"; //鏈叆搴撴潯鐮佽繘琛岀粍鎵樻椂锛岃繘琛屽悓婧愬崟鎺у埗锛圷涓烘帶鍒讹級
+ sMaterialCtl = oSystemParameter.omodel.Sc_PackUnionBill_MaterialCtl.ToUpper();
+ sSourceBillTypeCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillTypeCtl.ToUpper();
+ sSourceBillNoCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillNoCtl.ToUpper();
+
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜鍙戠敓閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -7064,7 +7184,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
@@ -7324,6 +7444,112 @@
#endregion
+ #region 鎷嗙锛堟媶鎵橈級妯″潡 鎵弿鎵樻潯鐮� 20250702
+
+ /// <summary>
+ ///鎷嗙锛堟媶鎵橈級妯″潡 鎵弿鎵樻潯鐮�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Get_PackBarCode_UnPackUnionBill_Json")]
+ [HttpGet]
+ public object Get_PackBarCode_UnPackUnionBill_Json(string HBarCode_Pack, string HBillSubType)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_UnPackUnionBill_New '" + HBarCode_Pack + "','" + HBillSubType + "'", "h_p_WMS_AddPackBarCode_UnPackUnionBill_New");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鎵樻潯鐮佸垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 0)
+ {
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎷嗙锛堟媶鎵橈級妯″潡锛岃幏鍙栫锛堟墭锛夋潯鐮佷俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鎷嗙锛堟媶鎵橈級妯″潡 涓婁紶 鍒犻櫎缁勬墭鍗曚俊鎭� 20250702
+
+ /// <summary>
+ /// 涓婁紶 鍒犻櫎缁勬墭鍗曚俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveUnPackUnionBill_Json")]
+ [HttpGet]
+ public object set_SaveUnPackUnionBill_Json(long HInterID, string HBillNo, string HBarCode_Pack, string HMaker)
+ {
+ try
+ {
+ string WorkList = "鍗曟嵁鍙凤細"+@HBillNo+ "锛屽搴旂锛堟墭锛夋潯鐮侊細" + @HBarCode_Pack+ "锛屾媶绠憋紙鎷嗘墭锛夋垚鍔燂紒";
+ string SystemName = "WMS-鎷嗙锛堟媶鎵橈級妯″潡";
+ oCn.BeginTran();
+ //鍒犻櫎缁勬墭鍗曡褰�
+ oCn.RunProc("Delete from Sc_PackUnionBillMain where HInterID=" + HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("Delete from Sc_PackUnionBillSub where HInterID=" + HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍥炲～鏉＄爜妗ｆ鎵樻潯鐮佹暟閲�
+ oCn.RunProc("Update Gy_BarCodeBill Set HQty=0 where HBarCodeType='鎵樼洏鏉＄爜' and HBarCode='" + HBarCode_Pack+"'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆鏃ュ織
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鎷嗙锛堟媶鎵橈級')"
+ );
+ oCn.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏉＄爜锛�" + HBarCode_Pack + " 鎷嗙锛堟媶鎵橈級鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎷嗙锛堟媶鎵橈級澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#endregion
--
Gitblit v1.9.1