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

yangle

2024-09-25 0f2bdefca1bcfada65aafe33234e5e4d69522ce7

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -4032,7 +4032,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";
@@ -5136,6 +5136,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 = "";
@@ -5537,7 +5538,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";