From d19fcd70a3b11339eb0c50b5c734eeca855a9a95 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 12 二月 2025 14:05:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/Sc_MouldController.cs |  938 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 926 insertions(+), 12 deletions(-)

diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index 81af6ee..4f9248d 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -165,21 +165,21 @@
 
         #endregion
 
-        #region 妯″叿鐢熶骇棰嗙敤鍗�
+        #region 妯″叿鏀瑰埗鍏ュ簱鍗�
 
-        #region 妯″叿鐢熶骇棰嗙敤鍗曚繚瀛�
+        #region 妯″叿鏀瑰埗鍏ュ簱鍗曚繚瀛�
 
-        [Route("Sc_MouldProdOutBill/MouldProdOutBill_Save")]
+        [Route("Sc_MouldRepairInBill/MouldRepairInBill_Save")]
         [HttpPost]
-        public object MouldProdOutAdd([FromBody] JObject sMainSub)
+        public object MouldRepairInBillAdd([FromBody] JObject sMainSub)
         {
             var _value = sMainSub["sMainSub"].ToString();
             string msg1 = _value.ToString();
             //淇濆瓨鍗曟嵁
-            return objJsonResult = MouldProdOutAddBill(msg1);
+            return objJsonResult = MouldRepairInAddBill(msg1);
         }
 
