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

YL

2021-12-21 bc6ac881fd5cb8cd71f27b28394977d1e200da3e

 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";
@@ -465,6 +469,7 @@
            //string sSourceBillType = lsmain[0].HBillType;
            //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
            //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
            
            try
            {
                List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
@@ -485,6 +490,8 @@
                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))
                {