From ab13a42398dfb51af0a621606aa92ac7ec9e8fd7 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 12 一月 2022 15:16:13 +0800
Subject: [PATCH] 更改

---
 WebAPI/Controllers/BarCodeController.cs |  954 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 767 insertions(+), 187 deletions(-)

diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 6b3e18b..9beb439 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -20,7 +20,7 @@
     {
         private JsonResult objJsonResult = new JsonResult();
         private json objjson = new json();
-
+        public new ClsCNSRM oCn = new ClsCNSRM();
 
         public T ScriptDeserialize<T>(string strJson)
         {
@@ -37,7 +37,7 @@
         /// <returns></returns>
         [Route("UpdateBarcodePrintQty")]
         [HttpPost]
-        public object UpdateBarcodePrintQty([FromBody]JObject msg)
+        public object UpdateBarcodePrintQty([FromBody] JObject msg)
         {
             var _value = msg["msg"].ToString();
             string msg1 = _value.ToString();
@@ -68,14 +68,14 @@
         /// <param name="msg"></param>
         /// <param name="msg2"></param>
         /// <returns></returns>
-        public object GetBarcodeSaveBill_Varieties([FromBody]JObject msg)
+        public object GetBarcodeSaveBill_Varieties([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 UserName = "";            
+            string UserName = "";
             ListModels oListModels = new ListModels();
             try
             {
@@ -134,7 +134,7 @@
                     if (ClsPub.isLong(oItemSub.HMaterID) != 0)
                     {
                         HNumber = oItemSub.HMaterID.ToString();
-                        HMTONO=ClsPub.isStrNull(oItemSub.HMTONO);
+                        HMTONO = ClsPub.isStrNull(oItemSub.HMTONO);
                         //
 
                         HQty = ClsPub.isDoule(oItemSub.HQty);
@@ -264,7 +264,7 @@
         /// <param name="msg"></param>
         /// <param name="msg2"></param>
         /// <returns></returns>
-        public object GetBarcodeSaveBill_Only([FromBody]JObject msg)
+        public object GetBarcodeSaveBill_Only([FromBody] JObject msg)
         {
             var _value = msg["msg"].ToString();
             string msg1 = _value.ToString();
@@ -316,7 +316,7 @@
                     }
                 }
                 //int i = 1;
-                long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);    
+                long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);
                 int LSHlen = 6;             //娴佹按鍙烽暱搴�
                 int SumLen = 10;            //鎬婚暱搴�
                 string TM = "";             //鏉$爜
@@ -345,8 +345,8 @@
                         HNumber = oItemSub.HMaterID.ToString();
                         //
 
-                        HQty =ClsPub.isDoule(oItemSub.HQty);
-                        HBQty =  ClsPub.isInt(oItemSub.HBQty);
+                        HQty = ClsPub.isDoule(oItemSub.HQty);
+                        HBQty = ClsPub.isInt(oItemSub.HBQty);
                         HMinQty = ClsPub.isDoule(oItemSub.HMinQty);
                         HSumQty = ClsPub.isDoule(oItemSub.HQty);
                         for (int i = 0; i < HBQty; i++)
@@ -369,7 +369,7 @@
                             {
                                 TM = "0" + TM;
                             }
-                           TM = "SRM" + TM; 
+                            TM = "SRM" + TM;
                             //TM = "B" + TM;
                             if (HSumQty - HMinQty > 0)
                             {
@@ -408,7 +408,7 @@
                             bar.HSupID = oItemSub.HSupID;
                             bar.HMinQty = oItemSub.HMinQty;
                             bar.HMTONO = oItemSub.HMTONO;
-                            
+
                             ls2.Add(bar);
                         }
                     }
@@ -464,7 +464,7 @@
                 }
                 //鏆傛椂鍙洖濉叧鑱旀暟閲�
                 oCn.RunProc("exec H_p_SRM_BarCodeBill_Update_UpdateBillRelateData " + linterid.ToString());
-                
+
                 oCn.Commit();
             }
             catch (Exception e)
@@ -476,13 +476,13 @@
                 return objJsonResult;
             }
 
-                objJsonResult.code = "0";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "鐢熸垚鏉$爜鎴愬姛锛�";
-                WebAPIController.Add_Log("鏉$爜涓嬫帹", UserName, "鐢熸垚鏉$爜");
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
+            objJsonResult.code = "0";
+            objJsonResult.count = 1;
+            objJsonResult.Message = "鐢熸垚鏉$爜鎴愬姛锛�";
+            WebAPIController.Add_Log("鏉$爜涓嬫帹", UserName, "鐢熸垚鏉$爜");
+            objJsonResult.data = null;
+            return objJsonResult;
+        }
 
         [Route("GetBarcodeSaveBillBox")]
         [HttpPost]
@@ -492,13 +492,14 @@
         /// <param name="msg"></param>
         /// <param name="msg2"></param>
         /// <returns></returns>
-        public object GetBarcodeSaveBill_Box([FromBody]JObject msg)
+        public object GetBarcodeSaveBill_Box([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();
+            //LogService.Write(msg3);
             string UserName = "";
             ListModels oListModels = new ListModels();
             try
@@ -553,62 +554,63 @@
                     }
                 }
                 long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);
-            int LSHlen = 6;             //娴佹按鍙烽暱搴�
-            int SumLen = 10;            //鎬婚暱搴�
-            string TM = "";             //鏉$爜
-            string HNumber = "";        //鐗╂枡浠g爜
-            double HSumQty = 0;         //浜у搧鏁伴噺
-            double HMinQty = 0;         //鏈�灏忓寘瑁呮暟
-            int HBQty = 0;              //绠辨暟
-            double HQty = 0;            //鏁伴噺
-            int LSH = 0;                //娴佹按鍙�
-            string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
-            string sDate = "";            //鏃ユ湡
-            string sYear = "";          //骞�
-            string sPeriod = "";        //鏈�
-            string sDay = "";            //鏃�
-            string WeiShu = ""; //灏炬暟
-            DataSet Ds;
-            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
-            Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
-            LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
-             foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
-            {
-                if (ClsPub.isLong(oItemSub.HMaterID) != 0)
+                int LSHlen = 6;             //娴佹按鍙烽暱搴�
+                int SumLen = 10;            //鎬婚暱搴�
+                string TM = "";             //鏉$爜
+                string HNumber = "";        //鐗╂枡浠g爜
+                double HSumQty = 0;         //浜у搧鏁伴噺
+                double HMinQty = 0;         //鏈�灏忓寘瑁呮暟
+                int HBQty = 0;              //绠辨暟
+                double HQty = 0;            //鏁伴噺
+                int LSH = 0;                //娴佹按鍙�
+                string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
+                string sDate = "";            //鏃ユ湡
+                string sYear = "";          //骞�
+                string sPeriod = "";        //鏈�
+                string sDay = "";            //鏃�
+                string WeiShu = ""; //灏炬暟
+                DataSet Ds;
+                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
+                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
                 {
-                    HNumber = oItemSub.HMaterID.ToString();
-                    //HNumber = HNumber.Replace(".", "");
-                    //
+                    //LogService.Write("model鍒濆鍖栵細" + oItemSub.HKFDate);
+                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)
+                    {
+                        HNumber = oItemSub.HMaterID.ToString();
+                        //HNumber = HNumber.Replace(".", "");
+                        //
 
                         //HQty = Math.Ceiling(HBQty + ClsPub.isDoule(oItemSub.HWBQty));
 
-                    HQty = ClsPub.isDoule(oItemSub.HWBQty);
-                    HBQty = ClsPub.isInt(oItemSub.HWBQty);
-                    HMinQty = ClsPub.isDoule(oItemSub.HWXQty);
-                    HSumQty = ClsPub.isDoule(oItemSub.HQty);  //HWXQtyCol
-                    for (int i = 0; i < HBQty; i++)
-                    {
-                        LSH = LSH + 1;
-                        LSH2 = LSH.ToString();
-                        while (LSH2.Length < LSHlen)  //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+                        HQty = ClsPub.isDoule(oItemSub.HWBQty);
+                        HBQty = ClsPub.isInt(oItemSub.HWBQty);
+                        HMinQty = ClsPub.isDoule(oItemSub.HWXQty);
+                        HSumQty = ClsPub.isDoule(oItemSub.HQty);  //HWXQtyCol
+                        for (int i = 0; i < HBQty; i++)
                         {
-                            LSH2 = "0" + LSH2;
-                        }
-                        sDate = ClsPub.GetServerDate(0);
-                        sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
-                        sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
-                        sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
-                        sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
-                        sDay = sDay.Substring(sDay.Length - 2, 2);
-                        //==================================
-                        TM = HNumber + sYear + sPeriod + sDay + LSH2;
-                        while (TM.Length < SumLen)  //濡傛灉鏉$爜灏忎簬12浣嶆暟鍓嶉潰琛�0
-                        {
-                            TM = "0" + TM;
-                        }
+                            LSH = LSH + 1;
+                            LSH2 = LSH.ToString();
+                            while (LSH2.Length < LSHlen)  //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+                            {
+                                LSH2 = "0" + LSH2;
+                            }
+                            sDate = ClsPub.GetServerDate(0);
+                            sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+                            sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+                            sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+                            sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+                            sDay = sDay.Substring(sDay.Length - 2, 2);
+                            //==================================
+                            TM = HNumber + sYear + sPeriod + sDay + LSH2;
+                            while (TM.Length < SumLen)  //濡傛灉鏉$爜灏忎簬12浣嶆暟鍓嶉潰琛�0
+                            {
+                                TM = "0" + TM;
+                            }
                             //TM = "B" + TM;
                             TM = "SRM" + "B" + TM;
-                        
+
                             if (HSumQty - HMinQty > 0)
                             {
                                 WeiShu = "";
@@ -626,139 +628,142 @@
                                 }
                                 HMinQty = HSumQty;
                             }
- 
-                        Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
-                        bar.HBarCode = TM;
-                        bar.HMaterID = oItemSub.HMaterID;
-                        //bar.HMaterNumber = oItemSub.HMaterNumber;
-                        //bar.HMaterName = oItemSub.HMaterName;
-                        //bar.HMaterModel = oItemSub.HMaterModel;
-                      //  bar.HModel2 = oItemSub.HModel;
 
-                        bar.HUnitID = oItemSub.HUnitID;
-                        //bar.HUnitNumber2 = oItemSub.HUnitNumber;
-                        //bar.HUnitName2 = oItemSub.HUnitName;
+                            Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
+                            bar.HBarCode = TM;
+                            bar.HMaterID = oItemSub.HMaterID;
+                            //bar.HMaterNumber = oItemSub.HMaterNumber;
+                            //bar.HMaterName = oItemSub.HMaterName;
+                            //bar.HMaterModel = oItemSub.HMaterModel;
+                            //  bar.HModel2 = oItemSub.HModel;
 
-                        bar.HQty = HMinQty;
-                        bar.HBatchNo = oItemSub.HBatchNo; 
-                        bar.HKFDate = oItemSub.HKFDate;
-                        bar.HKFPeriod = oItemSub.HKFPeriod;
-                        bar.HKFDQDate = oItemSub.HKFDQDate;
-                        bar.HSourceInterID = oItemSub.HSourceInterID;
-                        bar.HSourceEntryID = oItemSub.HSourceEntryID;
-                        bar.HSourceBillNo = oItemSub.HSourceBillNo;
-                        bar.HSourceBillType = oItemSub.HSourceBillType;
-                        bar.HMinQty = oItemSub.HMinQty;
-                        bar.HSupID = oItemSub.HSupID;
-                        bar.HEndQty = WeiShu;
-                        bar.HMTONO = oItemSub.HMTONO;
-                        ls2.Add(bar);
+                            bar.HUnitID = oItemSub.HUnitID;
+                            //bar.HUnitNumber2 = oItemSub.HUnitNumber;
+                            //bar.HUnitName2 = oItemSub.HUnitName;
+
+                            bar.HQty = HMinQty;
+                            bar.HBatchNo = oItemSub.HBatchNo;
+                            bar.HKFDate = oItemSub.HKFDate;
+                            bar.HKFPeriod = oItemSub.HKFPeriod;
+                            bar.HKFDQDate = oItemSub.HKFDQDate;
+                            bar.HSourceInterID = oItemSub.HSourceInterID;
+                            bar.HSourceEntryID = oItemSub.HSourceEntryID;
+                            bar.HSourceBillNo = oItemSub.HSourceBillNo;
+                            bar.HSourceBillType = oItemSub.HSourceBillType;
+                            bar.HMinQty = oItemSub.HMinQty;
+                            bar.HSupID = oItemSub.HSupID;
+                            bar.HEndQty = WeiShu;
+                            bar.HMTONO = oItemSub.HMTONO;
+                            ls2.Add(bar);
+                        }
                     }
                 }
