From 2e3fbad48512d7a5260585dc631cc8830542413c Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 07 四月 2026 15:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs |  476 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 381 insertions(+), 95 deletions(-)

diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index e5006c0..3e0b57d 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -1,6 +1,5 @@
 锘縰sing Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using NPOI.SS.Formula.Functions;
 using Pub_Class;
 using System;
 using System.Collections;
@@ -9,6 +8,7 @@
 using System.Data.SqlClient;
 using System.Web.Http;
 using WebAPI.Models;
+using System.Windows.Forms;
 using SyntacticSugar.constant;
 
 namespace WebAPI.Controllers
@@ -30,7 +30,7 @@
         public object sql { get; private set; }
         public object oCn { get; private set; }
 
-        
+
         /// <summary>
         /// --杩斿洖鏀舵枡閫氱煡鍗曞垪琛�
         /// 澶栬喘鍏ュ簱鍗� 1201
@@ -52,7 +52,7 @@
                 else
                 {
                     string sql1 = "select * from h_v_Kf_POStockInBillList where 1 = 1 ";
-                    string sql = sql1 + sWhere+ " order by hmainid desc";
+                    string sql = sql1 + sWhere + " order by hmainid desc";
                     ds = oCN.RunProcReturn(sql, "h_v_Kf_POStockInBillList");
                 }
                 foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
@@ -148,6 +148,188 @@
         #endregion
 
 
