Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

2024-10-29 956970d74fa97208d0fa873ff1f8ab7ecdc393e4

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -4092,7 +4092,7 @@
                lsmain = oListModels.getObjectByJson_Gy_MouldRepairWorkBillMain(msg2);
                foreach (Model.ClsSb_MouldRepairWorkBillMain oItem in lsmain)
                {
                    //oItem.HMaker = "";
                    oItem.HMaker = msg4;
                    UserName = msg4;  //制单人
                    oItem.HBillType = "3807";
                    oItem.HBillSubType = "3807";
@@ -5162,7 +5162,7 @@
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();

            string msg6 = sArray[4].ToString();

            string UserName = "";
            ListModels oListModels = new ListModels();
@@ -5196,6 +5196,7 @@
                    //oItem.HBillNo = "";
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --日期
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    //oItem.HMakeDate = "";
                    //oItem.HYear = "";
                    //oItem.HPeriod = "";
@@ -5282,6 +5283,32 @@
                    oBill.DetailColl.Add(oItemSub);

                }

                //表体数据
                //按 },{来拆分数组 //去掉【和】
                //如果是编辑就允许保存,否则不允许
                if (oBill.omodel.HInterID != 0)
                {
                    msg6 = msg6.Substring(1, msg6.Length - 2);
                    msg6 = msg6.Replace("\\", "");
                    msg6 = msg6.Replace("\n", "");  
                    List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> lss = new List<Model.ClsSc_MouldMaintainPlanBillSub_Plan>();
                    lss = oListModels.getObjectByJson_Sc_MouldMaintainPlanBillSub_Plan(msg6);
                    int l = 0;
                    foreach (Model.ClsSc_MouldMaintainPlanBillSub_Plan oItem in lss)
                    {

                        l++;
                        oItem.HEntryID = l;
                        oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                        oItem.HCloseType = false;   //关闭类型
                        oItem.HSourceInterID = 0;     // 源单主内码
                        oItem.HSourceEntryID = 0;   //源单子内码
                        oItem.HRelationQty = 0;     //关联数量                  
                        oBill.DetailCol2.Add(oItem);
                    }
                }
                
                //保存
                //保存完毕后处理
                bool bResult;
@@ -5597,7 +5624,7 @@
                foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
                {
                    UserName = oItem.HMaker;  //制单人
                    DBUtility.ClsPub.CurUserName = UserName;
                    DBUtility.ClsPub.CurUserName = msg5;
                    oItem.HBillType = "3819";
                    oItem.HBillSubType = "3819";