-            }
-            foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)
-            {
-                if (ClsPub.isLong(oItemSub2.HMaterID) != 0)
+                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)
                 {
-                    long sMaterID = ClsPub.isLong(oItemSub2.HMaterID);
-                    Ds = oCn.RunProcReturn("exec GetLSH " + sMaterID.ToString(), "GetLSH");
-                    string WeiShu1 = ""; //灏炬暟
-                    int SumLen2 = 4;
-                    string TM2 = "";
-                    double HWXQty = 0;
-     
-                    LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
-                    //
-                    HNumber = oItemSub2.HMaterID.ToString();
-                    //HMinQty = ClsPub.isDoule(oItemSub2.HMinQtyCol2].Value);
-                    HWXQty = ClsPub.isDoule(oItemSub2.HMinQty);
-                    HSumQty = ClsPub.isDoule(oItemSub2.HQty);
-                    HBQty = ClsPub.isInt(Math.Ceiling(HSumQty / HWXQty));
-                    double NXTMQTY = 0;
-                    for (int i = 0; i < HBQty; i++)
+                    //LogService.Write("寰幆绗竴娆�:" + oItemSub2.HSupID);
+                    if (ClsPub.isLong(oItemSub2.HMaterID) != 0)
                     {
-                        if (HSumQty <= 0 || HWXQty <= 0)
+                        long sMaterID = ClsPub.isLong(oItemSub2.HMaterID);
+                        Ds = oCn.RunProcReturn("exec GetLSH " + sMaterID.ToString(), "GetLSH");
+                        string WeiShu1 = ""; //灏炬暟
+                        int SumLen2 = 4;
+                        string TM2 = "";
+                        double HWXQty = 0;
+
+                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
+                        //
+                        HNumber = oItemSub2.HMaterID.ToString();
+                        //HMinQty = ClsPub.isDoule(oItemSub2.HMinQtyCol2].Value);
+                        HWXQty = ClsPub.isDoule(oItemSub2.HMinQty);
+                        HSumQty = ClsPub.isDoule(oItemSub2.HQty);
+                        HBQty = ClsPub.isInt(Math.Ceiling(HSumQty / HWXQty));
+                        double NXTMQTY = 0;
+                        for (int i = 0; i < HBQty; i++)
                         {
-                            break;
-                        }
-                        if (HSumQty - HWXQty > 0)
-                        {
-                            WeiShu1 = "";
-                            NXTMQTY = HWXQty;
-                            HSumQty = HSumQty - HWXQty;
-                        }
-                        else
-                        {
-                            if (HSumQty == HWXQty)
+                            if (HSumQty <= 0 || HWXQty <= 0)
+                            {
+                                break;
+                            }
+                            if (HSumQty - HWXQty > 0)
                             {
                                 WeiShu1 = "";
+                                NXTMQTY = HWXQty;
+                                HSumQty = HSumQty - HWXQty;
                             }
                             else
                             {
-                                WeiShu1 = "灏炬暟";
+                                if (HSumQty == HWXQty)
+                                {
+                                    WeiShu1 = "";
+                                }
+                                else
+                                {
+                                    WeiShu1 = "灏炬暟";
+                                }
+                                NXTMQTY = HSumQty;  //HWXQty
+                                HWXQty = HSumQty;
+                                HSumQty = 0;
                             }
-                            NXTMQTY = HSumQty;  //HWXQty
-                            HWXQty = HSumQty;
-                            HSumQty = 0;
+                            sDate = ClsPub.GetServerDate(0);
+                            sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+                            sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+                            sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+                            sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+                            sDay = sDay.Substring(sDay.Length - 2, 2);
+                            //
+                            //   TM = HNumber + sYear + sPeriod + sDay; //鏉$爜
+                            //
+                            Model.ClsGy_BarCodeBill_WMS_Model bar2 = new Model.ClsGy_BarCodeBill_WMS_Model();
+                            TM2 = (i + 1).ToString();
+                            while (TM2.Length < SumLen2)  //濡傛灉鏉$爜灏忎簬12浣嶆暟鍓嶉潰琛�0
+                            {
+                                TM2 = "0" + TM2;
+                            }
+                            bar2.HMaterID = oItemSub2.HMaterID;
+
+
+                            bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
+
+                            bar2.HUnitID = oItemSub2.HUnitID;
+                            bar2.HQty = HWXQty;
+                            bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
+                            bar2.HKFDate = DBUtility.ClsPub.isStrNull(oItemSub2.HKFDate);
+                            bar2.HKFDQDate = DBUtility.ClsPub.isStrNull(oItemSub2.HKFDQDate);
+                            bar2.HKFPeriod = DBUtility.ClsPub.isInt(oItemSub2.HKFPeriod);
+                            bar2.HSourceInterID = oItemSub2.HSourceInterID;
+                            bar2.HSourceEntryID = oItemSub2.HSourceEntryID;
+                            bar2.HSourceBillNo = oItemSub2.HSourceBillNo;
+                            bar2.HSourceBillType = oItemSub2.HSourceBillType;
+                            bar2.HSupID = oItemSub2.HSupID;
+                            bar2.HEndQty = WeiShu1;
+                            bar2.HMTONO = oItemSub2.HMTONO;
+                            ls3.Add(bar2);
+                            //LogService.Write("娴嬭瘯鍔�+++" + oItemSub2.HSupID);
                         }
-                        sDate = ClsPub.GetServerDate(0);
-                        sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
-                        sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
-                        sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
-                        sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
-                        sDay = sDay.Substring(sDay.Length - 2, 2);
-                        //
-                     //   TM = HNumber + sYear + sPeriod + sDay; //鏉$爜
-                        //
-                        Model.ClsGy_BarCodeBill_WMS_Model bar2 = new Model.ClsGy_BarCodeBill_WMS_Model();
-                        TM2 = (i + 1).ToString();
-                        while (TM2.Length < SumLen2)  //濡傛灉鏉$爜灏忎簬12浣嶆暟鍓嶉潰琛�0
-                        {
-                            TM2 = "0" + TM2;
-                        }                        
-                        bar2.HMaterID = oItemSub2.HMaterID;
-
-
-                        bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
-
-                        bar2.HUnitID = oItemSub2.HUnitID;
-                        bar2.HQty = HWXQty;
-                        bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
-                        bar2.HKFDate = DBUtility.ClsPub.isStrNull(oItemSub2.HKFDate);
-                        bar2.HKFDQDate = DBUtility.ClsPub.isStrNull(oItemSub2.HKFDQDate);
-                        bar2.HKFPeriod = DBUtility.ClsPub.isInt(oItemSub2.HKFPeriod);
-                        bar2.HSourceInterID = oItemSub2.HSourceInterID;
-                        bar2.HSourceEntryID = oItemSub2.HSourceEntryID;
-                        bar2.HSourceBillNo = oItemSub2.HSourceBillNo;
-                        bar2.HSourceBillType = oItemSub2.HSourceBillType;
-                        bar2.HSupID = oItemSub2.HSupID;
-                        bar2.HEndQty = WeiShu1;
-                        bar2.HMTONO = oItemSub2.HMTONO;
-                        ls3.Add(bar2);
                     }
                 }
-            }     
-            string HBarCode = "";
-            string HBarCodeType = "";
-            Int64 HMaterID = 0;
-            Int64 HUnitID = 0;
-            double HQty2 = 0;
-            string HBatchNo = "";
-            Int64 HSupID = 0;
-            Int64 HGroupID = 0;
-            int HPrintQty = 0;
-            Int64 HSourceInterID = 0;
-            Int64 HSourceEntryID = 0;
-            string HSourceBillNo = "";
-            string HSourceBillType = "";
-            Int64 HKFPeriod = 0;
-            string HKFDate = "";
-            string HKFDQDate = "";
-            string HWei = "";
-            string HMTONO = "";
+                string HBarCode = "";
+                string HBarCodeType = "";
+                Int64 HMaterID = 0;
+                Int64 HUnitID = 0;
+                double HQty2 = 0;
+                string HBatchNo = "";
+                Int64 HSupID = 0;
+                Int64 HGroupID = 0;
+                int HPrintQty = 0;
+                Int64 HSourceInterID = 0;
+                Int64 HSourceEntryID = 0;
+                string HSourceBillNo = "";
+                string HSourceBillType = "";
+                Int64 HKFPeriod = 0;
+                string HKFDate = "";
+                string HKFDQDate = "";
+                string HWei = "";
+                string HMTONO = "";
                 oCn.BeginTran();
                 foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)
                 {
+                    //LogService.Write("寰幆绗簩娆�:" + oItemSub.HSupID);
                     if (ClsPub.isLong(oItemSub.HMaterID) != 0)
                     {
                         HBarCode = oItemSub.HBarCode.ToString();
@@ -768,7 +773,8 @@
                         HUnitID = ClsPub.isLong(oItemSub.HUnitID);
                         HQty2 = ClsPub.isDoule(oItemSub.HQty);
                         HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
-                        HSupID = ClsPub.isInt(oItemSub.HSupID);
+                        HSupID = oItemSub.HSupID;
+                        //LogService.Write("HSupID:" + oItemSub.HSupID);
                         HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
                         HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
                         HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
@@ -789,6 +795,7 @@
                 }
                 foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
                 {
+                    //LogService.Write("寰幆绗笁娆�:" + oItemSub.HSupID);
                     if (ClsPub.isLong(oItemSub.HMaterID) != 0)
                     {
                         HBarCode = oItemSub.HBarCode.ToString();
@@ -798,7 +805,7 @@
                         HUnitID = ClsPub.isLong(oItemSub.HUnitID);
                         HQty2 = ClsPub.isDoule(oItemSub.HQty);
                         HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
-                        HSupID = ClsPub.isInt(oItemSub.HSupID);
+                        HSupID = oItemSub.HSupID;
                         HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
                         HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
                         HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
@@ -1112,12 +1119,12 @@
                 //鍏朵粬杩囨护
                 if (msg.Trim() == "")
                 {
-                    msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=''" + HSupNo.Trim() + "'') " + sqlWhere;
+                    msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=''" + HSupNo.Trim() + "'') " + sqlWhere;
                     // msg = " Where   hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
                 }
                 else
                 {
-                    msg = msg + " and   hsupid in (select HItemID from h_v_IF_Supplier where hnumber=''" + HSupNo.Trim() + "'') " + sqlWhere;
+                    msg = msg + " and   hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=''" + HSupNo.Trim() + "'') " + sqlWhere;
                     // msg = msg + " Where   hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
                 }
                 //杞崲鐗规畩瀛楃
@@ -1163,5 +1170,578 @@
 
         }
 
