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

yusijie

2023-04-23 9d5ef8f02e1ff15d7b46a86ad699dd6cab800d3e

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -176,14 +176,14 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HEmpID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作员没有选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (HEmpID == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "操作员没有选择！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (HQCCheckID == 0)
                //{
                //    objJsonResult.code = "0";
@@ -192,14 +192,25 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (HSourceID == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "生产资源没有选择！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户
                    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";