From bf43b2754aa2e3bcb36c9a8dd050cad07849e421 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 29 三月 2022 14:59:07 +0800
Subject: [PATCH] 增加瑞与祺服务器文件IP地址

---
 WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs |  432 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 329 insertions(+), 103 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs b/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
index 41407d2..55c617d 100644
--- a/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
@@ -107,15 +107,16 @@
             public int 璋冨嚭浠撳簱搴撳瓨鏁伴噺 = 0;//HKFQtySCol
             public double 璁″垝鍙戞枡鏁伴噺 = 0;//HPlanQtyCol 
             public int HWHID = 0;//HWHIDCol
+            public int? 璋冨嚭浠撳簱id = 0;//璋冨嚭浠撳簱id
             public string HMaterialNumberCol { get; set; }
             public string HMaterialModelCol { get; set; }
-            public string HProcIDCol { get; set; }//HProcID
+            public string HProcID { get; set; }//HProcIDCol
             public string HProcNameCol { get; set; }//宸ユ
-            public int HOutOrgIDCol = 0;//HOutOrgID
-            public string  HICMOBillNoCol { get; set; }//HICMOBillNo
-            public long HICMOInterIDCol = 0;//HICMOInterID
-            public long HICMOEntryIDCol = 0;//HICMOEntryID
-            public long HDeptIDCol = 0;//HDeptID
+            public int HOutOrgID = 0;//HOutOrgID
+            public string HICMOBillNo { get; set; }// HICMOBillNoCol
+            public long HICMOInterID = 0;// HICMOInterIDCol
+            public long HICMOEntryID = 0;// HICMOEntryIDCol
+            public long HDeptID = 0;//HDeptID
             public double HBHGQtyCol = 0;
             public string 閿�鍞鍗曞彿 { get; set; }//HSeOrderNOCol
             public DateTime? 璁″垝寮�宸ユ棩鏈� = null;//HBPlanDateCol
@@ -155,6 +156,7 @@
             string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
             string user = sArray[1].ToString();
+            omodel.HPRDORGID = long.Parse(sArray[2].ToString());
 
             try
             {
@@ -228,12 +230,12 @@
                         oSub.HModel = listCa[i].HMaterialModelCol;
                         oSub.HWHID = listCa[i].HWHID;
                         oSub.HProcName = listCa[i].HProcNameCol; 
-                        oSub.HProcID = listCa[i].HProcIDCol;
-                        oSub.HOutOrgID = listCa[i].HOutOrgIDCol;
-                        oSub.HICMOBillNo = listCa[i].HICMOBillNoCol;
-                        oSub.HICMOInterID = listCa[i].HICMOInterIDCol;
-                        oSub.HICMOEntryID = listCa[i].HICMOEntryIDCol; 
-                        oSub.HDeptID = listCa[i].HDeptIDCol; 
+                        oSub.HProcID = listCa[i].HProcID;
+                        oSub.HOutOrgID = listCa[i].HOutOrgID;
+                        oSub.HICMOBillNo = listCa[i].HICMOBillNo;
+                        oSub.HICMOInterID = listCa[i].HICMOInterID;
+                        oSub.HICMOEntryID = listCa[i].HICMOEntryID; 
+                        oSub.HDeptID = listCa[i].HDeptID; 
                         oSub.HPlanQty = listCa[i].璁″垝鍙戞枡鏁伴噺;
                         oSub.HSeOrderNo = listCa[i].閿�鍞鍗曞彿; 
                         oSub.HBPlanDate = listCa[i].璁″垝寮�宸ユ棩鏈�;
@@ -301,12 +303,12 @@
                       " (HInterID,HEntryID,HRemark" +
                       ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                       ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
-                      ",HDeptID,HMaterID,HQty,HProcID,HWHID,HSPID,HBillNo_bak" +
+                      ",HDeptID,HMaterID,HQty,HProcID,HWHID,HSPID,HBillNo_bak,HOutOrgID" +
                       ") values("
                       + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
                       "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                       "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'" +
-                      "," + oSub.HDeptID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() + ",'" + oSub.HProcID + "'," + oSub.HWHID.ToString() + ", " + oSub.HSPID.ToString() +",'') ", ref DBUtility.ClsPub.sExeReturnInfo);
+                      "," + oSub.HDeptID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() + ",'" + oSub.HProcID + "'," + oSub.HWHID.ToString() + ", " + oSub.HSPID.ToString() +",'',"+oSub.HOutOrgID+") ", ref DBUtility.ClsPub.sExeReturnInfo);
 
                 //涓昏〃
 
