From b3ef7eb53d17bd775a9a63f9023b87fda8387e2b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 12 六月 2022 16:09:15 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs |  281 ++++++++++++++++++++++++++-----------------------------
 1 files changed, 133 insertions(+), 148 deletions(-)

diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index f537457..170e0df 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -315,6 +315,7 @@
             try
             {
                 var WorkBookName = HttpContext.Current.Request["WorkBookName"];
+                DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
                 //鑾峰彇鏂囦欢鍚嶇О
                 var file = HttpContext.Current.Request.Files[0];
                 //鑾峰彇鏂囦欢鐗╃悊璺緞
@@ -352,32 +353,32 @@
                 var error = "";
 
                 //鏌ヨ宸ヨ壓璺嚎娌℃湁鐨勫垪
-                if (!tb2.Columns.Contains("鐗╂枡浠g爜"))
-                    error += "娌℃湁鎵惧埌銆愮墿鏂欎唬鐮併�戠殑鏍囬,";
+                if (!tb2.Columns.Contains("浜у搧浠g爜"))
+                    error += "娌℃湁鎵惧埌銆愪骇鍝佷唬鐮併�戠殑鏍囬,";
 
                 if (!tb2.Columns.Contains("宸ュ簭"))
                     error += "娌℃湁鎵惧埌銆愬伐搴忋�戠殑鏍囬,";
               
-                if (!tb2.Columns.Contains("宸ヤ綔涓績鍚嶇О"))
-                    error += "娌℃湁鎵惧埌銆愬伐浣滀腑蹇冨悕绉般�戠殑鏍囬,";
+                if (!tb2.Columns.Contains("宸ヤ綔涓績"))
+                    error += "娌℃湁鎵惧埌銆愬伐浣滀腑蹇冦�戠殑鏍囬,";
 
                 if (!tb2.Columns.Contains("鍔犲伐鏁伴噺"))
                     error += "娌℃湁鎵惧埌銆愬姞宸ユ暟閲忋�戠殑鏍囬,";
 
-                if (!tb2.Columns.Contains("寮�宸ヤ綑閲忓浐鏁�"))
-                    error += "娌℃湁鎵惧埌銆愬紑宸ヤ綑閲忓浐鏁般�戠殑鏍囬,";
+                if (!tb2.Columns.Contains("鏈亾寮�宸ヤ綑閲�"))
+                    error += "娌℃湁鎵惧埌銆愭湰閬撳紑宸ヤ綑閲忋�戠殑鏍囬,";
 
-                if (!tb2.Columns.Contains("寮�宸ヤ綑閲忓ぉ鏁�"))
-                    error += "娌℃湁鎵惧埌銆愬紑宸ヤ綑閲忓ぉ鏁般�戠殑鏍囬,";
+                if (!tb2.Columns.Contains("鏈亾鍥哄畾寮�宸ュぉ鏁�"))
+                    error += "娌℃湁鎵惧埌銆愭湰閬撳浐瀹氬紑宸ュぉ鏁般�戠殑鏍囬,";
 
                 if (!tb2.Columns.Contains("鐝骇瀹氶"))
                     error += "娌℃湁鎵惧埌銆愮彮浜у畾棰濄�戠殑鏍囬,";
 
-                if (!tb2.Columns.Contains("宸ヤ环"))
-                    error += "娌℃湁鎵惧埌銆愬伐浠枫�戠殑鏍囬,";
+                if (!tb2.Columns.Contains("宸ュ簭宸ヤ环"))
+                    error += "娌℃湁鎵惧埌銆愬伐搴忓伐浠枫�戠殑鏍囬,";
 
-                if (!tb2.Columns.Contains("宸ュ簭鍙�"))
-                    error += "娌℃湁鎵惧埌銆愬伐搴忓彿銆戠殑鏍囬,";
+                if (!tb2.Columns.Contains("宸ュ簭搴忓彿"))
+                    error += "娌℃湁鎵惧埌銆愬伐搴忓簭鍙枫�戠殑鏍囬,";
 
                 if (!tb2.Columns.Contains("宸ヨ壓鍙傛暟"))
                     error += "娌℃湁鎵惧埌銆愬伐鑹哄弬鏁般�戠殑鏍囬,";
@@ -421,21 +422,25 @@
                     return objJsonResult;
                 }
 
