From d74b85f0c08da89bf57c0de6eed3d74066dbd627 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 二月 2025 10:36:37 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BarCodeController.cs | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index b2a2bcf..b17ad08 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>
@@ -1820,7 +1873,23 @@
TM2 = "0" + TM2;
}
bar2.HMaterID = oItemSub2.HMaterID;
- bar2.HBarCode = oItemSub2.HBarCode.Replace(HBarcodeQty.ToString(), HWXQty.ToString());
+
+ var HBarCode_NX = oItemSub2.HBarCode.Split('@'); //鍐呯鎷嗗垎鏉＄爜缂栧彿
+ string HBarMaterNumber_NX = HBarCode_NX[0];//鍐呯鏉＄爜_鐗╂枡浠ｇ爜
+ string HBarMaterName_NX = HBarCode_NX[1];//鍐呯鏉＄爜_鐗╂枡鍚嶇О
+ string HBarMaterModel_NX = HBarCode_NX[2];//鍐呯鏉＄爜_鐗╂枡瑙勬牸鍨嬪彿
+ string HBarKFDate_NX = HBarCode_NX[3];//鍐呯鏉＄爜_鐢熶骇鏃ユ湡
+ string HBarQty_NX = HBarCode_NX[4];//鍐呯鏉＄爜_鏁伴噺
+ string HBarKFDQDate_NX = HBarCode_NX[5];//鍐呯鏉＄爜_鏈夋晥鏈熻嚦
+ string HBarBatchNo_NX = HBarCode_NX[6];//鍐呯鏉＄爜_鎵瑰彿
+ string HBarSupName_NX = HBarCode_NX[7];//鍐呯鏉＄爜_渚涘簲鍟嗗悕绉�
+ string HBarSourceBillNo_NX = HBarCode_NX[8];//鍐呯鏉＄爜_婧愬崟鍗曞彿
+
+ HBarQty_NX = HWXQty.ToString();
+
+ string TM_NX = $"{HBarMaterNumber_NX}@{HBarMaterName_NX}@{HBarMaterModel_NX}@{HBarKFDate_NX}@{HBarQty_NX}@{HBarKFDQDate_NX}@{HBarBatchNo_NX.TrimStart().TrimEnd()}@{HBarSupName_NX}@{HBarSourceBillNo_NX}";
+
+ bar2.HBarCode = TM_NX;//oItemSub2.HBarCode.Replace(HBarcodeQty.ToString(), HWXQty.ToString());//闂鎵�鍦� 澶栫鍖呰鏁帮紝鏇挎崲鎴愬唴绠卞寘瑁呮暟
bar2.HUnitID = oItemSub2.HUnitID;
bar2.HQty = HWXQty;
bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
--
Gitblit v1.9.1