From 29bf4ed5663d0f2b8cbf170d919bd3f5bf5c1e14 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 22 九月 2021 17:39:06 +0800
Subject: [PATCH] 器具编辑改制入库页面(保存修改)

---
 WebAPI/DLL/ClsSc_MouldRepairInBill.cs                           |  186 ++++++++++++++++++
 WebAPI/ListModels.cs                                            |   23 ++
 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user     |  192 +++++++++---------
 WebAPI/Models/ClsSc_MouldRepairInBillMain.cs                    |   23 ++
 WebAPI/Models/ClsSc_MouldRepairInBillSub.cs                     |   31 +++
 WebAPI/WebAPI.csproj                                            |    3 
 WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs |  104 +++++++---
 7 files changed, 432 insertions(+), 130 deletions(-)

diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index 4e87e69..07abf99 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -21,6 +21,8 @@
         public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill();   //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
         public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill();   //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
 
+        public DLL.ClsSc_MouldRepairInBill BillNew01 = new DLL.ClsSc_MouldRepairInBill();   //妯″叿鏀瑰埗鍏ュ簱瀵瑰簲鍗曟嵁绫�
+        public DLL.ClsSc_MouldRepairInBill BillOld01 = new DLL.ClsSc_MouldRepairInBill();   //妯″叿鏀瑰埗鍏ュ簱瀵瑰簲鍗曟嵁绫�
 
         /// <summary>
         /// 鏍规嵁鍖呰鍗� 杩斿洖姝ゅ寘瑁呭崟鍐呯殑鐩稿叧淇℃伅
@@ -4250,23 +4252,6 @@
 
         #endregion
 