-                Checkdata(tb2);
+                objJsonResult = (json)Checkdata(tb2);
+                if (objJsonResult.code == "0")
+                {
+                    return objJsonResult;
+                }
 
                 string hnumber = "";
                 if (tb2.Rows.Count > 0)
                 {
-                    hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[0]["鐗╂枡浠g爜"].ToString());
+                    hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[0]["浜у搧浠g爜"].ToString());
                 }
 
                 for (int i = 0; i <= tb2.Rows.Count - 1; i++)
                 {
                     string sHNumber = "";
-                    if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠g爜"].ToString()) != "")
+                    if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠g爜"].ToString()) != "")
                     {
                         //
-                        sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠g爜"].ToString());
+                        sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠g爜"].ToString());
                         //瀹℃牳浠g爜鏄惁鍚堢悊
                         if (!DBUtility.ClsPub.AllowNumber(sHNumber))
                         {
@@ -446,29 +451,22 @@
                             return objJsonResult;
                         }
 
-                        if (hnumber == DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠g爜"].ToString()))
+                        if (hnumber == DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠g爜"].ToString()))
                         {
                             //寰楀埌鐗╂枡鍐呯爜
                             if (!oMaterHlp.GetInfoByNumber(sHNumber))
                             {
                                 objJsonResult.code = "0";
                                 objJsonResult.count = 0;
-                                objJsonResult.Message = "绗�" + i.ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+                                objJsonResult.Message = "绗�" + (i+1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
                                 objJsonResult.data = null;
                                 return objJsonResult;
                             }
                         }
                         else
                         {
-                            DataSet Ds;
-                            ClsCN oCn = new ClsCN();
-                            bool b = false;
-                            // 鍒ゆ柇鏄惁瀛樺湪宸ヨ壓璺嚎
-                            Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + oMaterHlp.omodel.HItemID.ToString(), "Gy_RoutingBillMain");
-
-
-                            hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠g爜"].ToString());
-                            sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐗╂枡浠g爜"].ToString());
+                            hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠g爜"].ToString());
+                            sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠g爜"].ToString());
 
                             //瀹℃牳浠g爜鏄惁鍚堢悊
                             if (!DBUtility.ClsPub.AllowNumber(sHNumber))
@@ -484,7 +482,7 @@
                             {
                                 objJsonResult.code = "0";
                                 objJsonResult.count = 0;
-                                objJsonResult.Message = "绗�" + i.ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+                                objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
                                 objJsonResult.data = null;
                                 return objJsonResult;
                             }
@@ -494,7 +492,7 @@
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = "绗�" + i.ToString() + "琛�,娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+                        objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�,娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
@@ -531,8 +529,8 @@
                 Single sHPassRate = 0;
 
                 //
-                sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["鐗╂枡浠g爜"].ToString());
-                sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ヤ綔涓績鍚嶇О"].ToString());
+                sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["浜у搧浠g爜"].ToString());
+                sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ヤ綔涓績"].ToString());
                 sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ュ簭"].ToString());
                 sWorkQty = DBUtility.ClsPub.isSingle(dt.Rows[i]["鍔犲伐鏁伴噺"].ToString());
                 sHPassRate = DBUtility.ClsPub.isSingle(dt.Rows[i]["鑹巼"].ToString());
@@ -693,98 +691,121 @@
                     list.Add(dic);
                 }
 
-
-
-                int TrueCount = 0, SumCount = 0;
-
+                var hnumber = "";
+                var HBillNo = "";
+                long HInterID = 0;
                 for (int i = 0; i < list.Count; i++)
                 {
-                    long HInterID = 0;
-                    var HBillNo = "";
-                    if (list[i]["鍗曟嵁鍙�"].ToString() == "" && list[i]["hmainid"].ToString() == "")
+                    //鑾峰彇鐗╂枡鏁版嵁
+                    ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber=" + list[i]["浜у搧浠g爜"].ToString() + " and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
+                    var HMaterNumber = list[i]["浜у搧浠g爜"].ToString();
+                    var HMaterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+                    var Hunitid = ds.Tables[0].Rows[0]["鐗╂枡浠g爜"].ToString();
+                    var HUnitNumber = ds.Tables[0].Rows[0]["鐗╂枡浠g爜"].ToString();
+
+                    //鑾峰彇宸ュ簭
+                    ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber=" + list[i]["宸ュ簭浠g爜"].ToString(), "Gy_Process");
+                    var HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+                    //鑾峰彇宸ヤ綔涓績
+                    ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HNumber=" + list[i]["宸ヤ綔涓績浠g爜"].ToString(), "Gy_WorkCenter");
+                    var HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+                    if (hnumber != list[i]["浜у搧浠g爜"].ToString())
                     {
+                        hnumber = list[i]["浜у搧浠g爜"].ToString();
                         HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
                         HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
-                        var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�*"].ToString();
-                        var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString();
-                        var HWorkShopID = list[i]["HWorkShopID"].ToString();
-                        var HSourceID = list[i]["HSourceID"].ToString();
-                        var HYX = list[i]["浼樺厛绾�"].ToString();
-                        var HEmpID = list[i]["HEmpID"].ToString();
-                        var HMaterID = list[i]["HMaterID"].ToString();
-                        var HMaterName = list[i]["鐗╂枡鍚嶇О"].ToString();
-                        var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString();
-                        var HUnitID = list[i]["HUnitID"].ToString();
-                        var HBatchNo = list[i]["鎵规鍙�"].ToString();
-                        var HSeOrderBillQty = list[i]["閿�鍞鍗曟暟閲�"].ToString();
-                        var HPlanQty = list[i]["鐢熶骇璁㈠崟鏁伴噺"].ToString();
-                        var HCompleteQty = list[i]["鎬婚綈濂楁暟閲�"].ToString();
-                        var HOrderType = "";
-                        var HDate = "";
-                        var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
-                        var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();
-
-                        ds = oCN.RunProcReturn($"select * from  Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
-                          $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
-                        if (ds.Tables[0].Rows.Count > 0)
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�!";
-                            objJsonResult.data = null;
-                            return objJsonResult;
-                        }
-
-                        //涓昏〃
-                        oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
-                            "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
-                            "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
-                            " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
-                            " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
-                            "HMainSourceInterID,HMainSourceEntryID)values" +
-                            $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
-                            $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
-                            $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
-                            $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
-                            $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
-                            $" {HMainSourceInterID},{HMainSourceEntryID})");
                     }
+                    
 
-                    int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
+                    var HName = list[i]["宸ヨ壓璺嚎鍚嶇О"].ToString();
+                    var HPicNumVer = list[i]["鍥惧彿鐗堟湰"].ToString();
+                    var HPicNumAssemble = list[i]["鎬昏鍥惧彿"].ToString();
+                    var HMaterTexture = list[i]["鏉愯川"].ToString();
+                    var HProductNum = list[i]["鎴愬搧缂栧彿"].ToString();
+                    var HVerNum = list[i]["鐗堟湰"].ToString();
 
-                    for (int j = 0; j < SumDay; j++)
-                    {
-                        //涓昏〃瀛愯〃閮芥湁鏁版嵁
-                        if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
-                        {
-                            SumCount += 1;
-                            ////淇濆瓨瀛愯〃
-                            objJsonResult = RoutAddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
-                                , HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo
-                                 , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
-                                 , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));
 
-                            if (objJsonResult.count == 1)
-                            {
-                                TrueCount += 1;
-                            }
-                        }
-                        //涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
-                        if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
-                        {
-                            objJsonResult = RoutAddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
-                        }
-                    }
+                    //鑾峰彇渚涘簲鍟�
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where HNumber=" + list[i]["渚涘簲鍟嗕唬鐮�"].ToString(), "h_v_Gy_SupplierList");
+                    var HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+                    var HProcNo = list[i]["宸ュ簭搴忓彿"].ToString();
+                    var HTimeUnit = list[i]["鏃堕棿鍗曚綅"].ToString();
+                    var hworkqty = list[i]["鍔犲伐鏁伴噺"].ToString();
+                    var HFixPrice = list[i]["鐝骇瀹氶"].ToString();
+                    var HMainPrice = list[i]["宸ュ簭宸ヤ环"].ToString();
+                    var HBadPrice = list[i]["涓嶅悎鏍煎崟浠�"].ToString();
+                    var HWasterPrice = list[i]["鎶ュ簾鍗曚环"].ToString();
+                    var HBeginFixQty = list[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString();
+                    var HBeginDayQty = list[i]["鏈亾寮�宸ヤ綑閲�"].ToString();
+                    var HFixWorkDays = list[i]["涓婇亾绛夊緟澶╂暟"].ToString();
+                    var HTrunWorkDays = list[i]["涓婇亾寰幆鍛ㄦ湡"].ToString();
+                    var HAutoTrunFlag = list[i]["鑷姩杞Щ"].ToString();
+                    var HSupFlag = list[i]["澶栧崗鏍囪"].ToString();
+                    var HTechnologyParameter = list[i]["宸ヨ壓鍙傛暟"].ToString();
+                    var HPicNum = list[i]["鍥剧焊缂栧彿"].ToString();
+                    var HProcCheckNote = list[i]["鏈伐搴忕‘璁よ褰�"].ToString();
+                    var hpassrate = list[i]["鑹巼"].ToString();
+                    var hremark = list[i]["澶囨敞"].ToString();
+                    var HMouldNo = list[i]["妯″叿缂栧彿"].ToString();
+                    var HProcWorkNum = list[i]["绋嬪簭鍙�"].ToString();
+                    //鐗╂枡鍒嗙被
+
+
                 }
 
