From c05f1964fc49bebb9ea64e189400337f8d4f0c42 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 12 九月 2024 10:04:25 +0800
Subject: [PATCH] 批量修改ClsCN;添康科技生成条码时设置为批次码;

---
 WebAPI/Controllers/POInStockController.cs |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index fb9a568..5251654 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -37,7 +37,7 @@
         {
             try
             {
-                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                 //鍐欏叆 System_Log 鎿嶄綔鏃ュ織琛�
                 WebAPIController.Add_Log("閫佽揣鍗曟墦鍗�", CurUserName, "閫佽揣鍗曟墦鍗�");
                 oCn.RunProc("exec H_p_SRM_POInStockBill_PrintQty " + msg.ToString());
@@ -256,7 +256,7 @@
             try
             {
                 string sql = $"update銆�Cg_POInStockBillMain銆� set  HDeliveryNo ='{HDeliveryNo}' where HInterID in ({HmainId})";
-                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                 oCn.RunProc(sql);
 
                 objJsonResult.code = "1";
@@ -283,7 +283,7 @@
         [HttpPost]
         public object SaverPOInStock([FromBody] JObject msg)
         {
-            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             var _value = msg["msg"].ToString();
             string msg1 = _value.ToString();
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -482,7 +482,7 @@
                 sw.Start();//寮�濮嬭鏃�
                 string VsWhere = "";
                 string PcWhere = "";
-                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                 DataSet ds;
                 //鍏朵粬杩囨护
                 string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
@@ -639,7 +639,7 @@
         public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
         {
             json objjson = new json();
-            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             try
             {                
                 //閲囪喘璁㈠崟 鐢熸垚閫佽揣鍗曞垪琛�
@@ -1195,6 +1195,7 @@
                                 //LogService.Write(result);
                                 if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
                                 {
+                                    LogService.Write("SRM-鏀舵枡閫氱煡鍗曞鏍稿け璐SON锛�" + jsonRoot.ToString());
                                     //鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
                                     string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                                     string FID = JObject.Parse(result)["Result"]["Id"].ToString();
@@ -1212,6 +1213,8 @@
                                 }
                                 else
                                 {
+                                    LogService.Write("SRM-鏀舵枡閫氱煡鍗曞鏍稿け璐SON锛�" + jsonRoot.ToString() );
+
                                     objjson.code = "0";
                                     objjson.count = 0;
                                     objjson.Message = result;
@@ -1303,7 +1306,7 @@
         }
         public int GetHinterIDByBillNo(string HBillNo, string type)
         {
-            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             int HInterID = 0;
             string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
             //if (type == "Print")
@@ -1321,7 +1324,7 @@
             try
             {
                 DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
-                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                 //鑾峰彇瀹㈡埛鍚嶇О
                 string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                 //澶忓疂闇�瑕佸厛鍦ㄩ噾铦跺垹闄ゆ敹鏂欓�氱煡鍗曞悗鎵嶈兘鍦ㄤ緵搴斿晢鍗忓悓骞冲彴鍒犻櫎閫佽揣鍗�
@@ -1526,7 +1529,7 @@
         {
             List<string> mylist = new List<string>(ids.Split(','));//.Distinct()
             List<string> entryList = new List<string>(entryids.Split(','));//.Distinct()
-            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
             if (FCusName == "澶忓疂鐢靛櫒" && mylist.Count > 1)
             {
@@ -1562,6 +1565,7 @@
 
                     if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                     {
+                        LogService.Write("閫佽揣鏁伴噺鍚屾杩涘叆鍥炴粴");
                         oCn.RollBack(); //鍥炴粴浜嬬墿
                         objjson.code = "0";
                         objjson.count = 0;
@@ -1576,12 +1580,13 @@
                     //鏇存柊鍏宠仈鏁伴噺
                     var HinterID = mylist[i].ToString();
                     var HEntryID = entryList[i].ToString();
+                    LogService.Write("閫佽揣鏁伴噺鍚屾锛� exec h_p_SRM_UpDatePPBomRelationQty" + HinterID + "," + HEntryID);
                     oCn.RunProc($"exec h_p_SRM_UpDatePPBomRelationQty {HinterID},{HEntryID},{i+1}");
                 }
 
                 //鍒ゆ柇鏈叧鑱旀暟閲忔槸鍚︿负0
-                //瀹夌憺锛欰IS20220914133941   鐟炰笌鐞細AIS20220308151944  鏈湴锛欰IS20210811135644  澶忓疂锛欰IS20211130140219  鍑礉锛欰IS20210820164804
-                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 鍓╀綑鏀舵枡鏁伴噺,T1.hrelationqty as 宸插彂璐ф暟閲�,T1.hqty as 璁㈠崟鏁伴噺,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join AIS20210820164804..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID  where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
+                //瀹夌憺锛欰IS20220914133941   鐟炰笌鐞細AIS20220308151944  鏈湴锛欰IS20210811135644  澶忓疂锛欰IS20211130140219  鍑礉锛欰IS20210820164804 娣诲悍锛欰IS20240809105013
+                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 鍓╀綑鏀舵枡鏁伴噺,T1.hrelationqty as 宸插彂璐ф暟閲�,T1.hqty as 璁㈠崟鏁伴噺,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join AIS20240809105013..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID  where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
                 DataTable dt = ds.Tables[0];
                 if (dt.Rows.Count > 0)
                 {
@@ -1621,7 +1626,7 @@
         /// <returns></returns>
         public JsonResult TestPOOrder(string entryids)
         {
-            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             try
             {
                 var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
@@ -1717,7 +1722,7 @@
         {
             try
             {
-                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                 //鏌ヨ涓昏〃
                 DataSet Ds;
                 Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillMain_ForWeb " + lngBillKey.ToString() + ",'" + HBillType + "'", "h_p_SRM_POInStockBillMain_ForWeb");
@@ -1750,7 +1755,7 @@
             string s = "";
             try
             {
-                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                 //鏌ヨ涓昏〃
                 DataSet Ds;
                 Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillSub_ForWeb '" + lngBillKey2 + "','" + HBillType + "'", "h_p_SRM_POInStockBillSub_ForWeb");

--
Gitblit v1.9.1