@@ -317,14 +319,14 @@
                 ",HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo" +
                 ",HBacker,HBackDate,HBackRemark,HChecker,HCheckDate,HUpDater,HUpDateDate " +
                 ",HCloseMan,HCloseDate,HCloseType,HDeleteMan,HDeleteDate " +
-                ",HPrintQty,HCallManID,HSendManID,HCallType,HWareManID) " +
+                ",HPrintQty,HCallManID,HSendManID,HCallType,HWareManID,HOrgID) " +
                 " values('" + CallGoodsBill.ModName + "','" + CallGoodsBill.ModName + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                 ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
                 ",'" + omodel.HBillStatus + "'," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() + ", " + omodel.HCheckFlowID.ToString() +
                 ",'" + omodel.HMainSourceBillType + "'," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ", '" + omodel.HMainSourceBillNo + "'" +
                 ",'" + omodel.HBacker + "','" + omodel.HBackDate + "','" + omodel.HBackRemark + "', '" + omodel.HChecker + "','" + omodel.HCheckDate + "', '" + omodel.HUpDater + "',''" +
                 ",'" + omodel.HCloseMan + "','" + omodel.HCloseDate + "','" + omodel.HCloseType + "', '" + omodel.HDeleteMan + "','" + omodel.HDeleteDate + "'" +
-                ",0,0,0,'鏅��',0) ", ref DBUtility.ClsPub.sExeReturnInfo);
+                ",0,0,0,'鏅��',0," + omodel.HPRDORGID + ") ", ref DBUtility.ClsPub.sExeReturnInfo);
 
                 sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
                 //oCn.Commit();
@@ -346,12 +348,13 @@
             var _value = msg["msg"].ToString();
             string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
-            string user = sArray[1].ToString();
+            DBUtility.ClsPub.CurUserName = sArray[1].ToString();
             string HOrgID = sArray[2].ToString();
