From 96a22956deb8935e908d3462bd220d3bc8acc365 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 03 十二月 2022 15:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs |  757 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 555 insertions(+), 202 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 337127e..95cceb9 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Pub_Class;
 using System;
 using System.Collections;
@@ -18,6 +19,7 @@
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
 
+        #region[鏂板鍗曟嵁-淇濆瓨鎸夐挳]
         /// <summary>
         /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -29,227 +31,383 @@
         {
             var _value = sMainSub["sMainSub"].ToString();
             string msg1 = _value.ToString();
-            //淇濆瓨鍗曟嵁
-            return objJsonResult = AddBillMain(msg1);
-        }
-
-        public json AddBillMain(string msg1)
-        {
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
             string msg3 = sArray[1].ToString();
-            bool bResult;
+            string msg4 = sArray[2].ToString();
+            string msg5 = sArray[3].ToString();
+
+            string UserName = "";
+            ListModels oListModels = new ListModels();
+            
             try
             {
-                msg2 = "[" + msg2.ToString() + "]";
-                List<Model.ClsSc_ProcessExchangeBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(msg2);
-                DAL.ClsSc_ProcessExchangeBill BillNew = new DAL.ClsSc_ProcessExchangeBill();
-                //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
-                string s = "";
-                int sYear = 0;
-                int sPeriod = 0; 
-                DateTime HDate = mainList[0].HDate;//鏃ユ湡
-                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg4))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = s;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//缁勭粐
-                BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
-                BillNew.omodel.HYear = sYear;
-                BillNew.omodel.HPeriod = sPeriod;
-                BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
-                BillNew.omodel.HDate = HDate;
-                BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
-                BillNew.omodel.HMaker = mainList[0].HMaker;
-                BillNew.omodel.HWWOrderInterID = ClsPub.isLong(mainList[0].HWWOrderInterID);
-                BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(mainList[0].HWWOrderEntryID);
-                BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(mainList[0].HWWOrderBillNo);
-                BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
-                BillNew.omodel.HICMOEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
-                BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
-                BillNew.omodel.HMaterID2 = ClsPub.isLong(mainList[0].HMaterID2);
-                BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
-                BillNew.omodel.HMaterNumber = ClsPub.isStrNull(mainList[0].HMaterNumber);
-                BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
-                BillNew.omodel.HUnitID = ClsPub.isLong(mainList[0].HUnitID);
-                BillNew.omodel.HUnitNumber = ClsPub.isStrNull(mainList[0].HUnitNumber);
-                BillNew.omodel.HPlanQty = ClsPub.isDoule(mainList[0].HPlanQty);
-                BillNew.omodel.HQty = ClsPub.isDoule(mainList[0].HQty);
-                BillNew.omodel.HPlanBeginDate = ClsPub.isDate(mainList[0].HPlanBeginDate);
-                BillNew.omodel.HPlanEndDate = ClsPub.isDate(mainList[0].HPlanEndDate);
-                BillNew.omodel.HExplanation = ClsPub.isStrNull(mainList[0].HExplanation);
-                BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(mainList[0].HInnerBillNo);
-                BillNew.omodel.HWorkShopID = ClsPub.isLong(mainList[0].HWorkShopID);
-                BillNew.omodel.HSupID = ClsPub.isLong(mainList[0].HSupID);
-                BillNew.omodel.HBLFlag = mainList[0].HBLFlag;
-                BillNew.omodel.HMainMaterID = ClsPub.isLong(mainList[0].HMainMaterID);
-                BillNew.omodel.HKeyMaterID = ClsPub.isLong(mainList[0].HKeyMaterID);
-                BillNew.omodel.HOrderProcNO = ClsPub.isStrNull(mainList[0].HOrderProcNO);
-                BillNew.omodel.HEquipMentID = ClsPub.isLong(mainList[0].HEquipMentID);
-                BillNew.omodel.HMateOutBatchNo = ClsPub.isStrNull(mainList[0].HMateOutBatchNo);
-                BillNew.omodel.HProjectNum = ClsPub.isStrNull(mainList[0].HProjectNum);
-                BillNew.omodel.HProdMaterCode = ClsPub.isStrNull(mainList[0].HProdMaterCode);
-                BillNew.omodel.HSeOrderBillNo = ClsPub.isStrNull(mainList[0].HSeOrderBillNo);
-                BillNew.omodel.HCusShortName = ClsPub.isStrNull(mainList[0].HCusShortName);
-                BillNew.omodel.HCusNeedMaterial = ClsPub.isStrNull(mainList[0].HCusNeedMaterial);
-                BillNew.omodel.HPlanSendGoodsDate = ClsPub.isStrNull(mainList[0].HPlanSendGoodsDate);
-                BillNew.omodel.HProdMaterName = ClsPub.isStrNull(mainList[0].HProdMaterName);
-                BillNew.omodel.HCusName = ClsPub.isStrNull(mainList[0].HCusName);
-                BillNew.omodel.HWorkRemark = ClsPub.isStrNull(mainList[0].HWorkRemark);
-                BillNew.omodel.HImportNote = ClsPub.isStrNull(mainList[0].HImportNote);
-                BillNew.omodel.HMaterNumber_A = ClsPub.isStrNull(mainList[0].HMaterNumber_A);
-                BillNew.omodel.HMaterNumber_B = ClsPub.isStrNull(mainList[0].HMaterNumber_B);
-                BillNew.omodel.HMaterNumber_C = ClsPub.isStrNull(mainList[0].HMaterNumber_C);
-                BillNew.omodel.HMaterNumber_D = ClsPub.isStrNull(mainList[0].HMaterNumber_D);
-                BillNew.omodel.HProdType = ClsPub.isStrNull(mainList[0].HProdType);
-                BillNew.omodel.HMaterShortName = ClsPub.isStrNull(mainList[0].HMaterShortName);
-                BillNew.omodel.HMaterIDA = ClsPub.isStrNull(mainList[0].HMaterIDA);
-                BillNew.omodel.HMaterIDB = ClsPub.isStrNull(mainList[0].HMaterIDB);
-                BillNew.omodel.HMaterIDC = ClsPub.isStrNull(mainList[0].HMaterIDC);
-                BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
-                List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
-                BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
-                if (BillNew.omodel.HICMOInterID == 0)
+
+                DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
+                List<Model.ClsSc_ProcessExchangeBillMain> lsmain = new List<Model.ClsSc_ProcessExchangeBillMain>();
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");  //\n
+                lsmain = oListModels.getObjectByJson_Sc_ProcessExchangeBillMain(msg2);
+                foreach (Model.ClsSc_ProcessExchangeBillMain oItem in lsmain)
                 {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "璇烽�夋嫨浠诲姟鍗曪紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                for (int i = 0; i < subList.ToArray().Length; i++)
-                {
-                    if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
+                    UserName = oItem.HMaker;  //鍒跺崟浜�
+                    oItem.HBillType = "3772";
+                    oItem.HBillSubType = "3772";
+                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --鏃ユ湡
+                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                     {
-                        Model.ClsSc_ProcessExchangeBillSub oSub = new Model.ClsSc_ProcessExchangeBillSub();
-                        oSub.HEntryID = i+1;
-                        oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemark);
-                        oSub.HSourceInterID = ClsPub.isLong(mainList[0].HICMOInterID);
-                        oSub.HSourceEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
-                        oSub.HSourceBillType = "85";
-                        oSub.HSourceBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
-                        oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
-                        //oSub.HRelationQty_In = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_In);
-                        //oSub.HRelationQty_Out = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Out);
-                        //oSub.HRelationQty_WWOrder = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_WWOrder);
-                        //oSub.HRelationQty_Bad = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Bad);
-                        oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
-                        oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
-                        oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[i].HEntryCloseDate);
-                        oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
-                        oSub.HQty = DBUtility.ClsPub.isDoule(subList[i].HQty);
-                        if (oSub.HQty <= 0)
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
-                            objJsonResult.data = null;
-                            return objJsonResult;
-                        }
-                        oSub.HProcNo = DBUtility.ClsPub.isLong(subList[i].HProcNo);
-                        if (oSub.HProcNo <= 0)
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佹按鍙蜂笉鑳戒负0鎴栬�呭皬浜�0";
-                            objJsonResult.data = null;
-                            return objJsonResult;
-                        }
-                        oSub.HProcID = DBUtility.ClsPub.isLong(subList[i].HProcID);
-                        oSub.HProcNumber = DBUtility.ClsPub.isStrNull(subList[i].HProcNumber);
-                        oSub.HWorkRemark = DBUtility.ClsPub.isStrNull(subList[i].HWorkRemark);
-                        oSub.HCenterID = DBUtility.ClsPub.isLong(subList[i].HCenterID);
-                        oSub.HDeptID = DBUtility.ClsPub.isLong(subList[i].HDeptID);
-                        oSub.HDeptNumber = DBUtility.ClsPub.isStrNull(subList[i].HDeptNumber);
-                        ////oSub.HGroupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HGroupIDCol].Value);
-                        oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(subList[i].HGroupNumber);
-                        oSub.HWorkerID = DBUtility.ClsPub.isLong(subList[i].HWorkerID);
-                        oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(subList[i].HWorkerNumber);
-                        oSub.HSourceID = DBUtility.ClsPub.isLong(subList[i].HSourceID);
-                        oSub.HTimeUnit = DBUtility.ClsPub.isStrNull(subList[i].HTimeUnit);
-                        oSub.HPlanWorkTimes = DBUtility.ClsPub.isSingle(subList[i].HPlanWorkTimes);
-                        oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(subList[i].HPlanBeginDate);
-                        oSub.HPlanEndDate = DBUtility.ClsPub.isDate(subList[i].HPlanEndDate);
-                        oSub.HRelBeginDate = DBUtility.ClsPub.isDate(subList[i].HRelBeginDate);
-                        oSub.HRelEndDate = DBUtility.ClsPub.isDate(subList[i].HRelEndDate);
-                        oSub.HReadyTime = 0;
-                        oSub.HQueueTime = 0;
-                        oSub.HMoveTime = 0;
-                        oSub.HBeginDayQty = DBUtility.ClsPub.isSingle(subList[i].HBeginDayQty);
-                        oSub.HBeginFixQty = DBUtility.ClsPub.isSingle(subList[i].HBeginFixQty);
-                        oSub.HFixWorkDays = DBUtility.ClsPub.isSingle(subList[i].HFixWorkDays);
-                        oSub.HTrunWorkDays = DBUtility.ClsPub.isSingle(subList[i].HTrunWorkDays);
-                        oSub.HReadyTimes = DBUtility.ClsPub.isSingle(subList[i].HReadyTimes);
-                        oSub.HMyWorkDays = DBUtility.ClsPub.isSingle(subList[i].HMyWorkDays);
-                        oSub.HOutPrice = DBUtility.ClsPub.isSingle(subList[i].HOutPrice);
-                        oSub.HOutMoney = DBUtility.ClsPub.isSingle(subList[i].HOutMoney);
-                        oSub.HLastProc = "鍚�";
-                        oSub.HFstProc = "鍚�";
-                        oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
-                        oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
-                        oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].isEntrust);
-                        oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
-                        oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
-                        if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝宸ヤ綔涓績鎴栧澶栨爣璁颁笉鑳藉悓鏃朵负绌�";
-                            objJsonResult.data = null;
-                            return objJsonResult;
-                        }
-                        oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(subList[i].HICMOBillNo);
-                        oSub.HICMOInterID = DBUtility.ClsPub.isLong(subList[i].HICMOInterID);
-                        oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(subList[i].HSeOrderInterID);
-                        oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HSeOrderEntryID);
-                        oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HSeOrderBillNo);
-                        oSub.HWWOrderInterID = DBUtility.ClsPub.isLong(subList[i].HWWOrderInterID);
-                        oSub.HWWOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HWWOrderEntryID);
-                        oSub.HWWOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HWWOrderBillNo);
-                        oSub.HSumPassRate = DBUtility.ClsPub.isSingle(subList[i].HSumPassRate);
-                        oSub.HPassRate = DBUtility.ClsPub.isSingle(subList[i].HPassRate);
-                        oSub.HOverRate = DBUtility.ClsPub.isDoule(subList[i].HOverRate);
-                        oSub.HMaxQty = DBUtility.ClsPub.isDoule(subList[i].HMaxQty);
-                        oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
-                        oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
-                        oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
-                        oSub.HMouldNo = "";
-                        oSub.HProcWorkNum = "";
-                        BillNew.DetailColl.Add(oSub);
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
                     }
+                    oBill.omodel = oItem;
                 }
-                //淇濆瓨瀹屾瘯鍚庡鐞�
-                //if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
-                //{
-                //    bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
-                //}
-                //else
-                //{
-                //    bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
-                //}
-                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
-                //鎻愮ず
-                if (bResult == true)
+
+                //琛ㄤ綋鏁版嵁
+                //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+                msg3 = msg3.Substring(1, msg3.Length - 2);
+                msg3 = msg3.Replace("\\", "");
+                msg3 = msg3.Replace("\n", "");  //\n
+                //msg2 = msg2.Replace("'", "鈥�");
+                List<Model.ClsSc_ProcessExchangeBillSub> ls = new List<Model.ClsSc_ProcessExchangeBillSub>();
+                ls = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub(msg3);
+                int i = 0;
+                foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls)
                 {
-                    objJsonResult.code = "1";
+
+                    i++;
+                    oItemSub.HEntryID = i;
+                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+                    oBill.DetailColl.Add(oItemSub);
+
+                }
+                //淇濆瓨
+                //淇濆瓨瀹屾瘯鍚庡鐞�
+                bool bResult;
+                if (msg5 == "xz")
+                {
+                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                else
+                {
+                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                if (bResult)
+                {
+                    objJsonResult.code = "0";
                     objJsonResult.count = 1;
-                    //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
-                    objJsonResult.Message = ClsPub.sExeReturnInfo+"鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
-                    objJsonResult.data = null;
+                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                    //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+                    objJsonResult.data = 1;
                     return objJsonResult;
                 }
                 else
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
-                    objJsonResult.data = null;
+                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = 1;
                     return objJsonResult;
                 }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+        }
