From cee2c78bdc4aa9f309b68bc489c97282c9b7cb65 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 31 七月 2022 09:51:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs |   16 +-
 WebAPI/ListModels.cs                                |   23 +++
 WebAPI/Controllers/Sc_PckSplitBillController.cs     |  204 ++++++++++++++++++++++++++++++++-
 WebAPI/Controllers/Sc_ProcessMangementController.cs |    4 
 WebAPI/Controllers/LMESController.cs                |    4 
 WebAPI/Models/ClsSc_AssemblyBillSub.cs              |   24 ++++
 WebAPI/WebAPI.csproj                                |    3 
 WebAPI/DLL/ClsSc_PHPCruxBillBill.cs                 |   25 ++++
 WebAPI/Models/ClsSc_AssemblyBillMain.cs             |   28 ++++
 9 files changed, 311 insertions(+), 20 deletions(-)

diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index c9f0218..a213858 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -30,9 +30,9 @@
         Gy_RoutingBill_temporary omdelMian = new Gy_RoutingBill_temporary();
         public string BillType = "3301";
 
-        #region 宸ヨ壓璺嚎 鍒楄〃
+        #region 鏈煡
         /// <summary>
-        /// 杩斿洖宸ヨ壓璺嚎鍒楄〃
+        /// 鏈煡
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
@@ -44,11 +44,11 @@
             {
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere, "h_v_MES_StationEntrustOutBillList");
+                    ds = oCN.RunProcReturn("select  * from h_v_MES_StationEntrustOutBillList " + sWhere, "h_v_MES_StationEntrustOutBillList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_MES_StationEntrustOutBillList where 1 = 1 ";
+                    string sql1 = "select  * from h_v_MES_StationEntrustOutBillList where 1 = 1 ";
                     string sql = sql1 + sWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustOutBillList");
                 }
@@ -475,12 +475,12 @@
                                 , 鑹巼, 宸ュ簭宸ヤ环, 涓嶅悎鏍煎崟浠�, 鎶ュ簾鍗曚环, 鏈亾鍥哄畾寮�宸ュぉ鏁�, 鏈亾寮�宸ヤ綑閲�, 涓婇亾绛夊緟澶╂暟
                                 , 涓婇亾寰幆鍛ㄦ湡, 鑷姩杞Щ, 澶栧崗鏍囪, 渚涘簲鍟嗕唬鐮�, 渚涘簲鍟�, 宸ヨ壓鍙傛暟, 鍥剧焊缂栧彿
                                 , 鏈伐搴忕‘璁よ褰�, 澶囨敞, 鍥惧彿鐗堟湰, 鎬昏鍥惧彿, 鏉愯川, 鎴愬搧缂栧彿, 鐗堟湰
