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

ch

2022-07-08 a51f8f5bd43b4dc86481f04c85842f27f119caea

 WebAPI/Controllers/OtherInStockController.cs

@@ -350,6 +350,7 @@
                websLsmain.HMaker = lsmain[0].HMaker;
                websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
                websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
                websLsmain.HKeeperID = lsmain[0].HKeeperID;
                websLsmain.HBillType = "1203";//固定值

                WebS.WebService1 oWebs = new WebS.WebService1();
@@ -358,7 +359,7 @@
                {            
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成其他入库单成功！单据号为：";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }