合并

ch

2022-01-14 15ed2f3df5a7899f6123ff254b8887dd03958513

 WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs

@@ -1005,7 +1005,7 @@
        #region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
        [Route("Sc_MESBeginStepWorkBill/SaveGetMESProductReportBillList")]
        [HttpGet]
        public object SaveGetMESProductReportBillList(string ScMaxWork, string HSourceBillType, string workcode, int HSourceID, int HICMOInterID, int HICMOEntryID, string HMaker, string Czybm)
        public object SaveGetMESProductReportBillList(string ScMaxWork, string HSourceBillType, string workcode, int HSourceID, int HICMOInterID, int HICMOEntryID, string HMaker, string Czybm,string HProcID)
        {
            ListModels oListModels = new ListModels();
            try
@@ -1074,7 +1074,7 @@
                model.HMainSourceEntryID = HICMOEntryID;

                //oWebs.Timeout = 30000;
                bool flag = oWebs.set_SaveICMOProductReportBill_Layui(model, workcode, HSourceID, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
                bool flag = oWebs.set_SaveICMOProductReportBill_LayuiYqn(model, workcode, HSourceID, sHSourceType, HProcID, ref DBUtility.ClsPub.sErrInfo);
                if (flag)
                {
                    //oCN.Commit();