+
+        //public json AddBillMain(string msg1)
+        //{
+        //    string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+        //    string msg2 = sArray[0].ToString();//琛ㄥご
+        //    string msg3 = sArray[1].ToString();//琛ㄤ綋
+        //    string user = sArray[2].ToString();//鐢ㄦ埛鍚�
+
+        //    //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+        //    if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, user))
+        //    {
+        //        objJsonResult.code = "0";
+        //        objJsonResult.count = 0;
+        //        objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+        //        objJsonResult.data = null;
+        //        return objJsonResult;
+        //    }
+
+        //    bool bResult;
+        //    try
+        //    {
+        //        msg2 = "[" + msg2.ToString() + "]";
+        //        List<Model.ClsSc_ProcessExchangeBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(msg2);
+        //        DAL.ClsSc_ProcessExchangeBill BillNew = new DAL.ClsSc_ProcessExchangeBill();
+        //        //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+        //        string s = "";
+        //        int sYear = 0;
+        //        int sPeriod = 0; 
+        //        DateTime HDate = mainList[0].HDate;//鏃ユ湡
+        //        if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = s;
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //        }
+        //        BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//缁勭粐
+        //        BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+        //        BillNew.omodel.HYear = sYear;
+        //        BillNew.omodel.HPeriod = sPeriod;
+        //        BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+        //        BillNew.omodel.HDate = HDate;
+        //        BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
+        //        BillNew.omodel.HMaker = mainList[0].HMaker;
+        //        BillNew.omodel.HWWOrderInterID = ClsPub.isLong(mainList[0].HWWOrderInterID);
+        //        BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(mainList[0].HWWOrderEntryID);
+        //        BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(mainList[0].HWWOrderBillNo);
+        //        BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+        //        BillNew.omodel.HICMOEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
+        //        BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+        //        BillNew.omodel.HMaterID2 = ClsPub.isLong(mainList[0].HMaterID2);
+        //        BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+        //        BillNew.omodel.HMaterNumber = ClsPub.isStrNull(mainList[0].HMaterNumber);
+        //        BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
+        //        BillNew.omodel.HUnitID = ClsPub.isLong(mainList[0].HUnitID);
+        //        BillNew.omodel.HUnitNumber = ClsPub.isStrNull(mainList[0].HUnitNumber);
+        //        BillNew.omodel.HPlanQty = ClsPub.isDoule(mainList[0].HPlanQty);
+        //        BillNew.omodel.HQty = ClsPub.isDoule(mainList[0].HQty);
+        //        BillNew.omodel.HPlanBeginDate = ClsPub.isDate(mainList[0].HPlanBeginDate);
+        //        BillNew.omodel.HPlanEndDate = ClsPub.isDate(mainList[0].HPlanEndDate);
+        //        BillNew.omodel.HExplanation = ClsPub.isStrNull(mainList[0].HExplanation);
+        //        BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(mainList[0].HInnerBillNo);
+        //        BillNew.omodel.HWorkShopID = ClsPub.isLong(mainList[0].HWorkShopID);
+        //        BillNew.omodel.HSupID = ClsPub.isLong(mainList[0].HSupID);
+        //        BillNew.omodel.HBLFlag = mainList[0].HBLFlag;
+        //        BillNew.omodel.HMainMaterID = ClsPub.isLong(mainList[0].HMainMaterID);
+        //        BillNew.omodel.HKeyMaterID = ClsPub.isLong(mainList[0].HKeyMaterID);
+        //        BillNew.omodel.HOrderProcNO = ClsPub.isStrNull(mainList[0].HOrderProcNO);
+        //        BillNew.omodel.HEquipMentID = ClsPub.isLong(mainList[0].HEquipMentID);
+        //        BillNew.omodel.HMateOutBatchNo = ClsPub.isStrNull(mainList[0].HMateOutBatchNo);
+        //        BillNew.omodel.HProjectNum = ClsPub.isStrNull(mainList[0].HProjectNum);
+        //        BillNew.omodel.HProdMaterCode = ClsPub.isStrNull(mainList[0].HProdMaterCode);
+        //        BillNew.omodel.HSeOrderBillNo = ClsPub.isStrNull(mainList[0].HSeOrderBillNo);
+        //        BillNew.omodel.HCusShortName = ClsPub.isStrNull(mainList[0].HCusShortName);
+        //        BillNew.omodel.HCusNeedMaterial = ClsPub.isStrNull(mainList[0].HCusNeedMaterial);
+        //        BillNew.omodel.HPlanSendGoodsDate = ClsPub.isStrNull(mainList[0].HPlanSendGoodsDate);
+        //        BillNew.omodel.HProdMaterName = ClsPub.isStrNull(mainList[0].HProdMaterName);
+        //        BillNew.omodel.HCusName = ClsPub.isStrNull(mainList[0].HCusName);
+        //        BillNew.omodel.HWorkRemark = ClsPub.isStrNull(mainList[0].HWorkRemark);
+        //        BillNew.omodel.HImportNote = ClsPub.isStrNull(mainList[0].HImportNote);
+        //        BillNew.omodel.HMaterNumber_A = ClsPub.isStrNull(mainList[0].HMaterNumber_A);
+        //        BillNew.omodel.HMaterNumber_B = ClsPub.isStrNull(mainList[0].HMaterNumber_B);
+        //        BillNew.omodel.HMaterNumber_C = ClsPub.isStrNull(mainList[0].HMaterNumber_C);
+        //        BillNew.omodel.HMaterNumber_D = ClsPub.isStrNull(mainList[0].HMaterNumber_D);
+        //        BillNew.omodel.HProdType = ClsPub.isStrNull(mainList[0].HProdType);
+        //        BillNew.omodel.HMaterShortName = ClsPub.isStrNull(mainList[0].HMaterShortName);
+        //        BillNew.omodel.HMaterIDA = ClsPub.isStrNull(mainList[0].HMaterIDA);
+        //        BillNew.omodel.HMaterIDB = ClsPub.isStrNull(mainList[0].HMaterIDB);
+        //        BillNew.omodel.HMaterIDC = ClsPub.isStrNull(mainList[0].HMaterIDC);
+        //        BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
+        //        List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
+        //        BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
+        //        if (BillNew.omodel.HICMOInterID == 0)
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "璇烽�夋嫨浠诲姟鍗曪紒";
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //        }
+        //        for (int i = 0; i < subList.ToArray().Length; i++)
+        //        {
+        //            if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
+        //            {
+        //                Model.ClsSc_ProcessExchangeBillSub oSub = new Model.ClsSc_ProcessExchangeBillSub();
+        //                oSub.HEntryID = i+1;
+        //                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemark);
+        //                oSub.HSourceInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+        //                oSub.HSourceEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
+        //                oSub.HSourceBillType = "85";
+        //                oSub.HSourceBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+        //                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
+        //                //oSub.HRelationQty_In = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_In);
+        //                //oSub.HRelationQty_Out = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Out);
+        //                //oSub.HRelationQty_WWOrder = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_WWOrder);
+        //                //oSub.HRelationQty_Bad = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Bad);
+        //                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
+        //                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
+        //                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[i].HEntryCloseDate);
+        //                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
+        //                oSub.HQty = DBUtility.ClsPub.isDoule(subList[i].HQty);
+        //                if (oSub.HQty <= 0)
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+        //                oSub.HProcNo = DBUtility.ClsPub.isLong(subList[i].HProcNo);
+        //                if (oSub.HProcNo <= 0)
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佹按鍙蜂笉鑳戒负0鎴栬�呭皬浜�0";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+        //                oSub.HProcID = DBUtility.ClsPub.isLong(subList[i].HProcID);
+        //                oSub.HProcNumber = DBUtility.ClsPub.isStrNull(subList[i].HProcNumber);
+        //                oSub.HWorkRemark = DBUtility.ClsPub.isStrNull(subList[i].HWorkRemark);
+        //                oSub.HCenterID = DBUtility.ClsPub.isLong(subList[i].HCenterID);
+        //                oSub.HDeptID = DBUtility.ClsPub.isLong(subList[i].HDeptID);
+        //                oSub.HDeptNumber = DBUtility.ClsPub.isStrNull(subList[i].HDeptNumber);
+        //                ////oSub.HGroupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HGroupIDCol].Value);
+        //                oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(subList[i].HGroupNumber);
+        //                oSub.HWorkerID = DBUtility.ClsPub.isLong(subList[i].HWorkerID);
+        //                oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(subList[i].HWorkerNumber);
+        //                oSub.HSourceID = DBUtility.ClsPub.isLong(subList[i].HSourceID);
+        //                oSub.HTimeUnit = DBUtility.ClsPub.isStrNull(subList[i].HTimeUnit);
+        //                oSub.HPlanWorkTimes = DBUtility.ClsPub.isSingle(subList[i].HPlanWorkTimes);
+        //                oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(subList[i].HPlanBeginDate);
+        //                oSub.HPlanEndDate = DBUtility.ClsPub.isDate(subList[i].HPlanEndDate);
+        //                oSub.HRelBeginDate = DBUtility.ClsPub.isDate(subList[i].HRelBeginDate);
+        //                oSub.HRelEndDate = DBUtility.ClsPub.isDate(subList[i].HRelEndDate);
+        //                oSub.HReadyTime = 0;
+        //                oSub.HQueueTime = 0;
+        //                oSub.HMoveTime = 0;
+        //                oSub.HBeginDayQty = DBUtility.ClsPub.isSingle(subList[i].HBeginDayQty);
+        //                oSub.HBeginFixQty = DBUtility.ClsPub.isSingle(subList[i].HBeginFixQty);
+        //                oSub.HFixWorkDays = DBUtility.ClsPub.isSingle(subList[i].HFixWorkDays);
+        //                oSub.HTrunWorkDays = DBUtility.ClsPub.isSingle(subList[i].HTrunWorkDays);
+        //                oSub.HReadyTimes = DBUtility.ClsPub.isSingle(subList[i].HReadyTimes);
+        //                oSub.HMyWorkDays = DBUtility.ClsPub.isSingle(subList[i].HMyWorkDays);
+        //                oSub.HOutPrice = DBUtility.ClsPub.isSingle(subList[i].HOutPrice);
+        //                oSub.HOutMoney = DBUtility.ClsPub.isSingle(subList[i].HOutMoney);
+        //                oSub.HLastProc = "鍚�";
+        //                oSub.HFstProc = "鍚�";
+        //                oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
+        //                oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
+        //                oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].isEntrust);
+        //                oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
+        //                oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
+        //                if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝宸ヤ綔涓績鎴栧澶栨爣璁颁笉鑳藉悓鏃朵负绌�";
+        //                    objJsonResult.data = null;
+        //                    return objJsonResult;
+        //                }
+        //                oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(subList[i].HICMOBillNo);
+        //                oSub.HICMOInterID = DBUtility.ClsPub.isLong(subList[i].HICMOInterID);
+        //                oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(subList[i].HSeOrderInterID);
+        //                oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HSeOrderEntryID);
+        //                oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HSeOrderBillNo);
+        //                oSub.HWWOrderInterID = DBUtility.ClsPub.isLong(subList[i].HWWOrderInterID);
+        //                oSub.HWWOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HWWOrderEntryID);
+        //                oSub.HWWOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HWWOrderBillNo);
+        //                oSub.HSumPassRate = DBUtility.ClsPub.isSingle(subList[i].HSumPassRate);
+        //                oSub.HPassRate = DBUtility.ClsPub.isSingle(subList[i].HPassRate);
+        //                oSub.HOverRate = DBUtility.ClsPub.isDoule(subList[i].HOverRate);
+        //                oSub.HMaxQty = DBUtility.ClsPub.isDoule(subList[i].HMaxQty);
+        //                oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
+        //                oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
+        //                oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
+        //                oSub.HMouldNo = "";
+        //                oSub.HProcWorkNum = "";
+        //                BillNew.DetailColl.Add(oSub);
+        //            }
+        //        }
+        //        //淇濆瓨瀹屾瘯鍚庡鐞�
+        //        //if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
+        //        //{
+        //        //    bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+        //        //}
+        //        //else
+        //        //{
+        //        //    bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+        //        //}
+        //        bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+        //        //鎻愮ず
+        //        if (bResult == true)
+        //        {
+        //            objJsonResult.code = "1";
+        //            objJsonResult.count = 1;
+        //            //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+        //            objJsonResult.Message = ClsPub.sExeReturnInfo+"鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //        }
+        //        else
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //        }
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        objJsonResult.code = "0";
+        //        objJsonResult.count = 0;
+        //        objJsonResult.Message = "Exception锛�" + e.ToString();
+        //        objJsonResult.data = null;
+        //        return objJsonResult;
+        //    }
+        //}
+        #endregion
+
+
+        #region 宸ュ簭娴佽浆鍗″垪琛ㄦ樉绀哄櫒鍏锋竻鍗曚俊鎭�
+        [Route("Sc_ProcessExchangeBillList/QJQD")]
+        [HttpGet]
+        public object QJQD(Int64 HProcExchHinteID)
+        {
+            try
+            {
+
+                //寰楀埌淇℃伅
+                ds = oCN.RunProcReturn("select  * from h_v_Sc_ProcessExchangeBillQuerySub_Mould  where hmainid= " + HProcExchHinteID , "h_v_Sc_ProcessExchangeBillQuerySub_Mould");
+                //鍐欏叆淇℃伅
+                //if (ds == null || ds.Tables[0].Rows.Count == 0)
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏈煡璇㈠埌鍑虹珯鍗曟槑缁嗕俊鎭紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                List<object> listCol = new List<object>();
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    listCol.Add(JsonConvert.DeserializeObject(str));
+                }
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = listCol;
+                return objJsonResult;
             }
             catch (Exception e)
             {
@@ -260,7 +418,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
+        #region[杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚]
         /// <summary>
         /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
         /// </summary>
@@ -268,7 +428,7 @@
         /// <returns>object</returns>
         [Route("Sc_ProcessExchangeBill/GetICMOBillList")]
         [HttpGet]
-        public object GetICMOBillList(int hmainid,int OrganizationID)
+        public object GetICMOBillList(int hmainid,int HEntryID, int OrganizationID)
         {
             try
             {
@@ -280,7 +440,7 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
+                ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -307,7 +467,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
+        #region[杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚]
         /// <summary>
         /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
         /// </summary>
@@ -315,7 +477,7 @@
         /// <returns>object</returns>
         [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
         [HttpGet]
-        public object GetICMOBillDetail(int hmainid, int OrganizationID)
+        public object GetICMOBillDetail(int hmainid,int HEntryID, int OrganizationID)
         {
             try
             {
@@ -327,7 +489,7 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
+                ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID+ " and HSTOCKINORGID='"+ OrganizationID+"'", "h_v_S_Sc_ICMOBillList");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -354,7 +516,198 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-        //
+        #region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+        /// <summary>
+        /// 缂栬緫鑾峰彇琛ㄥご淇℃伅
+        /// </summary>
+        /// <param name="HInterID">涓籌D</param>
+        /// <returns></returns>
+        [Route("Sc_ProcessExchangeBill/GetProcessExchangeBillMain")]
+        [HttpGet]
+        public ApiResult<DataSet> GetProcessExchangeBillMain(string HInterID)
+        {
+            if (string.IsNullOrEmpty(HInterID))
+                return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillQuery  where hmainid= " + HInterID + " ", "h_v_Sc_ProcessExchangeBillQuery");
+            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+                return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ伐搴忔祦杞崱" };
+            return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+        }
+        #endregion
+
+        #region[缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+        [Route("Sc_ProcessExchangeBill/GetProcessExchangeBillSub")]
+        [HttpGet]
+        public object GetProcessExchangeBillSub(string HInterID)
+        {
+            DataSet ds;
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                string sql = string.Format(@"select 娴佹按鍙� HProcNo,HProcID,宸ュ簭浠g爜 HProcNumber,宸ュ簭鍚嶇О HProcName,鍔犲伐璇存槑 HWorkRemark,HCenterID,宸ヤ綔涓績浠g爜 HCenterNumber,
+                                                宸ヤ綔涓績 HCenterName,HSupID,渚涘簲鍟嗕唬鐮� HSupNumber,渚涘簲鍟� HSupName,isEntrust,璁″垝鏁伴噺 HQty,鍔犲伐鍗曚环 HOutPrice, 琛ㄤ綋澶囨敞 HRemark,
+                                            杩涚珯鍏宠仈鏁伴噺 HRelationQty_In,鍑虹珯鍏宠仈鏁伴噺 HRelationQty_Out,濮斿宸ュ崟鏁伴噺 HRelationQty_WWOrder,涓嶅悎鏍兼暟閲� HRelationQty_Bad,瓒呴姣斾緥 HOverRate,
+                                            鑹巼 HPassRate,绱鑹巼 HSumPassRate,鍥剧焊缂栧彿 HPicNum,鏈伐搴忕‘璁よ褰� HProcCheckNote,宸ヨ壓鍙傛暟 HTechnologyParameter,HDeptID,
+                                            鍔犲伐杞﹂棿浠g爜 HDeptNumber,鍔犲伐杞﹂棿 HDeptName
+                                            from h_v_Sc_ProcessExchangeBillQuerySub");
+                ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID, "h_v_Sc_ProcessExchangeBillQuerySub");
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.data = ds.Tables[0];
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+            }
+            return objJsonResult;
+        }
+        #endregion
+
+        #region [妯″叿淇濆吇璁″垝鍗曞垹闄ゅ姛鑳絔
+        /// <summary>
+        /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID")]
+        [HttpGet]
+        public object DeltetProcessExchangeBillByID(string HInterID,int HPRDORGID, string user)
+        {
+            //缂栬緫鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Drop", 1, false, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+
+            Int64 lngBillKey = 0;
+            lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+            if (lngBillKey == 0)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+
+            //鍒犻櫎鍓嶅垽鏂叧鑱旀暟閲�
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+            DataSet ds;
+            ds = oCn.RunProcReturn("select ct from (  " +
+                          "  select 1 ct from Sc_StationInBillMain Where HProcExchInterID=" + lngBillKey + " " +
+                          "  union all " +
+                          "  select 1 from Sc_StationOutBillMain Where HProcExchInterID=" + lngBillKey + " ) as a  ", "Sc_ProcExchReportSub");
+            if (ds.Tables[0].Rows.Count != 0)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娴佽浆鍗″凡缁忔湁涓嬫父杩涘嚭绔欏崟鍚庯紝涓嶅厑璁稿垹闄わ紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+
+            DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
+            DBUtility.ClsPub.HOrgID = HPRDORGID;
+            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+            {
+                if (oBill.omodel.HBillStatus > 1)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                if (oBill.omodel.HChecker != "")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                if (IsDete)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            else
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region[缂栬緫鏃惰幏鍙栬〃浣撴暟鎹�(宸ヨ壓鍙傛暟)]
+        [Route("Sc_ProcessExchangeBill/GetProcessExchangeBillSubTech")]
+        [HttpGet]
+        public object GetProcessExchangeBillSubTech(string HInterID)
+        {
+            DataSet ds;
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                string sql = string.Format(@"exec h_p_Sc_GetProcessExchangeBillSubTech ");
+                ds = oCN.RunProcReturn(sql +  HInterID, "h_p_Sc_GetProcessExchangeBillSubTech");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.list = columnNameList;
+                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;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1