+            bool flag = false;
 
             try
             {
-                if (!DBUtility.ClsPub.Security_Log("JIT_BLP_ComplementGoods_Edit", 1, false, user))
+                if (!DBUtility.ClsPub.Security_Log("JIT_BLP_ComplementGoods_Edit", 1, false, DBUtility.ClsPub.CurUserName))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -366,40 +369,37 @@
                 //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
                 listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
 
-                if (listCa[0].閫�鏂欐暟閲� > 0)
+                int j=0;
+                for (int i = 0; i < listCa.Count; i++)
                 {
-                    Int64 lngBillKey = listCa[0].HSouceInterID == 0 ? 0 : listCa[0].HSouceInterID;
-                    Int64 lngBillKeyEntry = listCa[0].HSourceEntryID == 0 ? 0 : listCa[0].HSourceEntryID;
-                    double HQty = (double)(listCa[0].閫�鏂欐暟閲� == 0 ? 0 : listCa[0].閫�鏂欐暟閲�);
-                    long HDeptWHID = listCa[0].HSTOCKID == 0 ? 0 : listCa[0].HSTOCKID;
-                    string HTuiResult = listCa[0].閫�鏂欏師鍥� == "" ? "" : listCa[0].閫�鏂欏師鍥�;
-                    var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
-                    var HBillInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);
-
-                    ds = oCN.RunProcReturn("exec h_p_JIT_BadGoodsRequest_Insert  " + lngBillKey.ToString() + " , " + lngBillKeyEntry.ToString() + " ,  '" + user + "'  ," + HQty.ToString() + " ," + HOrgID.ToString() + " , '" + HBillNo + "' ," + HBillInterID.ToString() + "," + HDeptWHID.ToString() + ",'" + HTuiResult + "'", "h_p_JIT_GoodsRequestBad_Insert");
-
-                    if (int.Parse(ds.Tables[0].Rows[0][0].ToString()) == 1)
+                    if (listCa[i].閫�鏂欐暟閲� > 0)
                     {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鏃犱换浣曢��鏂欐暟閲忥紝鏃犳硶閫�鏂�!";
-                        objJsonResult.data = null;
-                        return objJsonResult;
+                        flag = AddICStockTuiBill(listCa[i], "666601", "涓嶈壇鍝侀��鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
+                        j = 1;
                     }
-                    else
-                    {
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "閫�鏂欐垚鍔�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
+                }
+                if (j == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱换浣曢��鏂欐暟閲忥紝鏃犳硶閫�鏂�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (flag)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "涓嶈壇鍝侀��鏂欐垚鍔�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
                 }
                 else
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犱换浣曢��鏂欐暟閲忥紝鏃犳硶閫�鏂�!";
+                    objJsonResult.Message = "涓嶈壇鍝侀��鏂欏け璐�!";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -411,6 +411,48 @@
                 objJsonResult.Message = "Exception锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
+            }
+        }
+
+        //鏂板
+        public bool AddICStockTuiBill(CallGoodsBill listCa,string HBillType,string HBackType,string HOrgID, ref string sReturn)
+        {
+            try
+            {
+              
+                    Int64 lngBillKey = listCa.HSouceInterID == 0 ? 0 : listCa.HSouceInterID;
+                    Int64 lngBillKeyEntry = listCa.HSourceEntryID == 0 ? 0 : listCa.HSourceEntryID;
+                    double HQty = (double)(listCa.閫�鏂欐暟閲� == 0 ? 0 : listCa.閫�鏂欐暟閲�);
+                    long HDeptWHID = listCa.HSTOCKID == 0 ? 0 : listCa.HSTOCKID;
+                    string HTuiResult = listCa.閫�鏂欏師鍥� == "" ? "" : listCa.閫�鏂欏師鍥�;
+                    var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+                    var HBillInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);
+
+                oCN.BeginTran();
+                //鎻掑叆瀛愯〃
+                oCN.RunProc("Insert into JIT_CallGoodsBackRequestBillSub ( HInterID,HEntryID,HSourceInterID,HSourceEntryID," +
+                        "HSourceBillNo,HSourceBillType, HMaterID, HQty, HSCWHID," +
+                        " HWHID, HSPID, HResult, HDeptID, HProcID,HBackReason) " +
+                        $"values({HBillInterID},1,{lngBillKey},{ lngBillKeyEntry}," +
+                        $"'{listCa.HSourceBillNo}',88,{listCa.HMaterialID},{HQty},{(listCa.璋冨嚭浠撳簱id==null?0:listCa.璋冨嚭浠撳簱id)}," +
+                        $"{HDeptWHID},'','',{listCa.HDeptID},'','{HTuiResult}')");
+
+                    //鎻掑叆涓昏〃
+                    oCN.RunProc("insert into JIT_CallGoodsBackRequestBillMain(HYear,HPeriod,HInterid,HBillSubType,HBillStatus," +
+                        "HBillType,HDate,HBillNo,HOrgID,HMaker,HMakeDate,HRemark,HBackRemark,HMainSourceBillType , HMainSourceInterID, HMainSourceEntryID, HMainSourceBillNo," +
+                        " HItemMainID, HSendManID, HWareManID, HStockOutOrgID, HStockInOrgID, HBackType)" +
+                       $"values({DateTime.Now.Year},{DateTime.Now.Month},{HBillInterID},'{HBillType}',1," +
+                       $" '{HBillType}','{DateTime.Now}','{HBillNo}',{HOrgID},'{ DBUtility.ClsPub.CurUserName}','{DateTime.Now}','','',0,0,0,''," +
+                       $" 0, 0, 0, {HOrgID}, 0,'{HBackType}')");
+                 
+                sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+                oCN.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                throw (e);
             }
         }
         #endregion
@@ -442,37 +484,18 @@
                 List<CallGoodsBill> listCa = new List<CallGoodsBill>();
                 //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
                 listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
+                bool flag = false;
 