-                if (TrueCount != SumCount)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = objJsonResult.Message;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+
+                //    //涓昏〃
+                //    oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+                //        "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
+                //        "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
+                //        " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
+                //        " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
+                //        "HMainSourceInterID,HMainSourceEntryID)values" +
+                //        $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
+                //        $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
+                //        $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
+                //        $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
+                //        $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
+                //        $" {HMainSourceInterID},{HMainSourceEntryID})");
+                //}
+
+
+                //    for (int j = 0; j < SumDay; j++)
+                //    {
+                //        //涓昏〃瀛愯〃閮芥湁鏁版嵁
+                //        if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
+                //        {
+                //            SumCount += 1;
+                //            ////淇濆瓨瀛愯〃
+                //            objJsonResult = RoutAddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
+                //                , HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo
+                //                 , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
+                //                 , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));
+
+                //            if (objJsonResult.count == 1)
+                //            {
+                //                TrueCount += 1;
+                //            }
+                //        }
+                //        //涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
+                //        if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
+                //        {
+                //            objJsonResult = RoutAddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
+                //        }
+                //    }
+                //}
+
+                //if (TrueCount != SumCount)
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = objJsonResult.Message;
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
 
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
@@ -800,42 +821,6 @@
                 objJsonResult.data = null;
                 return objJsonResult;
             }