-        #region[鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
-        [Route("Sc_MouldRepairInBill/Sc_MouldRepairInBillListCheckDetail")]
-        [HttpGet]
-        public ApiResult<DataSet> Sc_MouldRepairInBillListCheckDetail(string HID)
-        {
-            if (string.IsNullOrEmpty(HID))
-                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_MouldRepairInBillList  where hmainid= " + HID + " ", "h_v_Sc_MouldRepairInBillList");
-            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_MouldRepairInBill/Sc_MouldRepairInBillListCheckDetai")]
         [HttpGet]
@@ -4278,9 +4263,10 @@
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (sqlWhere == null || sqlWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID 妯″叿浠g爜,璁捐瀵垮懡,鍓╀綑瀵垮懡,绱Н浣跨敤瀵垮懡,HWHID 浠撳簱,
-                                                  HSPID 浠撲綅浠g爜,妯″叿鏂拌鏍�,鏈�鍚庣敓浜т骇鍝�,閫�搴撶被鍨�,
-                                                  琛ㄥご澶囨敞  FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");
+                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠g爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
+                                          鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
+                                          瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠g爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark 
+                                          FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");
 
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
@@ -4291,9 +4277,10 @@
                 {
 
                     //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark  from Sc_MouldRepairCheckBillSub where 1 = 1 ";
-                    string sql1 = string.Format(@"SELECT HMaterID 妯″叿浠g爜,璁捐瀵垮懡,鍓╀綑瀵垮懡,绱Н浣跨敤瀵垮懡,HWHID 浠撳簱,
-                                                  HSPID 浠撲綅浠g爜,妯″叿鏂拌鏍�,鏈�鍚庣敓浜т骇鍝�,閫�搴撶被鍨�,
-                                                  琛ㄥご澶囨敞  FROM h_v_Sc_MouldRepairInBillList where 1 = 1 ");
+                    string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠g爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
+                                          鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
+                                          瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠g爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark 
+                                          FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
                     string sql = sql1 + sqlWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
 
@@ -4329,23 +4316,72 @@
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
             string msg3 = sArray[1].ToString();
-
+            string refSav = sArray[2].ToString();
 
             string UserName = "";
+            string s = "";
             ListModels oListModels = new ListModels();
             try
             {
-                DLL.ClsSc_MouldProdBackBill oBill = new DLL.ClsSc_MouldProdBackBill();
-                List<Model.ClsSc_MouldProdBackBillMain> lsmain = new List<Model.ClsSc_MouldProdBackBillMain>();
+                DLL.ClsSc_MouldRepairInBill oBill = new DLL.ClsSc_MouldRepairInBill();
+                List<Models.ClsSc_MouldRepairInBillMain> lsmain = new List<Models.ClsSc_MouldRepairInBillMain>();
                 msg2 = msg2.Replace("\\", "");
                 msg2 = msg2.Replace("\n", "");  //\n
-                lsmain = oListModels.getObjectByJson_Gy_MouldProdBackBillMain(msg2);
-                foreach (Model.ClsSc_MouldProdBackBillMain oItem in lsmain)
+                lsmain = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillMain(msg2);
+                foreach (Models.ClsSc_MouldRepairInBillMain oItem in lsmain)
                 {
+                    if (refSav == "Add")
+                    {
+                        //鍗曟嵁鍙锋槸鍚﹂噸澶�
+                        if (BillNew01.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                    }
+                    if (refSav == "Update")
+                    {
+                        if (BillOld01.ShowBill(oItem.HInterID, ref s) == false)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                        //鍒ゆ柇鏄惁鍙紪杈�
+                        if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                        if (BillOld0.omodel.HBillStatus > 1)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                        if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                    }
                     //oItem.HMaker = "";
                     UserName = oItem.HMaker;  //鍒跺崟浜�
-                    oItem.HBillType = "3803";
-                    oItem.HBillSubType = "3803";
+                    oItem.HBillType = "3826";
+                    oItem.HBillSubType = "3826";
                     //oItem.HBillNo = "";    //鍗曟嵁鍙�
                     //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --鏃ユ湡
                     //oItem.HInnerBillNo = "";  //  --鍐呴儴鍗曟嵁鍙�
@@ -4380,10 +4416,10 @@
                 msg3 = msg3.Replace("\\", "");
                 msg3 = msg3.Replace("\n", "");  //\n
                 //msg2 = msg2.Replace("'", "鈥�");
-                List<Model.ClsSc_MouldProdBackBillSub> ls = new List<Model.ClsSc_MouldProdBackBillSub>();
-                ls = oListModels.getObjectByJson_Gy_MouldProdBackBillSub(msg3);
+                List<Models.ClsSc_MouldRepairInBillSub> ls = new List<Models.ClsSc_MouldRepairInBillSub>();
+                ls = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillSub(msg3);
                 int i = 0;
-                foreach (Model.ClsSc_MouldProdBackBillSub oItemSub in ls)
+                foreach (Models.ClsSc_MouldRepairInBillSub oItemSub in ls)
                 {
 
                     i++;
@@ -4538,7 +4574,7 @@
                 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_MouldProdInHouseBillList  where hmainid= " + HID + " ", "h_v_Sc_MouldProdInHouseBillList");
+            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldRepairInBillList  where hmainid= " + HID + " ", "h_v_Sc_MouldRepairInBillList");
             if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                 return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
 
diff --git a/WebAPI/DLL/ClsSc_MouldRepairInBill.cs b/WebAPI/DLL/ClsSc_MouldRepairInBill.cs
new file mode 100644
index 0000000..45b645d
--- /dev/null
+++ b/WebAPI/DLL/ClsSc_MouldRepairInBill.cs
@@ -0,0 +1,186 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+    public class ClsSc_MouldRepairInBill : DBUtility.ClsXt_BaseBill
+    {
+        public Models.ClsSc_MouldRepairInBillMain omodel = new Models.ClsSc_MouldRepairInBillMain();
+        public List<Models.ClsSc_MouldRepairInBillSub> DetailColl = new List<Models.ClsSc_MouldRepairInBillSub>();
+        public ClsSc_MouldRepairInBill()
+        {
+            base.MvarItemKeySub = "Sc_MouldStockBillSub";
+            base.MvarItemKeySub2 = "";
+            base.MvarItemKeySub3 = "";
+            base.MvarItemKeySub4 = "";
+            base.MvarItemKey = "Sc_MouldStockBillMain";
+            base.MvarReportTitle = "妯″叿閲囪喘鍏ュ簱鍗�";
+            base.BillType = "3826";
+            base.HBillSubType = "3826";
+        }
+
+        #region 鍥哄畾浠g爜
+
+        ~ClsSc_MouldRepairInBill()
+        {
+            DetailColl = null;
+        }
+
+        #endregion   鑷畾涔夋柟娉�
+
+
+        //鏂板鍗曟嵁
+        public override bool AddBill(ref string sReturn)
+        {
+            try
+            {
+                //寰楀埌mainid
+                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+                //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+                oCn.BeginTran();
+                //涓昏〃
+                oCn.RunProc("Insert Into Sc_MouldStockBillMain   " +
+                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+                ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+                ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+                ") " +
+                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+                ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
+                ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+
+                ") ");
+                //鎻掑叆瀛愯〃
+                foreach (Models.ClsSc_MouldRepairInBillSub oSub in DetailColl)
+                {
+
+                    oCn.RunProc("Insert into Sc_MouldStockBillSub " +
+                          " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+                          ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+                          ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+                          ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
+                          ",HDesignLife,HLeaveLife,HUseLife" +
+                          ",HSCSPID,HSPGroupID,HBatchNo" +
+                          ") values("
+                          + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+                          "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                          "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
+                          "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
+                          "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
+                          "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+                          ") ");
+                }
+                DataSet Ds;
+                foreach (Models.ClsSc_MouldRepairInBillSub oSub in DetailColl)
+                {
+                    Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl");
+                    if (Ds.Tables[0].Rows.Count == 0)
+                    {
+                        oCn.RollBack();
+                        return false;
+                    }
+                    if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][0]) == "N")
+                    {
+                        sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][1]) + ", 涓嶅厑璁镐繚瀛橈紒";
+                        oCn.RollBack();
+                        return false;
+                    }
+                }
+                sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+
+        //淇敼鍗曟嵁
+        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+        {
+            try
+            {
+                //
+                oCn.BeginTran();
+                //鏇存柊涓昏〃
+                oCn.RunProc("UpDate Sc_MouldStockBillMain set  " +
+                " HBillNo='" + omodel.HBillNo + "'" +  //鍥哄畾璧嬪��===============
+                ",HDate='" + omodel.HDate + "'" +
+                ",HYear='" + omodel.HYear.ToString() + "'" +
+                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+                ",HRemark='" + omodel.HRemark + "'" +
+                ",HUpDater='" + omodel.HMaker + "'" +
+                ",HUpDateDate=getdate()" +
+                //========================================
+                ",HSupID=" + omodel.HSupID.ToString() +
+                ",HWHID=" + omodel.HWHID.ToString() +
+                ",HSCWHID=" + omodel.HSCWHID.ToString() +
+                ",HEmpID=" + omodel.HEmpID.ToString() +
+                ",HManagerID=" + omodel.HManagerID.ToString() +
+                ",HSecManagerID=" + omodel.HSecManagerID.ToString() +
+                ",HKeeperID=" + omodel.HKeeperID.ToString() +
+                ",HDeptID=" + omodel.HDeptID.ToString() +
+                ",HExplanation='" + omodel.HExplanation + "'" +
+                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+
+                " where HInterID=" + lngBillKey.ToString());
+                //鍒犻櫎鍏宠仈
+                DeleteRelation(ref sReturn, lngBillKey);
+                //鍒犻櫎瀛愯〃
+                DeleteBillSub(lngBillKey);
+                //鎻掑叆瀛愯〃
+                omodel.HInterID = lngBillKey;
+                foreach (Models.ClsSc_MouldRepairInBillSub oSub in DetailColl)
+                {
+                    oCn.RunProc("Insert into Sc_MouldStockBillSub " +
+                        " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+                        ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+                        ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+                        ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
+                        ",HDesignLife,HLeaveLife,HUseLife" +
+                        ",HSCSPID,HSPGroupID,HBatchNo" +
+                        ") values("
+                        + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+                        "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                        "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
+                        "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
+                        "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
+                        "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+                        ") ");
+                }
+                DataSet Ds;
+                foreach (Models.ClsSc_MouldRepairInBillSub oSub in DetailColl)
+                {
+                    Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl");
+                    if (Ds.Tables[0].Rows.Count == 0)
+                    {
+                        oCn.RollBack();
+                        return false;
+                    }
+                    if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][0]) == "N")
+                    {
+                        sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][1]) + ", 涓嶅厑璁镐繚瀛橈紒";
+                        oCn.RollBack();
+                        return false;
+                    }
+                }
+                sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 2b97fe3..6bfefbb 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -847,6 +847,29 @@
             return list;
         }
 
+        /// <summary>
+        /// 澶勭悊鏂板妯″叿鏀瑰埗鍏ュ簱鍗曚富琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSc_MouldRepairInBillMain> getObjectByJson_Gy_MouldRepairInHouseBillMain(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSc_MouldRepairInBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldRepairInBillMain>>(jsonString);
+            return list;
+        }
+        /// <summary>
+        /// 澶勭悊鏂板妯″叿鏀瑰埗鍏ュ簱鍗曞瓙琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsSc_MouldRepairInBillSub> getObjectByJson_Gy_MouldRepairInHouseBillSub(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsSc_MouldRepairInBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldRepairInBillSub>>(jsonString);
+            return list;
+        }
+
         ///璁惧鐐规璁板綍琛� 涓昏〃
         ///ClsSb_EquipDotCheckBillMain
         public List<Model.ClsSb_EquipDotCheckBillMain> getObjectByJson_Sb_EquipDotCheckBillMain(string jsonString)