+        #region 閲囪喘鍏ュ簱淇濆瓨
+        /// <summary>
+        /// 淇濆瓨閿�鍞嚭搴撳崟
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        [Route("Kf_POStockInBill/SaveSellOutBillList")]
+        [HttpPost]
+        public object SaveSellOutBillList([FromBody] JObject msg)
+        {
+            var _value = msg["msg"].ToString();
+            string msg1 = _value.ToString();
+            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string msg3 = sArray[1].ToString();
+            string user = sArray[2].ToString();
+            string OperationType = sArray[3].ToString();
+
+            ListModels oListModels = new ListModels();
+            try
+            {
+                //鍒ゆ柇鏉冮檺
+                //if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBill_Edit", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                DAL.ClsKf_POStockInBill1 oBill = new DAL.ClsKf_POStockInBill1();
+                List<Model.ClsKf_SellOutBillMain> lsmain = new List<Model.ClsKf_SellOutBillMain>();
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");  //\n
+                lsmain = oListModels.getSellOutBillMainByJson(msg2);
+                foreach (Model.ClsKf_SellOutBillMain oItem in lsmain)
+                {
+                    oItem.HMaker = user;
+                    oItem.HUpDater = user;
+
+                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    oBill.omodel = oItem;
+                }
+                //琛ㄤ綋鏁版嵁
+                //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+                msg3 = msg3.Substring(1, msg3.Length - 2);
+                msg3 = msg3.Replace("\\", "");
+                msg3 = msg3.Replace("\n", "");  //\n
+                List<Model.ClsKf_SellOutBillSub> ls = new List<Model.ClsKf_SellOutBillSub>();
+                ls = oListModels.getSellOutBillSubByJson(msg3);
+                int i = 0;
+                foreach (Model.ClsKf_SellOutBillSub oItemSub in ls)
+                {
+                    i++;
+                    oItemSub.HEntryID = i;
+                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+                    oItemSub.HCloseType = false;
+                    oItemSub.HCloseMan = "";
+                    oBill.DetailColl.Add(oItemSub);
+                }
+
+                //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+                string s = "";
+                int sYear = 0;
+                int sPeriod = 0;
+                DateTime HDate = DateTime.Now;
+                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+                {
+                    objJsonResult.Message = s;
+                    return objJsonResult;
+                }
+
+                //淇濆瓨
+                //淇濆瓨瀹屾瘯鍚庡鐞�
+                bool bResult;
+                if (Convert.ToInt32(OperationType) == 1)                                //鏂板淇濆瓨
+                {
+                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                else if (Convert.ToInt32(OperationType) == 4)                          //涓嬫帹淇濆瓨
+                {
+                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                else                                                                    //缂栬緫淇濆瓨
+                {
+                    if (BillOld.ShowBill(lsmain[0].HInterID, ref s) == false)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    //鍒ゆ柇鏄惁鍙紪杈�
+                    if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    if (BillOld.omodel.HBillStatus > 1)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+
+                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+
+                //鑷姩瀹℃牳璁剧疆
+                if (Convert.ToInt32(OperationType) == 1 || Convert.ToInt32(OperationType) == 4)
+                {
+                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+                    //绯荤粺鍙傛暟  鑷姩瀹℃牳
+                    string sReturn = "";
+                    if (oSystemParameter.ShowBill(ref sReturn) == true)
+                    {
+                        if (oSystemParameter.omodel.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+                        {
+                            objJsonResult.Verify = "Y";
+                        }
+                        else
+                        {
+                            objJsonResult.Verify = "N";
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+                    objJsonResult.Verify = "N";
+                }
+
+                if (bResult)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+
         #region 閲囪喘鍏ュ簱鍗� 淇濆瓨/缂栬緫鍔熻兘
         [Route("Kf_POStockInBill/POStockInBillEdit")]
         [HttpPost]
@@ -222,7 +404,7 @@
 
 
 
-       
+
                 string HInvoiceBillNo = mainList[0].HInvoiceBillNo;//鍙戠エ缂栧彿 
                 string HExplanation = mainList[0].HExplanation;//鎽樿
                 string HInnerBillNo = mainList[0].HInnerBillNo;//鍐呴儴鍗曟嵁鍙� 
@@ -277,15 +459,15 @@
                     }
                     //=========================================================
                     //涓昏〃
-                    String sql =$@"Insert Into Kf_ICStockBillMain 
+                    String sql = $@"Insert Into Kf_ICStockBillMain 
                         (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
 	                    ,HAddress,HSupID,HCurID,HWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID,HExplanation,HRemark
                         ,HInnerBillNo,HSTOCKORGID,HOWNERID,HMaker,HMakeDate,HProjectID,HInvoiceBillNo)
                         values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1201 + "','" +
                     HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
-                    "'," + HSupID + "," + HCurID + "," + HWHID + "," + HEmpID + "," + HManagerID + "," + 
-                    HSecManagerID + ","+ HKeeperID +"," + HDeptID + ",'" + HExplanation + "','" + HRemark
-                    + "','" + HInnerBillNo + "'," + HSTOCKORGID + "," + HOWNERID + ",'" + HMaker + "',getdate(),"+ HProjectID + ",'"+ HInvoiceBillNo + "')";
+                    "'," + HSupID + "," + HCurID + "," + HWHID + "," + HEmpID + "," + HManagerID + "," +
+                    HSecManagerID + "," + HKeeperID + "," + HDeptID + ",'" + HExplanation + "','" + HRemark
+                    + "','" + HInnerBillNo + "'," + HSTOCKORGID + "," + HOWNERID + ",'" + HMaker + "',getdate()," + HProjectID + ",'" + HInvoiceBillNo + "')";
 
                     oCN.RunProc(sql);
                 }
@@ -293,7 +475,7 @@
                 { //淇敼
 
                     DataSet dss;
-                    dss = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillList where hmainid=" + HInterID , "h_v_Kf_POStockInBillList");
+                    dss = oCN.RunProcReturn("select * from h_v_Kf_POStockInBillList where hmainid=" + HInterID, "h_v_Kf_POStockInBillList");
                     //鍒ゆ柇鏄惁鍙紪杈�
                     if (dss.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "" && dss.Tables[0].Rows[0]["瀹℃牳浜�"] != null)
                     {
@@ -316,7 +498,7 @@
                                 "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + ",HBillNo='" + HBillNo + "'" +
                                  ",HSupID=" + HSupID + ",HCurID=" + HCurID + ",HSecManagerID=" + HSecManagerID + ", HSTOCKORGID=" + HSTOCKORGID + ",HKeeperID=" + HKeeperID + ",HWHID = " + HWHID
                                  + ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID + ",HOWNERID=" + HOWNERID
-                                 + ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "',HProjectID="+ HProjectID + ",HInvoiceBillNo='"+ HInvoiceBillNo + "' where HInterID=" + HInterID;
+                                 + ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "',HProjectID=" + HProjectID + ",HInvoiceBillNo='" + HInvoiceBillNo + "' where HInterID=" + HInterID;
 
                     oCN.RunProc(sql);
 
@@ -388,7 +570,7 @@
             }
         }
 
-        public json AddBillSub(string msg3, long HInterID, int OperationType,string user)
+        public json AddBillSub(string msg3, long HInterID, int OperationType, string user)
         {
             List<ClsKf_ICStockBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKf_ICStockBillSub>>(msg3);
 
@@ -617,6 +799,102 @@
             }
         }
         #endregion
+        #region 閲囪喘鍏ュ簱鍗� - 鎵樻暟鍙樻洿鍔熻兘
+        [Route("Kf_POStockInBill/UpdatePallet")]
+        [HttpPost]
+        public object UpdatePallet([FromBody] JObject data)
+        {
+            try
+            {
+                long hmainid = data["hmainid"]?.ToObject<long>() ?? 0;
+                int newPallet = data["newPallet"]?.ToObject<int>() ?? 0;
+                string operatorName = data["operator"]?.ToString() ?? "";
+
+                if (hmainid <= 0)
+                    return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
+
+                if (newPallet < 0)
+                    return new { code = "0", count = 0, Message = "鎵樻暟涓嶈兘涓鸿礋鏁帮紒" };
+
+
+
+
+                // 鐩存帴鏇存柊鎵樻暟
+                string updateSql = $@"
+                    UPDATE  Kf_ICStockBillMain 
+                    SET HPackQtys = {newPallet} 
+                    WHERE HInterID = {hmainid}";
+
+
+                oCN.RunProc(updateSql);
+
+                return new
+                {
+                    code = "1",
+                    count = 1,
+                    Message = "鎵樻暟淇敼鎴愬姛锛�"
+                };
+            }
+            catch (Exception e)
+            {
+                return new
+                {
+                    code = "0",
+                    count = 0,
+                    Message = "淇敼澶辫触锛�" + e.Message
+                };
+            }
+        }
+        #endregion
+        #region 閲囪喘鍏ュ簱鍗� - 璐存爣绛炬暟鍙樻洿鍔熻兘
+        [Route("Kf_POStockInBill/UpdateHTagCount")]
+        [HttpPost]
+        public object UpdateHTagCount([FromBody] JObject data)
+        {
+            try
+            {
+                long hmainid = data["hmainid"]?.ToObject<long>() ?? 0;
+                int newPallet = data["newPallet"]?.ToObject<int>() ?? 0;
+                string operatorName = data["operator"]?.ToString() ?? "";
+
+                if (hmainid <= 0)
+                    return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
+
+                if (newPallet <= 0)
+                    return new { code = "0", count = 0, Message = "璐存爣绛炬暟蹇呴』澶т簬0锛�" };
+
+
+
+
+                // 鐩存帴鏇存柊鎵樻暟
+                string updateSql = $@"
+                    UPDATE  Kf_ICStockBillMain 
+                    SET HTagCount = {newPallet} 
+                    WHERE HInterID = {hmainid}";
+
+
+                oCN.RunProc(updateSql);
+
+                return new
+                {
+                    code = "1",
+                    count = 1,
+                    Message = "鎵樻暟淇敼鎴愬姛锛�"
+                };
+            }
+            catch (Exception e)
+            {
+                return new
+                {
+                    code = "0",
+                    count = 0,
+                    Message = "淇敼澶辫触锛�" + e.Message
+                };
+            }
+        }
+        #endregion
+
+
 
         #region 鏌ユ壘璁板綍鍔熻兘
         /// <summary>
@@ -658,7 +936,7 @@
                 return objJsonResult;
             }
         }
-#endregion
+        #endregion
 
         #region 鏍规嵁鐗╂枡鍐呯爜鑾峰彇鐗╂枡淇℃伅
         [Route("Kf_POStockInBill/getMaterialByMaterID")]
@@ -808,7 +1086,7 @@
                         return objJsonResult;
                     }
                     //==================================================================================                        
-                    
+
                     //瀹℃牳鎻愪氦
                     if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_POStockInBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                     {
@@ -848,7 +1126,7 @@
                         return objJsonResult;
                     }
                     //=========================================================                   
-                 
+
                     //鍙嶅鏍告彁浜bandonCheck
                     if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_POStockInBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                     {
@@ -1488,7 +1766,7 @@
         #region 閲囪喘鍏ュ簱 鍙戣捣瀹℃壒
         [Route("Kf_POStockInBill/StartCheckFlow_POOrderBill")]
         [HttpGet]
-        public object StartCheckFlow_POOrderBill(int HInterID,string CurUserName)
+        public object StartCheckFlow_POOrderBill(int HInterID, string CurUserName)
         {
             DBUtility.ClsPub.CurUserName = CurUserName;
             try
@@ -1519,7 +1797,7 @@
                 DAL.ClsKf_POStockInBill oBill = new DAL.ClsKf_POStockInBill();                              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
 
                 //鍙戣捣瀹℃壒
-                if (oBill.startCheckFlow(lngBillKey,ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                if (oBill.startCheckFlow(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                 {
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
@@ -2102,10 +2380,11 @@
         public object Kf_POStockInBillSaveApi([FromBody] JObject sMainSub)
         {
             try
-            { 
+            {
                 oCN.BeginTran();
                 LogService.Write("閲囪喘鍏ュ簱鍗曞悓姝�,淇濆瓨鏂规硶鎵ц锛�" + sMainSub.ToString());
 
+                sMainSub["model"]["hredblueflag"] = string.Equals(sMainSub["model"]["hredblueflag"].ToString(), "0") ? false : true;
                 var model = sMainSub["model"].ToString();
                 var entry = sMainSub["model"]["HENTRY"].ToString();
 
@@ -2117,7 +2396,7 @@
                 var ds1 = oCN.RunProcReturn($@"
                 select hmainid HInterID, 鍗曟嵁鍙� HBillNO from h_v_Kf_POStockInBillList where hmainid = {mainList[0].HInterID}
                 ", "h_v_Kf_POStockInBillList");
-
+                var HInterID_Old = mainList[0].HInterID;
                 if (ds1.Tables[0].Rows.Count > 0 && ds1.Tables[0].Rows[0]["HInterID"] != null)
                 {
                     if (string.Equals(ds1.Tables[0].Rows[0]["HBillNo"].ToString(), mainList[0].HBillNo, StringComparison.OrdinalIgnoreCase))
@@ -2133,99 +2412,106 @@
                         // 閲嶆柊鐢宠HInterID
                         var HInterID_Exch = DBUtility.ClsPub.CreateBillID("1201", ref DBUtility.ClsPub.sExeReturnInfo);
                         mainList[0].HInterID = HInterID_Exch;
-
+                
                         foreach (var oSub in subList)
                         {
                             oSub.HInterID = HInterID_Exch;
                         }
-
+                
                     }
                 }
-               
-                // 涓昏〃
+
+                // string sql = string.Empty;
+                // sql = $"delete Kf_ICStockBillMain where HinterID = {mainList[0].HInterID}";
+                // oCN.RunProc(sql);
+                // sql = $"delete Kf_ICStockBillSub where HinterID = {mainList[0].HInterID}";
+                // oCN.RunProc(sql);
                 // 涓昏〃鎻掑叆
                 oCN.RunProc($@"Insert Into Kf_ICStockBillMain 
-                (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
-                ,HAddress,HSupID,HCurID,HWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID,HExplanation,HRemark
-                ,HInnerBillNo,HSTOCKORGID,HOWNERID,HMaker,HMakeDate,HProjectID,HInvoiceBillNo
-                ,HChecker, HCheckDate)
-                values(
-                '{mainList[0].HInterID}',
-                '{mainList[0].HYear}',
-                '{mainList[0].HPeriod}',
-                '{mainList[0].HBillType}',
-                '{mainList[0].HBillSubType}',
-                '{mainList[0].HDate}',
-                '{mainList[0].HBillNo}',
-                {mainList[0].HBillStatus},
-                '{mainList[0].HAddress}',
-                '{mainList[0].HSupID}',
-                '{mainList[0].HCurID}',
-                '{mainList[0].HWHID}',
-                '{mainList[0].HEmpID}',
-                '{mainList[0].HManagerID}',
-                '{mainList[0].HSecManagerID}',
-                '{mainList[0].HKeeperID}',
-                '{mainList[0].HDeptID}',
-                '{mainList[0].HExplanation}',
-                '{mainList[0].HRemark}',
-                '{mainList[0].HInnerBillNo}',
-                {mainList[0].HSTOCKORGID},
-                '{mainList[0].HOWNERID}',
-                '{mainList[0].HMaker}',
-                '{mainList[0].HMakeDate}',
-                '{mainList[0].HProjectID}',
-                '{mainList[0].HInvoiceBillNo}',
-                '{mainList[0].HChecker}',
-                '{mainList[0].HCheckDate}'
+                (
+                    HInterID, HYear, HPeriod, HBillNo, HBillType, HBillSubType, HMainSourceBillType, HDate,
+                    HSupID, HWHID, HSCWHID, HEmpID, HManagerID, HSecManagerID, HKeeperID, HDeptID, HCurID,
+                    HSeOrderBillNo, HExplanation, HRemark, HInnerBillNo, HRedBlueFlag, HBillStatus,
+                    HMaker, HMakeDate, HChecker, HCheckDate,
+                    HUpDater, HUpDateDate, HDeleteMan, HDeleteDate,
+                    HOWNERID, HOWNERTYPEID, HERPInterID, HERPBillType, HERPBillNo,
+                    HPRDORGID, HSTOCKORGID, HSTOCKERGROUPID, HPURCHASERGROUPID, HDEMANDORGID, HCORRESPONDORGID,
+                    HPROVIDERCONTACTID, HSUPPLYID, HSETTLEID, HCHARGEID, HPURCHASEDEPTID, HBUSINESSTYPE,
+                    HSUPPLYADDRESS, HPAYORGID, HSETTLEORGID, HSETTLETYPEID, HPAYCONDITIONID, HSETTLECURRID,
+                    HEXCHANGETYPEID, HDISCOUNTLISTID, HEXCHANGERATE, HPRICETIMEPOINT, HLOCALCURRID, HISINCLUDEDTAX,
+                    HISPRICEEXCLUDETAX
                 )
-            ");
+                values(
+                    '{mainList[0].HInterID}','{mainList[0].HYear}','{mainList[0].HPeriod}','{mainList[0].HBillNo}',                   
+                    '{mainList[0].HBillType}','{mainList[0].HBillSubType}','{mainList[0].HMainSourceBillType}','{mainList[0].HDate}',                     
+                    '{mainList[0].HSupID}','{mainList[0].HWHID}','{mainList[0].HSCWHID}','{mainList[0].HEmpID}','{mainList[0].HManagerID}',                
+                    '{mainList[0].HSecManagerID}','{mainList[0].HKeeperID}','{mainList[0].HDeptID}','{mainList[0].HCurID}',                    
+                    '{mainList[0].HSeOrderBillNo}','{mainList[0].HExplanation}','{mainList[0].HRemark}','{mainList[0].HInnerBillNo}',              
+                    '{mainList[0].HRedBlueFlag}',{mainList[0].HBillStatus},'{mainList[0].HMaker}','{mainList[0].HMakeDate}',                 
+                    '{mainList[0].HChecker}','{mainList[0].HCheckDate}','{mainList[0].HUpDater}','{mainList[0].HUpDateDate}',               
+                    '{mainList[0].HDeleteMan}','{mainList[0].HDeleteDate}','{mainList[0].HOWNERID}','{mainList[0].HOWNERTYPEID}',              
+                    '{mainList[0].HERPInterID}','{mainList[0].HERPBillType}','{mainList[0].HERPBillNo}','{mainList[0].HPRDORGID}',                 
+                    '{mainList[0].HSTOCKORGID}','{mainList[0].HSTOCKERGROUPID}','{mainList[0].HPURCHASERGROUPID}','{mainList[0].HDEMANDORGID}',              
+                    '{mainList[0].HCORRESPONDORGID}','{mainList[0].HPROVIDERCONTACTID}','{mainList[0].HSUPPLYID}','{mainList[0].HSETTLEID}',                 
+                    '{mainList[0].HCHARGEID}','{mainList[0].HPURCHASEDEPTID}','{mainList[0].HBUSINESSTYPE}','{mainList[0].HSUPPLYADDRESS}',            
+                    '{mainList[0].HPAYORGID}','{mainList[0].HSETTLEORGID}','{mainList[0].HSETTLETYPEID}','{mainList[0].HPAYCONDITIONID}',           
+                    '{mainList[0].HSETTLECURRID}','{mainList[0].HEXCHANGETYPEID}','{mainList[0].HDISCOUNTLISTID}','{mainList[0].HEXCHANGERATE}',             
+                    '{mainList[0].HPRICETIMEPOINT}','{mainList[0].HLOCALCURRID}','{mainList[0].HISINCLUDEDTAX}','{mainList[0].HISPRICEEXCLUDETAX}'         
+                )");
 
                 // 瀛愯〃鎻掑叆
                 foreach (var osub in subList)
                 {
+                    // var syncSorceBillRes = oCN.RunProcReturn($@"
+                    //     exec h_p_IFCLD_ERPSourceBillToLocal_POStockInBill_GetSourceInfo 
+                    //     '{osub.HSourceBillType}', '{osub.HSourceBillNo}', {osub.HSourceSEQ} 
+                    // ", "h_p_IFCLD_ERPSourceBillToLocal_POStockInBill_GetSourceInfo");
+                    // string HERPInterID = "0";
+                    // string HERPEntryID = "0";
+                    // if (syncSorceBillRes != null && syncSorceBillRes.Tables.Count > 0)
+                    // {
+                    //     osub.HSourceEntryID = (long)syncSorceBillRes.Tables[0].Rows[0]["HEntryID"];
+                    //     osub.HSourceInterID = (long)syncSorceBillRes.Tables[0].Rows[0]["HInterID"];
+                    //     HERPInterID = syncSorceBillRes.Tables[0].Rows[0]["HERPInterID"].ToString();
+                    //     HERPEntryID = syncSorceBillRes.Tables[0].Rows[0]["HERPInterID"].ToString();
+                    // }
+
                    
+
                     oCN.RunProc($@"Insert into Kf_ICStockBillSub 
-                    (HInterID,HEntryID,HMaterID,HUnitID,HQtyMust,HQty,HPrice
-                    ,HMoney,HOrderPrice,HWHID,HSPID,HRelationQty,HBatchNo
-                    ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
-                    ,HPOOrderInterID,HPOOrderEntryID ,HPOOrderBillNo
-                    ,HPropertyID,HSecUnitID,HSecUnitRate,HPlanMode,HRemark,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo
-                    ,HTaxRate,HTaxPrice,HlineTotal) 
+                    (
+                        HInterID, HEntryID, HMTONo, HPlanMode, HRemark, HExpressNumber,
+                        HMaterID, HUnitID, HBatchNo, HPropertyID, HWHID, HSPID, HSCWHID, HSCSPID,
+                        HQtyMust, HQty, HPrice, HMoney, HTaxPrice, HTaxRate, HTaxMoney, HRelationQty, HRelationMoney,
+                        HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HERPInterID, HERPEntryID, HERPBillNo_Sub,
+                        HPOOrderInterID, HPOOrderEntryID, HPOOrderBillNo, HSeOrderInterID, HSeOrderEntryID, HSeOrderBillNo,
+                        HICMOInterID, HICMOEntryID, HICMOBillNo, HWWOrderInterID, HWWOrderEntryID, HWWOrderBillNo,
+                        HProduceDate, HExpiryDate, HOWNERID, HOWNERTYPEID, HKEEPERID, HKEEPERTYPEID,
+                        HSUPPLIERLOT, HREQTRACENO, HPROJECTNO, HGIVEAWAY, HSYSPRICE, HPRICECOEFFICIENT,
+                        HDISCOUNTRATE, HBASEUNITPRICE, HTAXCOMBINATION, HPRICELISTENTRY, HCOSTPRICE, HSEQ,
+                        HROWTYPE, HPARENTMATID, HPRILSTENTRYID, HPURBASENUM, HSTOCKBASEDEN, HBFLOWID,
+                        HSTOCKSTATUSID, HPRICEUNITID, HBASEUNITID, HSNUNITID, HREMAININSTOCKUNITID, HEXTAUXUNITID,
+                        HTAXRATEID, HTAXRATE_TAX, HTAXAMOUNT, HCOSTPERCENT, HCOSTAMOUNT, HVAT,
+                        HSELLERWITHHOLDING, HBUYERWITHHOLDING
+                    ) 
                     values (
-                        '{osub.HInterID}', 
-                        '{osub.HEntryID}', 
-                        '{osub.HMaterID}',
-                        '{osub.HUnitID}', 
-                        '{osub.HQtyMust}', 
-                        '{osub.HQty}',
-                        '{osub.HPrice}',
-                        '{osub.HMoney}',
-                        '{osub.HOrderPrice}',
-                        '{osub.HWHID}',
-                        '{osub.HSPID}',
-                        '{osub.HRelationQty}',
-                        '{osub.HBatchNo}',
-                        '{osub.HSourceInterID}',
-                        '{osub.HSourceEntryID}',
-                        '{osub.HSourceBillNo}',
-                        '{osub.HSourceBillType}',
-                        '{osub.HPOOrderInterID}',
-                        '{osub.HPOOrderEntryID}',
-                        '{osub.HPOOrderBillNo}',
-                        '{osub.HPropertyID}',
-                        '{osub.HSecUnitID}',
-                        '{osub.HSecUnitRate}',
-                        '{osub.HPlanMode}',
-                        '{osub.HRemark}',
-                        '{osub.HSeOrderInterID}',
-                        '{osub.HSeOrderEntryID}',
-                        '{osub.HSeOrderBillNo}',
-                        '{osub.HTaxRate}',
-                        '{osub.HTaxPrice}',
-                        '{osub.HlineTotal}'
-                    )
-                    ");
+                        '{osub.HInterID}','{osub.HEntryID}','{osub.HMTONo}',{osub.HPlanMode},'{osub.HRemark}','{osub.HExpressNumber}',
+                        '{osub.HMaterID}','{osub.HUnitID}','{osub.HBatchNo}','{osub.HPropertyID}','{osub.HWHID}',                      
+                        '{osub.HSPID}','{osub.HSCWHID}','{osub.HSCSPID}', '{osub.HQtyMust}','{osub.HQty}','{osub.HPrice}',                     
+                        '{osub.HMoney}', '{osub.HTaxPrice}', '{osub.HTaxRate}', '{osub.HTaxMoney}', '{osub.HRelationQty}',               
+                        '{osub.HRelationMoney}','{osub.HSourceInterID}','{osub.HSourceEntryID}','{osub.HSourceBillNo}',              
+                        '{osub.HSourceBillType}','{osub.HERPInterID}','{osub.HERPEntryID}','{osub.HERPBillNo_Sub}',             
+                        '{osub.HPOOrderInterID}','{osub.HPOOrderEntryID}','{osub.HPOOrderBillNo}','{osub.HSeOrderInterID}',            
+                        '{osub.HSeOrderEntryID}','{osub.HSeOrderBillNo}','{osub.HICMOInterID}','{osub.HICMOEntryID}',               
+                        '{osub.HICMOBillNo}','{osub.HWWOrderInterID}','{osub.HWWOrderEntryID}', '{osub.HWWOrderBillNo}',             
+                        '{osub.HProduceDate}','{osub.HExpiryDate}', '{osub.HOWNERID}','{osub.HOWNERTYPEID}','{osub.HKEEPERID}',                  
+                        '{osub.HKEEPERTYPEID}', '{osub.HSUPPLIERLOT}', '{osub.HREQTRACENO}', '{osub.HPROJECTNO}','{osub.HGIVEAWAY}',                  
+                        '{osub.HSYSPRICE}', '{osub.HPRICECOEFFICIENT}','{osub.HDISCOUNTRATE}','{osub.HBASEUNITPRICE}', '{osub.HTAXCOMBINATION}',            
+                        '{osub.HPRICELISTENTRY}','{osub.HCOSTPRICE}', '{osub.HSEQ}','{osub.HROWTYPE}','{osub.HPARENTMATID}', '{osub.HPRILSTENTRYID}',             
+                        '{osub.HPURBASENUM}','{osub.HSTOCKBASEDEN}', '{osub.HBFLOWID}','{osub.HSTOCKSTATUSID}','{osub.HPRICEUNITID}', '{osub.HBASEUNITID}',                
+                        '{osub.HSNUNITID}', '{osub.HREMAININSTOCKUNITID}','{osub.HEXTAUXUNITID}','{osub.HTAXRATEID}','{osub.HTAXRATE_TAX}','{osub.HTAXAMOUNT}',                 
+                        '{osub.HCOSTPERCENT}','{osub.HCOSTAMOUNT}','{osub.HVAT}','{osub.HSELLERWITHHOLDING}','{osub.HBUYERWITHHOLDING}'           
+                    )");
                 }
 
                 //閲囪喘鍏ュ簱鍗曟柊澧炲洖濉噰璐叆搴撳叧鑱旀暟閲�

--
Gitblit v1.9.1