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/Controllers/BarCodeController.cs |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 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>
         /// 鏉$爜妗f鍒楄〃
         /// </summary>

--
Gitblit v1.9.1