-                                , 妯″叿缂栧彿, 绋嬪簭鍙�, 鐝骇瀹氶, 宸ヨ壓璺嚎鍚嶇О, 鏃堕棿鍗曚綅)values
+                                , 妯″叿缂栧彿, 绋嬪簭鍙�, 鐝骇瀹氶, 宸ヨ壓璺嚎鍚嶇О, 鏃堕棿鍗曚綅,宸ヨ壓璺嚎浠g爜)values
                                 ('" + tb2.Rows[i]["浜у搧浠g爜"].ToString() + "','" + tb2.Rows[i]["浜у搧鍚嶇О"].ToString() + "','" + tb2.Rows[i]["宸ュ簭搴忓彿"].ToString() + "','" + tb2.Rows[i]["宸ュ簭浠g爜"].ToString() + "','" + tb2.Rows[i]["宸ュ簭"].ToString() + "','" + tb2.Rows[i]["宸ヤ綔涓績"].ToString() + "','" + tb2.Rows[i]["鍔犲伐鏁伴噺"].ToString() + "'" +
                                 ",'" + tb2.Rows[i]["鑹巼"].ToString() + "','" + (tb2.Rows[i]["宸ュ簭宸ヤ环"].ToString()==""?"0": tb2.Rows[i]["宸ュ簭宸ヤ环"].ToString()) + "','" + tb2.Rows[i]["涓嶅悎鏍煎崟浠�"].ToString() + "','" + tb2.Rows[i]["鎶ュ簾鍗曚环"].ToString() + "','" + tb2.Rows[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString() + "','" + tb2.Rows[i]["鏈亾寮�宸ヤ綑閲�"].ToString() + "','" + tb2.Rows[i]["涓婇亾绛夊緟澶╂暟"].ToString() + "'" +
                                 ",'" + tb2.Rows[i]["涓婇亾寰幆鍛ㄦ湡"].ToString() + "','" + tb2.Rows[i]["鑷姩杞Щ"].ToString() + "','" + tb2.Rows[i]["澶栧崗鏍囪"].ToString() + "','" + tb2.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString() + "','" + tb2.Rows[i]["渚涘簲鍟�"].ToString() + "','" + tb2.Rows[i]["宸ヨ壓鍙傛暟"].ToString() + "','" + tb2.Rows[i]["鍥剧焊缂栧彿"].ToString() + "'" +
                                 ",'" + tb2.Rows[i]["鏈伐搴忕‘璁よ褰�"].ToString() + "','" + tb2.Rows[i]["澶囨敞"].ToString() + "','" + tb2.Rows[i]["鍥惧彿鐗堟湰"].ToString() + "','" + tb2.Rows[i]["鎬昏鍥惧彿"].ToString() + "','" + tb2.Rows[i]["鏉愯川"].ToString() + "','" + tb2.Rows[i]["鎴愬搧缂栧彿"].ToString() + "','" + tb2.Rows[i]["鐗堟湰"].ToString() + "'" +
-                                ",'" + tb2.Rows[i]["妯″叿缂栧彿"].ToString() + "','" + tb2.Rows[i]["绋嬪簭鍙�"].ToString() + "','" + tb2.Rows[i]["鐝骇瀹氶"].ToString() + "','" + tb2.Rows[i]["宸ヨ壓璺嚎鍚嶇О"].ToString() + "','" + tb2.Rows[i]["鏃堕棿鍗曚綅"].ToString() + "')");
+                                ",'" + tb2.Rows[i]["妯″叿缂栧彿"].ToString() + "','" + tb2.Rows[i]["绋嬪簭鍙�"].ToString() + "','" + tb2.Rows[i]["鐝骇瀹氶"].ToString() + "','" + tb2.Rows[i]["宸ヨ壓璺嚎鍚嶇О"].ToString() + "','" + tb2.Rows[i]["鏃堕棿鍗曚綅"].ToString() + "','" + tb2.Rows[i]["宸ヨ壓璺嚎浠g爜"].ToString() + "')");
                 }
 
                 objJsonResult.code = "1";
@@ -665,11 +665,11 @@
                 omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);
 
 
-                ds = oCN.RunProcReturn("select  distinct 浜у搧浠g爜 from  diyipi ", "diyipi");
+                ds = oCN.RunProcReturn("select  distinct 浜у搧浠g爜,宸ヨ壓璺嚎浠g爜 from  diyipi ", "diyipi");
 
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                 {
-                    var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+                    var HBillNo = ds.Tables[0].Rows[i]["宸ヨ壓璺嚎浠g爜"].ToString();//鑾峰緱涓�涓柊鐨勫崟鎹彿
                     var HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
                     oCN.RunProc($"exec Gy_RoutingBill_Excel '{ds.Tables[0].Rows[i]["浜у搧浠g爜"].ToString()}',{HInterID},'{HBillNo}','{user}',{omdelMian.HOrgID},{omdelMian.HTProcessFlag} ");
                 }
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 3858ab9..89db549 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -219,11 +219,11 @@
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
+                    ds = oCN.RunProcReturn("select top 1000 * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
+                    string sql1 = "select  top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 ";
                     string sql = sql1 + sWhere+ " order by hmainid desc,cast(宸ュ簭鍙� as int)";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
                 }
diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs
index a123d40..b90657a 100644
--- a/WebAPI/Controllers/Sc_PckSplitBillController.cs
+++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -380,7 +380,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.Message = "鏆傛棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -388,7 +388,7 @@
                 {
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "鏆傛棤鏁版嵁";
+                    objJsonResult.Message = "鏌ヨ鎴愬姛";
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
@@ -405,20 +405,82 @@
         }
         #endregion
 
