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

wtt

2024-11-06 6a9fcf4bfaf1f4eb458d79eb54a0fa988730d6be

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -226,6 +226,12 @@
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为乔一
                    if(oSystemParameter.omodel.WMS_CampanyName == "乔一")
                    {
                        HDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                    }

                    //判断客户不为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配" && oSystemParameter.omodel.WMS_CampanyName != "瑞与祺" && oSystemParameter.omodel.WMS_CampanyName != "添康科技") //系统参数                      
                    {