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

wtt

2024-11-28 957b51cfdeb4374d817086a2ca761c75545e206d

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -159,7 +159,7 @@
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "乔一") //系统参数  判断客户
                    if (oSystemParameter.omodel.WMS_CampanyName == "乔一" || oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔") //系统参数  判断客户
                    {
                        //判断生产资源
                        if (HSourceID <= 0)