-                if (listCa[0].閫�鏂欐暟閲� > 0)
+                int j = 0;
+                for (int i = 0; i < listCa.Count; i++)
                 {
-                    Int64 lngBillKey = listCa[0].HSouceInterID == 0 ? 0 : listCa[0].HSouceInterID;
-                    Int64 lngBillKeyEntry = listCa[0].HSourceEntryID == 0 ? 0 : listCa[0].HSourceEntryID;
-                    double HQty = (double)(listCa[0].閫�鏂欐暟閲� == 0 ? 0 : listCa[0].閫�鏂欐暟閲�);
-                    long HDeptWHID = listCa[0].HSTOCKID == 0 ? 0 : listCa[0].HSTOCKID;
-                    string HTuiResult = listCa[0].閫�鏂欏師鍥� == "" ? "" : listCa[0].閫�鏂欏師鍥�;
-                    var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
-                    var HBillInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);
-
-                    ds = oCN.RunProcReturn("exec h_p_JIT_MarginGoodsRequest_Insert  " + lngBillKey.ToString() + " , " + lngBillKeyEntry.ToString() + " ,  '" + user + "'  ," + HQty.ToString() + " ," + HOrgID.ToString() + " , '" + HBillNo + "' ," + HBillInterID.ToString() + "," + HDeptWHID.ToString() + ",'" + HTuiResult + "'", "h_p_JIT_GoodsRequestMargin_Insert");
-
-                    if (int.Parse(ds.Tables[0].Rows[0][0].ToString()) == 1)
+                    if (listCa[i].閫�鏂欐暟閲� > 0)
                     {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鏃犱换浣曢��鏂欐暟閲忥紝鏃犳硶閫�鏂�!";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    else
-                    {
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "閫�鏂欐垚鍔�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
+                        flag = AddICStockTuiBill(listCa[i], "666602", " 浣欓噺閫�鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
+                        j = 1;
                     }
                 }
-                else
+                if (j == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -480,6 +503,24 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
+
+                if (flag)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "浣欓噺閫�鏂欐垚鍔�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "浣欓噺閫�鏂欏け璐�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+             
             }
             catch (Exception e)
             {
@@ -505,7 +546,7 @@
 
             try
             {
-                if (!DBUtility.ClsPub.Security_Log("JIT_YL_ComplementGoods_Edit", 1, false, user))
+                if (!DBUtility.ClsPub.Security_Log("JIT_BF_ComplementGoods_Edit", 1, false, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -520,40 +561,38 @@
                 //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
                 listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
 
-                if (listCa[0].閫�鏂欐暟閲� > 0)
+                bool flag = false;
+                int j = 0;
+                for (int i = 0; i < listCa.Count; i++)
                 {
-                    Int64 lngBillKey = listCa[0].HSouceInterID == 0 ? 0 : listCa[0].HSouceInterID;
-                    Int64 lngBillKeyEntry = listCa[0].HSourceEntryID == 0 ? 0 : listCa[0].HSourceEntryID;
-                    double HQty = (double)(listCa[0].閫�鏂欐暟閲� == 0 ? 0 : listCa[0].閫�鏂欐暟閲�);
-                    long HDeptWHID = listCa[0].HSTOCKID == 0 ? 0 : listCa[0].HSTOCKID;
-                    string HTuiResult = listCa[0].閫�鏂欏師鍥� == "" ? "" : listCa[0].閫�鏂欏師鍥�;
-                    var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
-                    var HBillInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);
-
-                    ds = oCN.RunProcReturn("exec h_p_JIT_ScrapGoodsRequest_Insert  " + lngBillKey.ToString() + " , " + lngBillKeyEntry.ToString() + " ,  '" + user + "'  ," + HQty.ToString() + " ," + HOrgID.ToString() + " , '" + HBillNo + "' ," + HBillInterID.ToString() + "," + HDeptWHID.ToString() + ",'" + HTuiResult + "'", "h_p_JIT_GoodsRequestMargin_Insert");
-
-                    if (int.Parse(ds.Tables[0].Rows[0][0].ToString()) == 1)
+                    if (listCa[i].閫�鏂欐暟閲� > 0)
                     {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "鏃犱换浣曢��鏂欐暟閲忥紝鏃犳硶閫�鏂�!";
-                        objJsonResult.data = null;
-                        return objJsonResult;
+                        flag = AddICStockTuiBill(listCa[i], "666603", "鎶ュ簾閫�鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
+                        j = 1;
                     }
-                    else
-                    {
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "閫�鏂欐垚鍔�";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
+                }
+                if (j == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱换浣曢��鏂欐暟閲忥紝鏃犳硶閫�鏂�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (flag)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鎶ュ簾閫�鏂欐垚鍔�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
                 }
                 else
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犱换浣曢��鏂欐暟閲忥紝鏃犳硶閫�鏂�!";
+                    objJsonResult.Message = "鎶ュ簾閫�鏂欏け璐�!";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -586,15 +625,202 @@
                 //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
                 HlpBill com = JsonConvert.DeserializeObject<HlpBill>(sWhere.ToString());
 
-                ds = oCN.RunProcReturn($"exec h_p_JIT_CallGoodsPlatForm_DownQuery 0,0,'',0,0,'{com.HSouceInterID}','{com.HSourceEntryID}'"+
-                    $"'{com.user}'", "h_p_JIT_CallGoodsPlatForm_DownQuery");
+                ds = oCN.RunProcReturn($"exec h_p_JIT_CallGoodsPlatForm_DownQuery 0,0,'',0,0,{com.HSouceInterID},{com.HSourceEntryID}"+
+                    $",'{com.user}'", "h_p_JIT_CallGoodsPlatForm_DownQuery");
 
-                objJsonResult.code = "1";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "Sucess锛�";
-                objJsonResult.data = ds.Tables[0];
+                if (ds != null)
+                {
+                    if (ds.Tables[0].Rows.Count != 0)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "Sucess锛�";
+                        objJsonResult.data = ds.Tables[0];
+                        return objJsonResult;
+                    }
+                    else if (ds.Tables[1].Rows.Count != 0)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "Sucess锛�";
+                        objJsonResult.data = ds.Tables[1];
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "Sucess锛�";
+                        objJsonResult.data = ds.Tables[0];
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "Sucess锛�";
+                    objJsonResult.data =null;
+                    return objJsonResult;
+                }
+               
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
                 return objJsonResult;
             }
+        }
+        #endregion
+
+        #region 鐢熶骇鍙枡骞冲彴  鎷f枡鍗曟柊澧�
+        [Route("Sc_ComplementGoodBill/Insert_JL_ICStockTuiBill")]
+        [HttpPost]
+        public object Insert_JL_ICStockTuiBill([FromBody] JObject msg)
+        {
+            var _value = msg["msg"].ToString();
+            string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string user = sArray[1].ToString();
+            string HOrgID = sArray[2].ToString();
+
+            try
+            {
+                if (!DBUtility.ClsPub.Security_Log("Cj_ComplementGoodsBill_Edit", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");
+
+                List<CallGoodsBill> listCa = new List<CallGoodsBill>();
+                //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
+                listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
+                int a = 0;
+                if (listCa.Count > 0)
+                {
+                    for (int i = 0; i < listCa.Count; i++)
+                    {
+                        long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo);
+                        string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo, true);
+                        long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString());
+                        long HWHID = int.Parse(listCa[i].HWHID.ToString());
+
+                        oCN.RunProc($"exec h_p_JIT_ComplementGoods_Insert {HInterID},'{HBillNo}',{HOrgID},'{user}',{HOutOrgID},{HWHID}");
+                        a = 1;
+                    }
+
+                    if (a == 1)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鐢熸垚鎷f枡鍗曟垚鍔�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鐢熸垚鎷f枡鍗曞け璐�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳暟鎹紝鏃犳硶鎷f枡!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢熶骇鍙枡骞冲彴  閫�鏂欏崟鏂板
+        [Route("Sc_ComplementGoodBill/Insert_TL_ICStockTuiBill")]
+        [HttpPost]
+        public object Insert_TL_ICStockTuiBill([FromBody] JObject msg)
+        {
+            var _value = msg["msg"].ToString();
+            string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string user = sArray[1].ToString();
+            string HOrgID = sArray[2].ToString();
+
+            try
+            {
+                if (!DBUtility.ClsPub.Security_Log("Cj_CallGoodsBillBack_Edit", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");
+
+                List<CallGoodsBill> listCa = new List<CallGoodsBill>();
+                //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
+                listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
+                int a = 0;
+                if (listCa.Count > 0)
+                {
+                    for (int i = 0; i < listCa.Count; i++)
+                    {
+                        long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo);
+                        string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo, true);
+                        //long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString());
+                        //long HWHID = int.Parse(listCa[i].HWHID.ToString());
+
+                        oCN.RunProc($"exec h_p_JIT_GetCallGoodsBillCount_Back {HInterID},'{HBillNo}',{HOrgID},'{user}'");
+                        a = 1;
+                    }
+
+                    if (a == 1)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鐢熸垚閫�鏂欏崟鎴愬姛";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鐢熸垚閫�鏂欏崟澶辫触";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳暟鎹紝鏃犳硶閫�鏂�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
             catch (Exception e)
             {
                 objJsonResult.code = "0";

--
Gitblit v1.9.1