-        public json MouldProdOutAddBill(string msg1)
+        public json MouldRepairInAddBill(string msg1)
         {
             //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             //string msg2 = sArray[0].ToString();
@@ -189,11 +189,11 @@
             {
                 //msg2 = "[" + msg2.ToString() + "]";
                 msg1 = "[" + msg1.ToString() + "]";
-                DAL.ClsSc_MouldProdOutBill BillNew = new DAL.ClsSc_MouldProdOutBill();
-                List<Model.ClsSc_MouldProdOutBillMain> mainList = Newtonsoft
+                DAL.ClsSc_MouldRepairInBill BillNew = new DAL.ClsSc_MouldRepairInBill();
+                List<Model.ClsSc_MouldRepairInBillMain> mainList = Newtonsoft
                     .Json
                     .JsonConvert
-                    .DeserializeObject<List<Model.ClsSc_MouldProdOutBillMain>>(msg1);
+                    .DeserializeObject<List<Model.ClsSc_MouldRepairInBillMain>>(msg1);
                 List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
                     .Json
                     .JsonConvert
@@ -220,7 +220,7 @@
                 BillNew.omodel.HSupID = 0;
                 BillNew.omodel.HSCWHID = 0;
                 BillNew.omodel.HEmpID = 0;
-                BillNew.omodel.HManagerID = 0;
+                BillNew.omodel.HManagerID = mainList[0].HManagerID;
                 BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
                 BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
                 BillNew.omodel.HDeptID = mainList[0].HDeptID;
@@ -281,13 +281,616 @@
                 oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
                 oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
                 BillNew.DetailColl.Add(oSub);
-                bResult = BillNew.AddBill_PDA(ref ClsPub.sExeReturnInfo);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                 //鎻愮ず
                 if (bResult == true)
                 {
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
                     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
+
+        #endregion
+
+
+        #region 妯″叿閲囪喘鍏ュ簱鍗�
+
+        #region 妯″叿閲囪喘鍏ュ簱鍗曚繚瀛�
+
+        [Route("Sc_MouldProdInBill/MouldProdInBill_Save")]
+        [HttpPost]
+        public object MouldProdInBillAdd([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            //淇濆瓨鍗曟嵁
+            return objJsonResult = MouldProdInAddBill(msg1);
+        }
+
+        public json MouldProdInAddBill(string msg1)
+        {
+            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            //string msg2 = sArray[0].ToString();
+            //string msg3 = sArray[0].ToString();
+            bool bResult;
+            try
+            {
+                //msg2 = "[" + msg2.ToString() + "]";
+                msg1 = "[" + msg1.ToString() + "]";
+                DAL.ClsSc_MouldProdInBill BillNew = new DAL.ClsSc_MouldProdInBill();
+                List<Model.ClsSc_MouldProdInBillMain> mainList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSc_MouldProdInBillMain>>(msg1);
+                List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(msg1);
+                //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+                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.HYear = sYear;
+                BillNew.omodel.HPeriod = sPeriod;
+                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+                BillNew.omodel.HMaker = mainList[0].HMaker;
+                BillNew.omodel.HDate = HDate;
+                BillNew.omodel.HWHID = mainList[0].HWHID;
+                BillNew.omodel.HSupID = 0;
+                BillNew.omodel.HSCWHID = 0;
+                BillNew.omodel.HEmpID = 0;
+                BillNew.omodel.HManagerID = mainList[0].HManagerID;
+                BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+                BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+                BillNew.omodel.HDeptID = mainList[0].HDeptID;
+                BillNew.omodel.HExplanation = mainList[0].HExplanation;
+                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+                BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+                BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+                Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+                oSub.HEntryID = 1;
+                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+                oSub.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+                oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+                oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+                oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+                oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+                oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+                oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+                oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+                if (oSub.HQty <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+                if (oSub.HDesignLife < 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+                oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+                oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+                oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+                oSub.HSCWHID = 0;
+                oSub.HSCSPID = 0;
+                oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+                oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+                oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+                oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+                oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+                oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+                oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+                oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+                BillNew.DetailColl.Add(oSub);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+                //鎻愮ず
+                if (bResult == true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    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
+
+        #endregion
+
+
+        #region 妯″叿鏀瑰埗鍑哄簱鍗�
+
+        #region 妯″叿鏀瑰埗鍑哄簱鍗曚繚瀛�
+
+        [Route("Sc_MouldRepairOutBill/MouldRepairOutBill_Save")]
+        [HttpPost]
+        public object MouldRepairOutBillAdd([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            //淇濆瓨鍗曟嵁
+            return objJsonResult = MouldRepairOutAddBill(msg1);
+        }
+
+        public json MouldRepairOutAddBill(string msg1)
+        {
+            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            //string msg2 = sArray[0].ToString();
+            //string msg3 = sArray[0].ToString();
+            bool bResult;
+            try
+            {
+                //msg2 = "[" + msg2.ToString() + "]";
+                msg1 = "[" + msg1.ToString() + "]";
+                DAL.ClsSc_MouldRepairOutBill BillNew = new DAL.ClsSc_MouldRepairOutBill();
+                List<Model.ClsSc_MouldRepairOutBillMain> mainList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSc_MouldRepairOutBillMain>>(msg1);
+                List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(msg1);
+                //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+                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.HYear = sYear;
+                BillNew.omodel.HPeriod = sPeriod;
+                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+                BillNew.omodel.HMaker = mainList[0].HMaker;
+                BillNew.omodel.HDate = HDate;
+                BillNew.omodel.HWHID = mainList[0].HWHID;
+                BillNew.omodel.HSupID = 0;
+                BillNew.omodel.HSCWHID = 0;
+                BillNew.omodel.HEmpID = 0;
+                BillNew.omodel.HManagerID = mainList[0].HManagerID;
+                BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+                BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+                BillNew.omodel.HDeptID = mainList[0].HDeptID;
+                BillNew.omodel.HExplanation = mainList[0].HExplanation;
+                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+                BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+                BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+                Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+                oSub.HEntryID = 1;
+                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+                oSub.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+                oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+                oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+                oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+                oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+                oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+                oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+                oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+                if (oSub.HQty <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+                if (oSub.HDesignLife < 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+                oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+                oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+                oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+                oSub.HSCWHID = 0;
+                oSub.HSCSPID = 0;
+                oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+                oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+                oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+                oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+                oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+                oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+                oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+                oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+                BillNew.DetailColl.Add(oSub);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+                //鎻愮ず
+                if (bResult == true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    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
+
+        #endregion
+
+
+        #region 妯″叿鎶ュ簾鍏ュ簱鍗�
+
+        #region 妯″叿鎶ュ簾鍏ュ簱鍗曚繚瀛�
+
+        [Route("Sc_MouldScrapInBill/MouldScrapInBill_Save")]
+        [HttpPost]
+        public object MouldScrapInBillAdd([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            //淇濆瓨鍗曟嵁
+            return objJsonResult = MouldScrapInAddBill(msg1);
+        }
+
+        public json MouldScrapInAddBill(string msg1)
+        {
+            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            //string msg2 = sArray[0].ToString();
+            //string msg3 = sArray[0].ToString();
+            bool bResult;
+            try
+            {
+                //msg2 = "[" + msg2.ToString() + "]";
+                msg1 = "[" + msg1.ToString() + "]";
+                DAL.ClsSc_MouldScrapInBill BillNew = new DAL.ClsSc_MouldScrapInBill();
+                List<Model.ClsSc_MouldScrapInBillMain> mainList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSc_MouldScrapInBillMain>>(msg1);
+                List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(msg1);
+                //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+                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.HYear = sYear;
+                BillNew.omodel.HPeriod = sPeriod;
+                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+                BillNew.omodel.HMaker = mainList[0].HMaker;
+                BillNew.omodel.HDate = HDate;
+                BillNew.omodel.HWHID = mainList[0].HWHID;
+                BillNew.omodel.HSupID = 0;
+                BillNew.omodel.HSCWHID = 0;
+                BillNew.omodel.HEmpID = 0;
+                BillNew.omodel.HManagerID = mainList[0].HManagerID;
+                BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+                BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+                BillNew.omodel.HDeptID = mainList[0].HDeptID;
+                BillNew.omodel.HExplanation = mainList[0].HExplanation;
+                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+                BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+                BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+                Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+                oSub.HEntryID = 1;
+                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+                oSub.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+                oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+                oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+                oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+                oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+                oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+                oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+                oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+                if (oSub.HQty <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+                if (oSub.HDesignLife < 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+                oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+                oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+                oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+                oSub.HSCWHID = 0;
+                oSub.HSCSPID = 0;
+                oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+                oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+                oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+                oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+                oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+                oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+                oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+                oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+                BillNew.DetailColl.Add(oSub);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+                //鎻愮ず
+                if (bResult == true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    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
+
+        #endregion
+
+
+
+        #region 妯″叿鐢熶骇棰嗙敤鍗�
+
+        #region 妯″叿鐢熶骇棰嗙敤鍗曚繚瀛�
+
+        [Route("Sc_MouldProdOutBill/MouldProdOutBill_Save")]
+        [HttpPost]
+        public object MouldProdOutAdd([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            //淇濆瓨鍗曟嵁
+            return objJsonResult = MouldProdOutAddBill(msg1);
+        }
+
+        public json MouldProdOutAddBill(string msg1)
+        {
+            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            //string msg2 = sArray[0].ToString();
+            //string msg3 = sArray[0].ToString();
+            bool bResult;
+            try
+            {
+                //msg2 = "[" + msg2.ToString() + "]";
+                msg1 = "[" + msg1.ToString() + "]";
+                DAL.ClsSc_MouldProdOutBill BillNew = new DAL.ClsSc_MouldProdOutBill();
+                List<Model.ClsSc_MouldStockBillMain> mainList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(msg1);
+                List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(msg1);
+                //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+                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.HYear = sYear;
+                BillNew.omodel.HPeriod = sPeriod;
+                BillNew.omodel.HInterID = mainList[0].HInterID;
+                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+                BillNew.omodel.HMaker = mainList[0].HMaker;
+                BillNew.omodel.HDate = HDate;
+                BillNew.omodel.HWHID = mainList[0].HWHID;
+                BillNew.omodel.HSupID = 0;
+                BillNew.omodel.HSCWHID = 0;
+                BillNew.omodel.HEmpID = 0;
+                BillNew.omodel.HManagerID = 0;
+                BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+                BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+                BillNew.omodel.HDeptID = mainList[0].HDeptID;
+                BillNew.omodel.HExplanation = mainList[0].HExplanation;
+                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+                BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+                BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+                Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+                
+                oSub.HInterID = mainList[0].HInterID;
+                oSub.HEntryID = 1;
+                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+                oSub.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+                oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+                oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+                oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+                oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+                oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+                oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+                oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+                if (oSub.HQty <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+                if (oSub.HDesignLife < 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+                oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+                oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+                oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+                oSub.HSCWHID = 0;
+                oSub.HSCSPID = 0;
+                oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+                oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+                oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+                oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+                oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+                oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+                oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+                oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+                BillNew.DetailColl.Add(oSub);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+                //鎻愮ず
+                if (bResult == true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HInterID.ToString()+"鍗曟嵁涓籌D:"+ mainList[0].HInterID;
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -432,7 +1035,7 @@
                 oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
                 oSub.HUseLife = DBUtility.ClsPub.isLong(subList[0].HUseLife);
                 BillNew.DetailColl.Add(oSub);
-                bResult = BillNew.AddBill_PDA(ref ClsPub.sExeReturnInfo);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                 //鎻愮ず
                 if (bResult == true)
                 {
@@ -877,6 +1480,317 @@
 
         #endregion
 
+        #region 璁惧淇濆吇璁板綍鍗曚繚瀛�
+
+        [Route("Sb_EquipMaintainBill/EquipMaintainBill_Save")]
+        [HttpPost]
+        public object EquipMaintainBill_Save([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            return objJsonResult = EquipMaintainAddBill(msg1);
+        }
+
+        public json EquipMaintainAddBill(string msg1)
+        {
+            bool bResult;
+            try
+            {
+                msg1 = "[" + msg1.ToString() + "]";
+                DAL.ClsSb_EquipMaintainBill BillNew = new DAL.ClsSb_EquipMaintainBill();
+                List<Model.ClsSb_EquipMaintainBillMain> mainList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSb_EquipMaintainBillMain>>(msg1);
+                List<Model.ClsSb_EquipMaintainBillSub> subList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSb_EquipMaintainBillSub>>(msg1);
+                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.HYear = sYear;
+                BillNew.omodel.HPeriod = sPeriod;
+                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+                BillNew.omodel.HMaker = mainList[0].HMaker;
+                BillNew.omodel.HDate = HDate;
+                BillNew.omodel.HEquipID = mainList[0].HEquipID;
+                BillNew.omodel.HDeptID = mainList[0].HDeptID;
+                BillNew.omodel.HBeginDate = mainList[0].HBeginDate;
+                BillNew.omodel.HEndDate = mainList[0].HEndDate;
+                //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
+                //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
+                //BillNew.omodel.HTimes = mainList[0].HTimes;
+                BillNew.omodel.HExplanation = mainList[0].HExplanation;
+                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+                //BillNew.omodel.HMouldID = mainList[0].HMouldID;
+                //BillNew.omodel.HSupID = mainList[0].HSupID;
+                //BillNew.omodel.HRepairType = mainList[0].HRepairType;
+                //BillNew.omodel.HNewModel = mainList[0].HNewModel;
+                //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
+                //BillNew.omodel.HEquipID = mainList[0].HEquipID;
+                BillNew.DetailColl = new List<Model.ClsSb_EquipMaintainBillSub>();
+                Model.ClsSb_EquipMaintainBillSub oSub = new Model.ClsSb_EquipMaintainBillSub();
+                oSub.HEntryID = 1;
+                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+                oSub.HManagerID = DBUtility.ClsPub.isLong(subList[0].HManagerID);
+                BillNew.DetailColl.Add(oSub);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+                if (bResult == true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    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("Sb_EquipRepairWorkBill/EquipRepairWorkBill_Save")]
+        [HttpPost]
+        public object EquipRepairWorkBill_Save([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            return objJsonResult = EquipRepairWorkAddBill(msg1);
+        }
+
+        public json EquipRepairWorkAddBill(string msg1)
+        {
+            bool bResult;
+            try
+            {
+                msg1 = "[" + msg1.ToString() + "]";
+                DAL.ClsSb_EquipRepairWorkBill BillNew = new DAL.ClsSb_EquipRepairWorkBill();
+                List<Model.ClsSb_EquipRepairWorkBillMain> mainList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillMain>>(msg1);
+                List<Model.ClsSb_EquipRepairWorkBillSub> subList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillSub>>(msg1);
+                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.HYear = sYear;
+                BillNew.omodel.HPeriod = sPeriod;
+                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+                BillNew.omodel.HMaker = mainList[0].HMaker;
+                BillNew.omodel.HDate = HDate;
+                BillNew.omodel.HEquipID = mainList[0].HEquipID;
+                BillNew.omodel.HDeptID = mainList[0].HDeptID;
+                BillNew.omodel.HRepairBeginDate = mainList[0].HRepairBeginDate;
+                BillNew.omodel.HRepairEndDate = mainList[0].HRepairEndDate;
+                //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
+                //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
+                //BillNew.omodel.HTimes = mainList[0].HTimes;
+                BillNew.omodel.HExplanation = mainList[0].HExplanation;
+                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+                //BillNew.omodel.HMouldID = mainList[0].HMouldID;
+                //BillNew.omodel.HSupID = mainList[0].HSupID;
+                //BillNew.omodel.HRepairType = mainList[0].HRepairType;
+                //BillNew.omodel.HNewModel = mainList[0].HNewModel;
+                //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
+                //BillNew.omodel.HEquipID = mainList[0].HEquipID;
+                BillNew.DetailColl = new List<Model.ClsSb_EquipRepairWorkBillSub>();
+                Model.ClsSb_EquipRepairWorkBillSub oSub = new Model.ClsSb_EquipRepairWorkBillSub();
+                oSub.HEntryID = 1;
+                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+                oSub.HRepairID = mainList[0].HRepairID;
+                BillNew.DetailColl.Add(oSub);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+                if (bResult == true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    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("Sb_EquipDotCheckBill/EquipDotCheckBill_Save")]
+        [HttpPost]
+        public object EquipDotCheckBill_Save([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            return objJsonResult = EquipDotCheckAddBill(msg1);
+        }
+
+        public json EquipDotCheckAddBill(string msg1)
+        {
+            bool bResult;
+            try
+            {
+                msg1 = "[" + msg1.ToString() + "]";
+                DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill();
+                List<Model.ClsSb_EquipDotCheckBillMain> mainList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSb_EquipDotCheckBillMain>>(msg1);
+                List<Model.ClsSb_EquipDotCheckBillSub> subList = Newtonsoft
+                    .Json
+                    .JsonConvert
+                    .DeserializeObject<List<Model.ClsSb_EquipDotCheckBillSub>>(msg1);
+                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.HYear = sYear;
+                BillNew.omodel.HPeriod = sPeriod;
+                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+                BillNew.omodel.HMaker = mainList[0].HMaker;
+                BillNew.omodel.HDate = HDate;
+                BillNew.omodel.HEquipID = mainList[0].HEquipID;
+                BillNew.omodel.HDeptID = mainList[0].HDeptID;
+                BillNew.omodel.HBeginDate = mainList[0].HBeginDate;
+                BillNew.omodel.HEndDate = mainList[0].HEndDate;
+                //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
+                //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
+                //BillNew.omodel.HTimes = mainList[0].HTimes;
+                BillNew.omodel.HExplanation = mainList[0].HExplanation;
+                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+                //BillNew.omodel.HMouldID = mainList[0].HMouldID;
+                //BillNew.omodel.HSupID = mainList[0].HSupID;
+                //BillNew.omodel.HRepairType = mainList[0].HRepairType;
+                //BillNew.omodel.HNewModel = mainList[0].HNewModel;
+                //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
+                //BillNew.omodel.HEquipID = mainList[0].HEquipID;
+                BillNew.DetailColl = new List<Model.ClsSb_EquipDotCheckBillSub>();
+                Model.ClsSb_EquipDotCheckBillSub oSub = new Model.ClsSb_EquipDotCheckBillSub();
+                oSub.HEntryID = 1;
+                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+                BillNew.DetailColl.Add(oSub);
+                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+                if (bResult == true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    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
+
         #endregion
 
         #region 妯″叿瀵垮懡璋冩暣鍗�

--
Gitblit v1.9.1