+        #region 閲囪喘璁㈠崟鏉$爜鐢熸垚鍔熻兘锛堝畨鐟烇級
+        [Route("GetHBarCodeShowBillMainBycg")]
+        /// <summary>
+        /// 鏉$爜鐢熸垚琛ㄥご锛堥噰璐鍗曪級
+        /// </summary>
+        /// <param name="sMsg"></param>
+        /// <returns></returns>
+        public object GetHBarCodeShowBillMainBycg(string sMsg)
+        {
+            try
+            {
+                DataSet ds;
+                string s = "";
+                string ShowItem = " * ";//鏄剧ず鐨勫瓧娈�
+                if (DBUtility.ClsPub.isLong(sMsg) == 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.data = null;
+                    return objjson;
+                }
+                DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
+                string sql = string.Format(@"select * from h_v_Cg_POOrderBillMain_ForWeb2 where HInterID = " + sMsg);
+                ds = oCn.RunProcReturn(sql, "h_v_Cg_POOrderBillMain_ForWeb2");
+                //ds = oClsWeb_BarCodeBill.ShowBillMain1(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+
+                    objjson.code = "0";
+                    objjson.count = 10000;
+                    objjson.Message = "鑾峰彇鎴愬姛";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception e)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+        [Route("GetHBarCodeShowBillSubBycg")]
+        [HttpGet]
+        /// <summary>
+        /// 鏉$爜鐢熸垚琛ㄤ綋锛堥噰璐鍗曪級
+        /// </summary>
+        /// <param name="sMsg"></param>
+        /// <returns></returns>
+        public object GetHBarCodeShowBillSubBycg(string sMsg)
+        {
+            try
+            {
+                DataSet ds;
+                string s = "";
+                string ShowItem = " * ";//鏄剧ず鐨勫瓧娈�
+                if (DBUtility.ClsPub.isLong(sMsg) == 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.data = null;
+                    return objjson;
+                }
+                DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
+                string sql = string.Format(@"select * from h_v_Cg_POOrderBillSub_ForWeb2 where HInterID = " + sMsg);
+                ds = oCn.RunProcReturn(sql, "h_v_Cg_POOrderBillSub_ForWeb2");
+                //ds = oClsWeb_BarCodeBill.ShowBillSub(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 10000;
+                    objjson.Message = "鑾峰彇鎴愬姛";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception e)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        [Route("GetBarcodeSaveBillBoxBycg")]
+        [HttpPost]
+        /// <summary>
+        /// 閲囪喘璁㈠崟 鐢熸垚鏉$爜 鍐呭绠�
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <param name="msg2"></param>
+        /// <returns></returns>
+        public object GetBarcodeSaveBillBoxBycg([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 UserName = "";
+            ListModels oListModels = new ListModels();
+            try
+            {
+                List<Model.ClsCg_POInStockBillMain> lsmain = new List<Model.ClsCg_POInStockBillMain>();
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");  //\n
+                lsmain = oListModels.getObjectByJson_POInStockMain(msg2);
+                foreach (Model.ClsCg_POInStockBillMain oItem in lsmain)
+                {
+                    UserName = oItem.HMaker;
+                }
+                DAL.ClsWeb_BarCodeBill oBill = new DAL.ClsWeb_BarCodeBill();
+
+                msg3 = msg3.Substring(1, msg3.Length - 2);
+                msg3 = msg3.Replace("\\", "");
+                msg3 = msg3.Replace("\n", "");  //\n
+
+                List<Model.ClsGy_MaterialList_WMS_Model> ls = new List<Model.ClsGy_MaterialList_WMS_Model>();
+                List<Model.ClsGy_BarCodeBill_WMS_Model> ls2 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();
+                List<Model.ClsGy_BarCodeBill_WMS_Model> ls3 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();
+                ls = oListModels.getObjectByJson_MaterialList(msg3);
+
+                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
+                {
+                    if (oBill.CheckBarCode(oItemSub.HSourceInterID, oItemSub.HSourceEntryID) == false)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "宸插瓨鍦ㄦ潯鐮侊紝涓嶅厑璁搁噸澶嶇敓鎴愶紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (msg2 != string.Empty)
+                    {
+                        if (oItemSub.HBQty == 0 || oItemSub.HMinQty == 0)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍐呯鍖呰鏁颁笉鑳戒负0锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (oItemSub.HWBQty == 0 || oItemSub.HWXQty == 0)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "澶栫鍖呰鏁颁笉鑳戒负0锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);
+                int LSHlen = 6;             //娴佹按鍙烽暱搴�
+                int SumLen = 10;            //鎬婚暱搴�
+                string TM = "";             //鏉$爜
+                string HNumber = "";        //鐗╂枡浠g爜
+                double HSumQty = 0;         //浜у搧鏁伴噺
+                double HMinQty = 0;         //鏈�灏忓寘瑁呮暟
+                int HBQty = 0;              //绠辨暟
+                double HQty = 0;            //鏁伴噺
+                int LSH = 0;                //娴佹按鍙�
+                string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
+                string sDate = "";            //鏃ユ湡
+                string sYear = "";          //骞�
+                string sPeriod = "";        //鏈�
+                string sDay = "";            //鏃�
+                string WeiShu = ""; //灏炬暟
+                DataSet Ds;
+                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+                Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
+                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
+                {
+                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)
+                    {
+                        HNumber = oItemSub.HMaterID.ToString();
+                        //HNumber = HNumber.Replace(".", "");
+                        //HQty = Math.Ceiling(HBQty + ClsPub.isDoule(oItemSub.HWBQty));
+                        HQty = ClsPub.isDoule(oItemSub.HWBQty);//鍐呯鏁�
+                        HBQty = ClsPub.isInt(oItemSub.HWBQty);//鍐呯鏁�
+                        HMinQty = ClsPub.isDoule(oItemSub.HWXQty);//澶栫鍖呰鏁�
+                        HSumQty = ClsPub.isDoule(oItemSub.HQty);  //浜у搧鏁伴噺
+                        for (int i = 0; i < HBQty; i++)
+                        {
+                            //  瀹夌憺鏉$爜瑙勫垯锛氱墿鏂欑紪鐮侊紙绯荤粺浠e叆锛堾鐗╂枡鍚嶇О锛堢郴缁熶唬鍏ワ級@瑙勬牸鍨嬪彿锛堢郴缁熶唬鍏ワ級@鐢熶骇鏃ユ湡锛堟墜宸ヨ緭鍏ワ級@鏁伴噺锛堟墜宸ヨ緭鍏ワ級@澶辨晥鏃ユ湡锛堟墜宸ヨ緭鍏ワ級@鎵规鍙凤紙鎵嬪伐浠e叆锛堾渚涘簲鍟嗗悕绉帮紙绯荤粺浠e叆锛堾閲囪喘璁㈠崟鍙凤紙绯荤粺浠e叆锛�
+                            TM = $"{oItemSub.HMaterNumber}@{oItemSub.HMaterName}@{oItemSub.HMaterModel}@{oItemSub.HKFDate}@{oItemSub.HQty}@{oItemSub.HKFDQDate}@{oItemSub.HBatchNo}@{oItemSub.HSupName}@{oItemSub.HSourceBillNo}";
+
+                            if (HSumQty - HMinQty > 0)
+                            {
+                                WeiShu = "";
+                                HSumQty = HSumQty - HMinQty;
+                            }
+                            else
+                            {
+                                if (HSumQty == HMinQty)
+                                {
+                                    WeiShu = "";
+                                }
+                                else
+                                {
+                                    WeiShu = "灏炬暟";
+                                }
+                                HMinQty = HSumQty;
+                            }
+
+                            Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
+                            bar.HBarCode = TM;
+                            bar.HMaterID = oItemSub.HMaterID;
+                            //bar.HMaterNumber = oItemSub.HMaterNumber;
+                            //bar.HMaterName = oItemSub.HMaterName;
+                            //bar.HMaterModel = oItemSub.HMaterModel;
+                            //  bar.HModel2 = oItemSub.HModel;
+                            bar.HUnitID = oItemSub.HUnitID;
+                            //bar.HUnitNumber2 = oItemSub.HUnitNumber;
+                            //bar.HUnitName2 = oItemSub.HUnitName;
+                            bar.HQty = HMinQty;
+                            bar.HBatchNo = oItemSub.HBatchNo;
+                            bar.HKFDate = oItemSub.HKFDate;
+                            bar.HKFPeriod = oItemSub.HKFPeriod;
+                            bar.HKFDQDate = oItemSub.HKFDQDate;
+                            bar.HSourceInterID = oItemSub.HSourceInterID;
+                            bar.HSourceEntryID = oItemSub.HSourceEntryID;
+                            bar.HSourceBillNo = oItemSub.HSourceBillNo;
+                            bar.HSourceBillType = oItemSub.HSourceBillType;
+                            bar.HMinQty = oItemSub.HMinQty;
+                            bar.HSupID = oItemSub.HSupID;
+                            bar.HEndQty = WeiShu;
+                            bar.HMTONO = oItemSub.HMTONO;
+                            ls2.Add(bar);
+                        }
+                    }
+                }
+                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)
+                {
+                    if (ClsPub.isLong(oItemSub2.HMaterID) != 0)
+                    {
+                        long sMaterID = ClsPub.isLong(oItemSub2.HMaterID);
+                        Ds = oCn.RunProcReturn("exec GetLSH " + sMaterID.ToString(), "GetLSH");
+                        string WeiShu1 = ""; //灏炬暟
+                        int SumLen2 = 4;
+                        string TM2 = "";
+                        double HWXQty = 0;
+
+                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
+                        //
+                        HNumber = oItemSub2.HMaterID.ToString();
+                        //HMinQty = ClsPub.isDoule(oItemSub2.HMinQtyCol2].Value);
+                        HWXQty = ClsPub.isDoule(oItemSub2.HMinQty);
+                        HSumQty = ClsPub.isDoule(oItemSub2.HQty);
+                        HBQty = ClsPub.isInt(Math.Ceiling(HSumQty / HWXQty));
+                        double NXTMQTY = 0;
+                        for (int i = 0; i < HBQty; i++)
+                        {
+                            if (HSumQty <= 0 || HWXQty <= 0)
+                            {
+                                break;
+                            }
+                            if (HSumQty - HWXQty > 0)
+                            {
+                                WeiShu1 = "";
+                                NXTMQTY = HWXQty;
+                                HSumQty = HSumQty - HWXQty;
+                            }
+                            else
+                            {
+                                if (HSumQty == HWXQty)
+                                {
+                                    WeiShu1 = "";
+                                }
+                                else
+                                {
+                                    WeiShu1 = "灏炬暟";
+                                }
+                                NXTMQTY = HSumQty;  //HWXQty
+                                HWXQty = HSumQty;
+                                HSumQty = 0;
+                            }
+                            sDate = ClsPub.GetServerDate(0);
+                            sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+                            sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+                            sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+                            sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+                            sDay = sDay.Substring(sDay.Length - 2, 2);
+                            //
+                            //   TM = HNumber + sYear + sPeriod + sDay; //鏉$爜
+                            //
+                            Model.ClsGy_BarCodeBill_WMS_Model bar2 = new Model.ClsGy_BarCodeBill_WMS_Model();
+                            TM2 = (i + 1).ToString();
+                            while (TM2.Length < SumLen2)  //濡傛灉鏉$爜灏忎簬12浣嶆暟鍓嶉潰琛�0
+                            {
+                                TM2 = "0" + TM2;
+                            }
+                            bar2.HMaterID = oItemSub2.HMaterID;
+
+
+                            bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
+
+                            bar2.HUnitID = oItemSub2.HUnitID;
+                            bar2.HQty = HWXQty;
+                            bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
+                            bar2.HKFDate = DBUtility.ClsPub.isStrNull(oItemSub2.HKFDate);
+                            bar2.HKFDQDate = DBUtility.ClsPub.isStrNull(oItemSub2.HKFDQDate);
+                            bar2.HKFPeriod = DBUtility.ClsPub.isInt(oItemSub2.HKFPeriod);
+                            bar2.HSourceInterID = oItemSub2.HSourceInterID;
+                            bar2.HSourceEntryID = oItemSub2.HSourceEntryID;
+                            bar2.HSourceBillNo = oItemSub2.HSourceBillNo;
+                            bar2.HSourceBillType = oItemSub2.HSourceBillType;
+                            bar2.HSupID = oItemSub2.HSupID;
+                            bar2.HEndQty = WeiShu1;
+                            bar2.HMTONO = oItemSub2.HMTONO;
+                            ls3.Add(bar2);
+                        }
+                    }
+                }
+                string HBarCode = "";
+                string HBarCodeType = "";
+                Int64 HMaterID = 0;
+                Int64 HUnitID = 0;
+                double HQty2 = 0;
+                string HBatchNo = "";
+                Int64 HSupID = 0;
+                Int64 HGroupID = 0;
+                int HPrintQty = 0;
+                Int64 HSourceInterID = 0;
+                Int64 HSourceEntryID = 0;
+                string HSourceBillNo = "";
+                string HSourceBillType = "";
+                Int64 HKFPeriod = 0;
+                string HKFDate = "";
+                string HKFDQDate = "";
+                string HWei = "";
+                string HMTONO = "";
+                oCn.BeginTran();
+                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)
+                {
+                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)
+                    {
+                        HBarCode = oItemSub.HBarCode.ToString();
+                        HMTONO = ClsPub.isStrNull(oItemSub.HMTONO);
+                        HBarCodeType = "绠卞彿鏉$爜";
+                        HMaterID = ClsPub.isLong(oItemSub.HMaterID);
+                        HUnitID = ClsPub.isLong(oItemSub.HUnitID);
+                        HQty2 = ClsPub.isDoule(oItemSub.HQty);
+                        HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
+                        HSupID = oItemSub.HSupID;
+                        HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
+                        HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
+                        HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
+                        HSourceInterID = ClsPub.isLong(oItemSub.HSourceInterID);
+                        HSourceEntryID = ClsPub.isLong(oItemSub.HSourceEntryID);
+                        HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
+                        HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
+                        HWei = ClsPub.isStrNull(oItemSub.HEndQty);
+                        oCn.RunProc("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
+                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
+                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
+                                    ") values ("
+                                    + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+                                    + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+                                    + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
+                        oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
+                    }
+                }
+                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
+                {
+                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)
+                    {
+                        HBarCode = oItemSub.HBarCode.ToString();
+                        HMTONO = ClsPub.isStrNull(oItemSub.HMTONO);
+                        HBarCodeType = "绠卞彿鍐呮潯鐮�";
+                        HMaterID = ClsPub.isLong(oItemSub.HMaterID);
+                        HUnitID = ClsPub.isLong(oItemSub.HUnitID);
+                        HQty2 = ClsPub.isDoule(oItemSub.HQty);
+                        HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
+                        HSupID = oItemSub.HSupID;
+                        HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
+                        HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
+                        HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
+                        HSourceInterID = ClsPub.isLong(oItemSub.HSourceInterID);
+                        HSourceEntryID = ClsPub.isLong(oItemSub.HSourceEntryID);
+                        HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
+                        HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
+                        HWei = ClsPub.isStrNull(oItemSub.HEndQty);
+                        oCn.RunProc("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
+                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
+                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
+                                    ") values ("
+                                    + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+                                    + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+                                    + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
+                    }
+                }
+                //鏆傛椂鍙洖濉叧鑱旀暟閲�
+                oCn.RunProc("exec H_p_SRM_BarCodeBill_Update_UpdateBillRelateData " + linterid.ToString());
+                oCn.Commit();
+
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "" + e.Message + DBUtility.ClsPub.sExeReturnInfo;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+            objJsonResult.code = "0";
+            objJsonResult.count = 1;
+            objJsonResult.Message = "鐢熸垚鏉$爜鎴愬姛锛�";
+            WebAPIController.Add_Log("鏉$爜涓嬫帹", UserName, "鐢熸垚鏉$爜");
+            objJsonResult.data = null;
+            return objJsonResult;
+        }
+        #endregion
+
+        #region 濮斿璁㈠崟鏉$爜鐢熸垚鍔熻兘锛堝畨鐟烇級
+        [Route("GetHBarCodeShowBillMainBywy")]
+        /// <summary>
+        /// 鏉$爜鐢熸垚琛ㄥご锛堥噰璐鍗曪級
+        /// </summary>
+        /// <param name="sMsg"></param>
+        /// <returns></returns>
+        public object GetHBarCodeShowBillMainBywy(string sMsg)
+        {
+            try
+            {
+                DataSet ds;
+                string s = "";
+                string ShowItem = " * ";//鏄剧ず鐨勫瓧娈�
+                if (DBUtility.ClsPub.isLong(sMsg) == 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.data = null;
+                    return objjson;
+                }
+                DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
+                string sql = string.Format(@"select * from h_v_SRM_EntrustOrderBillMain_ForWeb2 where HInterID = " + sMsg);
+                ds = oCn.RunProcReturn(sql, "h_v_SRM_EntrustOrderBillMain_ForWeb2");
+                //ds = oClsWeb_BarCodeBill.ShowBillMain1(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+
+                    objjson.code = "0";
+                    objjson.count = 10000;
+                    objjson.Message = "鑾峰彇鎴愬姛";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception e)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+        [Route("GetHBarCodeShowBillSubBywy")]
+        [HttpGet]
+        /// <summary>
+        /// 鏉$爜鐢熸垚琛ㄤ綋锛堥噰璐鍗曪級
+        /// </summary>
+        /// <param name="sMsg"></param>
+        /// <returns></returns>
+        public object GetHBarCodeShowBillSubBywy(string sMsg)
+        {
+            try
+            {
+                DataSet ds;
+                string s = "";
+                string ShowItem = " * ";//鏄剧ず鐨勫瓧娈�
+                if (DBUtility.ClsPub.isLong(sMsg) == 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.data = null;
+                    return objjson;
+                }
+                DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
+                string sql = string.Format(@"select * from h_v_srm_EntrustOrderBillSub_ForWeb2 where HInterID = " + sMsg);
+                ds = oCn.RunProcReturn(sql, "h_v_srm_EntrustOrderBillSub_ForWeb2");
+                //ds = oClsWeb_BarCodeBill.ShowBillSub(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触";
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 10000;
+                    objjson.Message = "鑾峰彇鎴愬姛";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception e)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        [Route("DeltetBarCodeBill")]
+        [HttpGet]
+        public object DeltetBarCodeBill(string HInterID, string HUserName)
+        {
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            try
+            {
+                WebAPIController.Add_Log("鏉$爜妗f鍒犻櫎", HUserName, "鏉$爜妗f鍒犻櫎");
+                oCN.BeginTran();
+                //LogService.Write("Delete From Gy_BarCodeBill where HItemID in(" + HInterID + ")") ;
+                oCN.RunProc("Delete From Gy_BarCodeBill where HItemID in(" + HInterID + ") ");
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1