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

yusijie

2023-06-29 efa57c53b1b4c94e188a52f5a35d0a4ca8a82cb5

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -136,6 +136,23 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "乔一") //系统参数  判断客户
                    {
                        //判断生产资源
                        if (HSourceID <= 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "生产资源没有选择！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                if (HCenterID <= 0)
                {
                    objJsonResult.code = "0";
@@ -305,7 +322,7 @@

                }
                oCN.Commit();
                string sReturn = "";
               
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.MES_StationInBill_SaveAutoAddnew == "Y") //系统参数  自动审核