-        #region 浜х嚎鍏抽敭浠剁粦瀹歋N鍙锋煡璇�
-        [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+        #region 浜х嚎鍏抽敭浠剁粦瀹�
+        /// <summary>
+        /// SN鍙锋煡璇�
+        /// </summary>
+        /// <param name="HBarCode">SN鍙�</param>
+        /// <returns></returns>
+        [Route("Sc_PckSplit/Get_PHPCruxSNBillList")]
         [HttpGet]
-        public Object Get_PHPCruxBillList(string HBarCode)
+        public Object Get_PHPCruxSNBillList(int HinterID, string HBarCode,int HProcID,string HBillNo)
         {
             try
             {
-                string sql1 = string.Format(@"select a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,a.HQtyMust,0 HQty,'"+ HBarCode + "' as HCPM from Sc_PPBomBillSub a left join Gy_Material m on a.HMaterID=m.HItemID where HICMOEntryID=(select HSourceEntryID from Gy_BarCodeBill where HBarCode='"+HBarCode+"')");
-                DataSet ds = oCn.RunProcReturn(sql1, "Sc_PPBomBillSub");
+                string sql1 = string.Format($"exec h_p_Sc_PHPCruxSNBillTOTemp '"+HBarCode+"',"+HinterID+","+HProcID+",'"+ HBillNo+"'");
+                DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxSNBillTOTemp");
                 if (ds.Tables[0].Rows.Count == 0 || ds == null)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["sel"]) ==0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else{
+                    //鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹�
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鏌ヨ鎴愬姛";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        /// <summary>
+        /// 鍏抽敭鐮佹煡璇�
+        /// </summary>
+        /// <param name="HBarCode">鍏抽敭鐮�</param>
+        /// <returns></returns>
+        [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+        [HttpGet]
+        public Object Get_PHPCruxBillList(int HinterID,string HPCrux,string HBillNo)
+        {
+            try
+            {
+                string sql1 = string.Format($"exec h_p_Sc_PHPCruxBillTOTemp '" +HPCrux+"',"+ HinterID+",'"+ HBillNo+"'");
+                DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxBillTOTemp");
+                if (ds.Tables[0].Rows.Count == 0 || ds == null)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏈煡璇㈠埌鏉″舰鐮佷俊鎭紒" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+                {
+                    objJsonResult.code = "2";
+                    objJsonResult.count = 2;
+                    objJsonResult.Message = "閿欒锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -427,7 +489,7 @@
                     //鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹�
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "鏆傛棤鏁版嵁";
+                    objJsonResult.Message = "鏌ヨ鎴愬姛";
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
@@ -442,6 +504,130 @@
                 return objJsonResult;
             }
         }
+
+        /// <summary>
+        /// 鎵爜缂撳瓨鍒犻櫎
+        /// </summary>
+        /// <param name="HBarCode">鍏抽敭鐮�</param>
+        /// <returns></returns>
+        [Route("Sc_PckSplit/Delete_PHPCruxBillListByME")]
+        [HttpGet]
+        public Object Delete_PHPCruxBillListByME(int HInterID,int HMaterID,string HBarCode)
+        {
+            try
+            {
+                oCn.BeginTran();
+                string sql = string.Format(@"delete Sc_AssemblyBill_BindBarCodeTemp where HInterID="+ HInterID+" and HMaterID="+ HMaterID+ " and HBarCode='" + HBarCode+"'");
+                oCn.RunProc(sql);
+                //鍒犻櫎鎴愬姛
+                string sql1= string.Format(@"select  a.HEntryID,a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,1 HQty,HBarCode HPJM
+                            from Sc_AssemblyBill_BindBarCodeTemp a left join Gy_Material m on a.HMaterID=m.HItemID
+					        where HInterID=" + HInterID);
+                DataSet ds=oCn.RunProcReturn(sql1, "Sc_AssemblyBill_BindBarCodeTemp");
+                oCn.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCn.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        /// <summary>
+        /// 缁勮鍗曟彁浜�
+        /// </summary>
+        /// <param name="HBarCode">鍏抽敭鐮�</param>
+        /// <returns></returns>
+        [Route("Sc_PckSplit/Add_PHPCruxBillList")]
+        [HttpPost]
+        public Object Add_PHPCruxBillList([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 msg4 = sArray[2].ToString();//鏉$爜鍒楄〃
+            string msg5 = sArray[3].ToString();//鐧诲綍浜�
+            ListModels oListModels = new ListModels();
+            long HinterID;
+            string HBillNo = "";
+
+            try
+            {
+                DLL.ClsSc_PHPCruxBillBill oBill = new DLL.ClsSc_PHPCruxBillBill();
+                List<Models.ClsSc_AssemblyBillMain> lsmain = new List<Models.ClsSc_AssemblyBillMain>();//鍩烘湰璧勬枡
+                List<Models.ClsSc_AssemblyBillMain> lspjItme = new List<Models.ClsSc_AssemblyBillMain>();//閰嶄欢鍒楄〃
+                List<Models.ClsSc_AssemblyBillSub> lstmItme = new List<Models.ClsSc_AssemblyBillSub>();//鎵爜鍒楄〃
+                //鍩烘湰璧勬枡_json鏍煎紡杞崲
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");  
+                lsmain = oListModels.getObjectByJson_Sc_AssemblyBillMain(msg2);
+
+                HinterID = lsmain[0].HInterID;//涓籌D
+                HBillNo = lsmain[0].HBillNo;//鍗曟嵁鍙�
+
+
+                //浜嬪姟寮�濮�
+                oCn.BeginTran();
+                //鏍规嵁interID鍦ㄦ簮鍗曚复鏃惰〃涓煡鎵炬暟鎹�
+                DataSet ds1 = oCn.RunProcReturn("select top 1 * from Sc_AssemblyBill_BindSourceTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindSourceTemp");
+               //淇濆瓨鐢熶骇缁勮鍗曚富琛�
+                string sql = "Insert Into Sc_AssemblyBillMain   " +
+                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate," +
+                        "HBillNo,HBillStatus,HMaker,HMakeDate" +
+                        ",HMainSourceInterID,HMainSourceBillNo" +
+                        ",HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus" +
+                        ") " +
+                        " values('" + DateTime.Now.Year + "','" + DateTime.Now.Month + "',3727,3727," + HinterID + ",'" + DateTime.Now+
+                        "','" + HBillNo + "',1,'"+msg5+"',getdate()" +
+                        ",0,'" + lsmain[0].HBarCode + "'" + 
+                        "," + ds1.Tables[0].Rows[0]["HSourceInterID"].ToString() + ",'" + ds1.Tables[0].Rows[0]["HSourceBillNo"].ToString() + "','" + lsmain[0].HBarCode + "',0,0,'鐢熶骇涓�'" + 
+                        ") ";
+                oCn.RunProc(sql);
+
+                //鏍规嵁interID鍦ㄦ壂鐮佷复鏃惰〃涓煡鎵炬暟鎹�
+                DataSet ds2 = oCn.RunProcReturn("select * from Sc_AssemblyBill_BindBarCodeTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindBarCodeTemp");
+                for (int i = 0; i < ds2.Tables[0].Rows.Count; i++)
+                {
+                    string sq2 = "Insert Into Sc_AssemblyBillSub   " +
+                        "(HInterID,HBillNo_bak,HEntryID," +
+                        "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+                        ",HMaterID,HSourceID,HEquipID,HUnitID,HQty,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber" +
+                        ") " +
+                        " values(" + HinterID + ",'" + HBillNo + "'," + i +
+                        "," + ds2.Tables[0].Rows[i]["HSourceInterID"].ToString() + "," + ds2.Tables[0].Rows[i]["HSourceEntryID"].ToString() + ",'" + ds2.Tables[0].Rows[i]["HSourceBillNo"].ToString() + "'" +
+                        ",''," + ds2.Tables[0].Rows[i]["HMaterID"].ToString() + ",'"+ lsmain[0].HSCZYID + "',0,0,1," + lsmain[0].HGroupID + "," + lsmain[0].HKeeperID + ",getdate(),'" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + lsmain[0].HBarCode + "'" +
+                        ") ";
+                    oCn.RunProc(sq2);
+                }
+                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 = "涓婁紶澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
         #endregion
+
     }
 }
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 151eb51..54dbdc0 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -219,7 +219,9 @@
                 model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //鍗曟嵁绫诲瀷鐢熶骇姹囨姤鈥淪CHBD02_SYS鈥� 鍏ュ簱姹囨姤SCHBD01_SYS
                 model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
                 model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
+                model.Add("FHZYMESFLAG", "鏄�");//  鏄惁涓篗ES鍚屾
                 JArray Fentity = new JArray();
+
                 foreach (DataRow item in ds.Tables[0].Rows)
                 {
                     JObject FentityModel = new JObject();
@@ -318,7 +320,7 @@
                     Ids = fID,
                 };
                 result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
-                //result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//瀹℃牳
+                result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
                 if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                 {
                     oCN.RollBack();
diff --git a/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs b/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs
new file mode 100644
index 0000000..c251614
--- /dev/null
+++ b/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs
@@ -0,0 +1,25 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+    public class ClsSc_PHPCruxBillBill : DBUtility.ClsXt_BaseBill
+    {
+        public Models.ClsSc_AssemblyBillMain omodel = new Models.ClsSc_AssemblyBillMain();
+        public List<Models.ClsSc_AssemblyBillSub> DetailColl = new List<Models.ClsSc_AssemblyBillSub>();
+
+        public ClsSc_PHPCruxBillBill()
+        {
+            base.MvarItemKeySub = "Sc_AssemblyBillSub";
+            base.MvarItemKeySub2 = "";
+            base.MvarItemKeySub3 = "";
+            base.MvarItemKeySub4 = "";
+            base.MvarItemKey = "Sc_AssemblyBillMain";
+            base.MvarReportTitle = "鐢熶骇缁勮鍗�";
+            base.BillType = "3727";
+            base.HBillSubType = "3727";
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 4ed8160..cbb9302 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1985,5 +1985,28 @@
             return list;
         }
 
+        /// <summary>
+        /// 缁勮杩芥函-涓�
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSc_AssemblyBillMain> getObjectByJson_Sc_AssemblyBillMain(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSc_AssemblyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_AssemblyBillMain>>(jsonString);
+            return list;
+        }
+        /// <summary>
+        /// 缁勮杩芥函-瀛�
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSc_AssemblyBillSub> getObjectByJson_Sc_AssemblyBillSub(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSc_AssemblyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_AssemblyBillSub>>(jsonString);
+            return list;
+        }
+
     }
 } 
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_AssemblyBillMain.cs b/WebAPI/Models/ClsSc_AssemblyBillMain.cs
new file mode 100644
index 0000000..bf9758c
--- /dev/null
+++ b/WebAPI/Models/ClsSc_AssemblyBillMain.cs
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class ClsSc_AssemblyBillMain : DBUtility.ClsXt_BaseBillMain
+    {
+        public Int64 HICMOInterID;//   int        		--浠诲姟鍗旾D锛堟壂鐮佷骇鍝佹潯鐮佸甫鍑猴級
+        public Int64 HMaterID = 0;//    int         		--浜у搧ID
+        public Int64 HUnitID=0;//  int           		--鍗曚綅ID   
+        public string HICMOBillNo;//   varchar(200)    	--浠诲姟鍗曞彿 锛堟壂鐮佷骇鍝佹潯鐮佸甫鍑猴級
+        public string HBarCode_P;//  varchar(50)     	--浜у搧鏉″舰鐮�
+        public string HAssemblyStatus; //缁勮鐘舵�侊紙鐢熶骇涓紝姹囨姤锛屾楠岋紝鍖呰锛屽叆搴擄級
+        public string HCPM;
+        public int HGroupID;
+        //public string HGroupName;
+        public int HKeeperID;
+        //public string HKeeperName;
+        public string HBarCode;
+        //public string HProc;
+        public int HProcID;
+        public string HPCrux;
+        public string HSCZY;
+        public int HSCZYID;
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_AssemblyBillSub.cs b/WebAPI/Models/ClsSc_AssemblyBillSub.cs
new file mode 100644
index 0000000..cbe7945
--- /dev/null
+++ b/WebAPI/Models/ClsSc_AssemblyBillSub.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class ClsSc_AssemblyBillSub : DBUtility.ClsXt_BaseBillSub
+    {
+        public Int64 HMaterID;//     int   			--鐗╂枡ID
+        public Int64 HUnitID;//  鍗曚綅ID
+        public double HQty;//        鏁伴噺
+        public Int64 HSourceID;//    鐢熶骇璧勬簮ID锛堥潪蹇呰锛�
+        public Int64 HEquipID;//    鐢熶骇璁惧ID锛堥潪蹇呰锛�
+        public Int64 HGroupID;//		鐢熶骇鐝粍ID锛堥潪蹇呰锛�	 
+        public Int64 HWorkerID;//	鎿嶄綔宸D锛堥潪蹇呰锛�
+        public string HScanDate;//	--鎵弿鏃堕棿
+        public string HBarCode;//	varchar(50) --鏉″舰鐮�
+        public string HBarCode_P;//	varchar(50) --浜у搧鏉$爜
+        public string HSNNumber;//	SN鍙凤紙闈炲繀濉級
+        public string HPJM;
+
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e3ea52f..898efca 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -537,6 +537,7 @@
     <Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
     <Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+    <Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
     <Compile Include="DLL\ClsSc_ProcessPlan.cs" />
     <Compile Include="DLL\ClsWW_PPBomBill.cs" />
     <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_GroupBalBill.cs" />
@@ -545,6 +546,8 @@
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
     <Compile Include="Log.cs" />
+    <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
+    <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
     <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
     <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
     <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />

--
Gitblit v1.9.1