From 5a0bdcb0577b7617beb10e78d48d4255d693e085 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 17 十二月 2021 16:09:28 +0800
Subject: [PATCH] 打印送货单时进行记录到操作日志表

---
 WebAPI/Controllers/POInStockController.cs |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 2b09f8d..b61bf42 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -27,15 +27,15 @@
         /// <param name="msg2"></param>
         /// <returns></returns>
         [Route("UpdatePOInStockBillPrintQty")]
-        [HttpPost]
-        public object UpdatePOInStockBillPrintQty([FromBody] JObject msg)
+        [HttpGet]
+        public object UpdatePOInStockBillPrintQty(string msg,string CurUserName)
         {
-            var _value = msg["msg"].ToString();
-            string msg1 = _value.ToString();
             try
             {
                 SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
-                oCn.RunProc("exec H_p_SRM_POInStockBill_PrintQty " + msg1.ToString());
+                //鍐欏叆 System_Log 鎿嶄綔鏃ュ織琛�
+                WebAPIController.Add_Log("閫佽揣鍗曟墦鍗�", CurUserName, "閫佽揣鍗曟墦鍗�");
+                oCn.RunProc("exec H_p_SRM_POInStockBill_PrintQty " + msg.ToString());
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = "鏇存柊鎵撳嵃娆℃暟鎴愬姛锛�";
@@ -594,7 +594,7 @@
 
                 string kdTbaleName = "AIS20210811135644";
                 string sql = string.Format(@"
- SELECT c.FID,c.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID ,CU.FNUMBER AS FUNITNUMBER FROM 
+ SELECT B.HINTERID,c.FID,c.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID ,CU.FNUMBER AS FUNITNUMBER FROM 
    CG_POINSTOCKBILLSUB B  
  JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
  JOIN AIS20210811135644..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -617,12 +617,12 @@
                 {
                     foreach (DataRow dr in dt.Rows)
                     {
-                        if (fidList.Contains(dr["FID"].ToString()))
+                        if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
                             continue;
                         else
-                            fidList.Add(dr["FID"].ToString());
+                            fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
 
-                        DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString());
+                        DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
 
                         JObject model = new JObject();
                         model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //鍗曟嵁绫诲瀷
@@ -704,10 +704,10 @@
  a.HERPBillNO   ='{1}'
  from Cg_POInStockBillMain a
  join Cg_POInStockBillSub b on a.hinterid = b.hinterid
- where b.HInterID in ({2})
+ where b.HInterID = ({2})
  and b. HSOURCEINTERID = {3}
  and a.HERPInterID = 0
-", FID, FBillNo, HInterID, dr["FID"].ToString());
+", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
                             oCn.RunProc(updateSql);
                         }
                         else
@@ -721,7 +721,6 @@
                     }
 
                 }
-
                 sql = string.Format(@"update Cg_POInStockBillMain set 
 HBillStatus = 2 ,
 HChecker   ='{0}',
@@ -747,6 +746,7 @@
             }
 
         }
+
         //[Route("POInStockAccept")]
         //[HttpGet]
         ///// <summary>

--
Gitblit v1.9.1