-        }
-
-        public json RoutAddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY)
-        {
-            //鑾峰彇琛ㄦ牸鏁版嵁
-            ds = oCN.RunProcReturn($"select * from  h_v_JIT_Sc_WorkBillSortBillList where 鍗曟嵁鍙�='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList");
-
-            int count = 0;
-            if (ds.Tables[0].Rows.Count > 0)
-            {
-                //鍒ゆ柇瀛愯〃鏄惁鏈夊綋鏃ョ殑鏃ユ湡浠ュ強鏃ユ湡鎵�瀵瑰簲鐨勬暟閲�
-                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
-                {
-                    if (DateTime.Parse(ds.Tables[0].Rows[i]["鏃ヨ鍒掔敓浜ф棩鏈�"].ToString()) == date)
-                    {
-                        oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY}" +
-                            $"  where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
-                        count += 1;
-                    }
-                }
-            }
-
-            if (count != 1)
-            {
-                //鎻掑叆瀛愯〃
-                oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HEntryID," +
-                    "HMasterDate,HQty)" +
-                            $"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
-                            $" '{date}', {HQTY})");
-            }
-
-            objJsonResult.code = "1";
-            objJsonResult.count = 1;
-            objJsonResult.Message = null;
-            objJsonResult.data = null;
-            return objJsonResult;
         }
         #endregion
     }

--
Gitblit v1.9.1