From 3180615984b64c0d7115ae4b202860542375ca9c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 26 九月 2024 21:05:10 +0800
Subject: [PATCH] 送货单生成条码时，物料、批号相同，合并数量生成条码；送货单ID改为前端页面获取
---
WebAPI/DLL/DAL.dll | 0
WebAPI/Controllers/POInStockController.cs | 8 +++-
WebAPI/Controllers/BarCodeController.cs | 53 ++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index b2a2bcf..731daac 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -1388,6 +1388,59 @@
return objjson;
}
}
+
+ [Route("GetHBarCodeShowBillSub_Merge")]
+ [HttpGet]
+ /// <summary>
+ /// 鏉＄爜鐢熸垚琛ㄤ綋(鐗╂枡锛屾壒娆＄浉鍚岋紝鍚堝苟鏁伴噺)
+ /// </summary>
+ /// <param name="sMsg"></param>
+ /// <returns></returns>
+ public object GetHBarCodeShowBillSub_Merge(string HInterID)
+ {
+ try
+ {
+ DataSet ds;
+ string s = "";
+ string ShowItem = " * ";//鏄剧ず鐨勫瓧娈�
+ if (DBUtility.ClsPub.isLong(HInterID) == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触,閫佽揣鍗曞唴鐮佷负绌�";
+ objjson.data = null;
+ return objjson;
+ }
+
+ ds = oCn.RunProcReturn("Select * from h_v_SRM_Barcode_MergePOInStock where HInterID = " + HInterID, "h_v_SRM_Barcode_MergePOInStock");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 10000;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
/// <summary>
/// 鏉＄爜妗ｆ鍒楄〃
/// </summary>
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index fb1547c..5e3db2f 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -85,20 +85,24 @@
return objjson;
}
string HBillNo, HInnerBillNo, HDate;
+ Int64 HInterID;
HBillNo = DBUtility.ClsPub.CreateBillCode_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo, true);
HInnerBillNo = DBUtility.ClsPub.CreateBillCode_SRMProd("777", ref DBUtility.ClsPub.sExeReturnInfo, true);//閫佽揣鍗曞彿
HDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
//鍒涘缓涓存椂琛�
DataTable dt = new DataTable();
//鍒涘缓琛ㄤ腑鐨勫垪
dt.Columns.Add("HBillNo", typeof(string));//娣诲姞鍒�
dt.Columns.Add("HInnerBillNo", typeof(string));//娣诲姞鍒�
dt.Columns.Add("HDate", typeof(string));//娣诲姞鍒�
+ dt.Columns.Add("HInterID", typeof(Int64));//娣诲姞鍒�
DataRow row = dt.NewRow();
//缁欏垪璧嬪��
row["HBillNo"] = HBillNo;
row["HInnerBillNo"] = HInnerBillNo;
row["HDate"] = HDate;
+ row["HInterID"] = HInterID;
//鎶婃湁鍊肩殑鍒楁坊鍔犲埌琛�
dt.Rows.Add(row);
//鎶婅〃娣诲姞鍒癲ataset
@@ -323,7 +327,7 @@
oItem.HCurID = 1;
oItem.HExRate = 1;
oItem.HMainSourceInterID = oItem.HInterID;
- oItem.HInterID = 0;
+ //oItem.HInterID = 0;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
if (FCusName.Contains("瀹夌憺")) //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -427,7 +431,7 @@
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
- if (oBill.omodel.HInterID == 0)
+ if (oBill.omodel.HInterID != 0 && oBill.omodel.HInterID.ToString() != null && oBill.omodel.HInterID.ToString() != "undefined")
{
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 32ea0ea..258f1a0 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
--
Gitblit v1.9.1