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

jingh

2021-09-13 fcc6bf3f4e0d50b0c7a6e66c8c4abe672d8be495

 WebAPI/Controllers/ProductInController.cs

@@ -219,6 +219,10 @@
                {
                    ds = webserver.GetSc_ICMOBillList(sWhere + "  ");
                }
                if (HSourceBillType == "3711")
                {
                    ds = webserver.GetSc_ICMOReportBillList(sWhere + "  ");
                }
                else
                {
                    objJsonResult.code = "0";
@@ -483,6 +487,10 @@
                websLsmain.HEmpID = lsmain[0].HEmpID;
                websLsmain.HRemark = lsmain[0].HRemark;
                websLsmain.HMaker = lsmain[0].HMaker;
                websLsmain.HWHID = lsmain[0].HWHID;
                websLsmain.HSupID = lsmain[0].HSupID;
                websLsmain.HExplanation = lsmain[0].HExplanation;


                if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
                {