diff --git a/WebAPI/Models/ClsSc_MouldRepairInBillMain.cs b/WebAPI/Models/ClsSc_MouldRepairInBillMain.cs
new file mode 100644
index 0000000..6f3669f
--- /dev/null
+++ b/WebAPI/Models/ClsSc_MouldRepairInBillMain.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class ClsSc_MouldRepairInBillMain : DBUtility.ClsXt_BaseBillMain
+    {
+        public long HSCWHID;//      int       --璋冨嚭浠撳簱ID          鐣岄潰涓婁笉闇�瑕佹樉绀猴紝瀛�0杩涘幓
+        public long HSupID;//       int    --寰�鏉ュ崟浣�         	鐣岄潰涓婁笉闇�瑕佹樉绀猴紝瀛�0杩涘幓
+        public long HEmpID;//      int      --涓氬姟鍛�			鐣岄潰涓婁笉闇�瑕佹樉绀猴紝瀛�0杩涘幓
+        public long HManagerID;//     int   --璐熻矗浜�            	鐣岄潰涓婁笉闇�瑕佹樉绀猴紝瀛�0杩涘幓
+        public long HWHID;//        int     --浠撳簱
+        public long HSecManagerID;//  int   --楠屾敹鍛�
+        public long HKeeperID;//    int    --淇濈鍛�
+        public long HDeptID;//      int    --閮ㄩ棬
+        public string HExplanation;//  varchar(500)     --鎽樿 
+        public string HInnerBillNo;//  varchar(50)     --鍐呴儴鍗曟嵁鍙�
+        public bool HRedBlueFlag;//  bit    --绾㈣摑鍗�
+        public string HRepairType;
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_MouldRepairInBillSub.cs b/WebAPI/Models/ClsSc_MouldRepairInBillSub.cs
new file mode 100644
index 0000000..7a95c3f
--- /dev/null
+++ b/WebAPI/Models/ClsSc_MouldRepairInBillSub.cs
@@ -0,0 +1,31 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class ClsSc_MouldRepairInBillSub : DBUtility.ClsXt_BaseBillSub
+    {
+        public Int64 HMaterID;//     int   			--鐗╂枡ID
+        public Int64 HPropertyID;//  int    			--杈呭姪灞炴��
+        public Int64 HSecUnitID;//   int    			--杈呭姪璁¢噺鍗曚綅
+        public Single HSecUnitRate;//   	money			--鎹㈢畻鐜� 	
+        public Int64 HUnitID;//    int      			--璁¢噺鍗曚綅
+        public string HBatchNo;//	varchar(50)		--鎵规
+        public double HQtyMust;//            --搴旀敹鏁伴噺   
+        public double HQty;//                --瀹炴敹鏁伴噺
+        public double HPrice;//              --鍗曚环
+        public double HMoney;//              --鐩堜簭閲戦
+        public double HDesignLife;//	 money		--璁捐瀵垮懡
+        public double HLeaveLife;//	money		--鍓╀綑瀵垮懡
+        public double HUseLife;//	money	--浣跨敤瀵垮懡
+        public long HWHID;//       int       --鏀舵枡浠撳簱
+        public long HSCWHID;//     int        --璋冨嚭浠撳簱ID          鐣岄潰涓婁笉闇�瑕佹樉绀猴紝瀛�0杩涘幓
+        public long HSPID;//		int	--浠撲綅ID		 
+        public long HSCSPID;//		int 	--璋冨嚭浠撲綅ID		 鐣岄潰涓婁笉闇�瑕佹樉绀猴紝瀛�0杩涘幓
+        public long HSPGroupID;//	int	--浠撲綅缁処D		鐣岄潰涓婁笉闇�瑕佹樉绀猴紝瀛�0杩涘幓 
+
+
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index bb80a4f..38b3e4e 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,40 +9,40 @@
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
-      <publishTime>02/22/2013 16:43:40</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.pdb">
-      <publishTime>02/22/2013 16:43:40</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>09/17/2021 11:22:24</publishTime>
+      <publishTime>09/22/2021 14:49:05</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>09/17/2021 11:22:24</publishTime>
+      <publishTime>09/22/2021 14:49:05</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>09/17/2021 11:22:23</publishTime>
+      <publishTime>09/22/2021 14:49:03</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>09/17/2021 11:22:23</publishTime>
+      <publishTime>09/22/2021 14:49:03</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
-      <publishTime>07/22/2016 22:52:40</publishTime>
+      <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>09/17/2021 11:22:22</publishTime>
+      <publishTime>09/22/2021 14:48:58</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>09/17/2021 11:22:22</publishTime>
+      <publishTime>09/22/2021 14:48:58</publishTime>
     </File>
     <File Include="bin/Interop.gregn6Lib.dll">
       <publishTime>08/25/2021 10:28:25</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/25/2021 20:46:09</publishTime>
+      <publishTime>08/16/2021 17:23:13</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
       <publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
       <publishTime>09/20/2018 19:28:34</publishTime>
     </File>
     <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
-      <publishTime>03/19/2015 01:02:50</publishTime>
+      <publishTime>03/18/2015 17:02:50</publishTime>
     </File>
     <File Include="bin/Microsoft.CSharp.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/Microsoft.Web.Infrastructure.dll">
-      <publishTime>07/25/2012 19:48:56</publishTime>
+      <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>09/17/2021 11:22:22</publishTime>
+      <publishTime>09/22/2021 14:48:59</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>09/17/2021 11:22:22</publishTime>
+      <publishTime>09/22/2021 14:48:59</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
-      <publishTime>08/04/2014 04:33:56</publishTime>
+      <publishTime>08/03/2014 20:33:56</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>09/17/2021 11:22:20</publishTime>
+      <publishTime>09/22/2021 14:48:57</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>09/17/2021 11:22:20</publishTime>
+      <publishTime>09/22/2021 14:48:57</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>09/17/2021 11:22:21</publishTime>
+      <publishTime>09/22/2021 14:48:57</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>09/17/2021 11:22:21</publishTime>
+      <publishTime>09/22/2021 14:48:57</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>09/17/2021 11:22:21</publishTime>
+      <publishTime>09/22/2021 14:48:57</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>09/17/2021 11:22:21</publishTime>
+      <publishTime>09/22/2021 14:48:57</publishTime>
     </File>
     <File Include="bin/stdole.dll">
       <publishTime>05/09/2021 13:35:37</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
-      <publishTime>02/16/2015 01:57:08</publishTime>
+      <publishTime>02/15/2015 17:57:08</publishTime>
     </File>
     <File Include="bin/System.ComponentModel.DataAnnotations.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
-      <publishTime>08/19/2014 18:03:34</publishTime>
+      <publishTime>08/19/2014 10:03:34</publishTime>
     </File>
     <File Include="bin/System.Net.Http.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
-      <publishTime>11/28/2018 21:00:36</publishTime>
+      <publishTime>11/28/2018 13:00:36</publishTime>
     </File>
     <File Include="bin/System.Runtime.Serialization.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
-      <publishTime>11/28/2018 20:58:44</publishTime>
+      <publishTime>11/28/2018 12:58:44</publishTime>
     </File>
     <File Include="bin/System.Web.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Helpers.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.Http.Cors.dll">
-      <publishTime>11/28/2018 21:01:26</publishTime>
+      <publishTime>11/28/2018 13:01:26</publishTime>
     </File>
     <File Include="bin/System.Web.Http.dll">
-      <publishTime>11/28/2018 21:01:00</publishTime>
+      <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
-      <publishTime>01/28/2015 12:02:18</publishTime>
+      <publishTime>01/28/2015 04:02:18</publishTime>
     </File>
     <File Include="bin/System.Web.Optimization.dll">
-      <publishTime>02/11/2014 23:26:04</publishTime>
+      <publishTime>02/11/2014 15:26:04</publishTime>
     </File>
     <File Include="bin/System.Web.Razor.dll">
-      <publishTime>01/28/2015 12:02:32</publishTime>
+      <publishTime>01/28/2015 04:02:32</publishTime>
     </File>
     <File Include="bin/System.Web.Services.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Deployment.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Razor.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Xml.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
-      <publishTime>11/24/2014 19:18:48</publishTime>
+      <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>09/17/2021 11:22:26</publishTime>
+      <publishTime>09/22/2021 14:49:08</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>09/17/2021 11:22:26</publishTime>
+      <publishTime>09/22/2021 14:49:08</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
-      <publishTime>07/18/2013 01:03:52</publishTime>
+      <publishTime>07/17/2013 17:03:52</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
-      <publishTime>11/29/2018 21:26:02</publishTime>
+      <publishTime>11/29/2018 13:26:02</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
-      <publishTime>11/29/2018 21:26:30</publishTime>
+      <publishTime>11/29/2018 13:26:30</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.map">
       <publishTime>08/06/2021 22:57:28</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>09/17/2021 11:22:34</publishTime>
+      <publishTime>09/22/2021 15:18:50</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 41d8e30..83c934d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -388,6 +388,7 @@
     <Compile Include="DLL\ClsSc_MouldProdInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldProdOutBill.cs" />
     <Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" />
+    <Compile Include="DLL\ClsSc_MouldRepairInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldScrapInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldScrapOutBill.cs" />
     <Compile Include="DLL\ClsSc_ProcessReport.cs" />
@@ -407,6 +408,8 @@
     <Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
     <Compile Include="Models\ClsSc_MouldProdBillMain.cs" />
     <Compile Include="Models\ClsSc_MouldProdBillSub.cs" />
+    <Compile Include="Models\ClsSc_MouldRepairInBillMain.cs" />
+    <Compile Include="Models\ClsSc_MouldRepairInBillSub.cs" />
     <Compile Include="Models\Xt_ORGANIZATIONS.cs" />
     <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
     <Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />

--
Gitblit v1.9.1