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

yusijie

2023-03-17 e0a8f74603658d4d9dcb581da75aa38d3834ea77

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -2802,12 +2802,23 @@
                        omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    //===============出站单
                    //出站数量不能大于本道进站汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
                    {
                        omodel.MES_StationOutBill_QtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站数量(合格数量或总数量)汇总不能大于上道合格汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyPreQtyCtl")
                    {
                        omodel.MES_StationOutBill_QtyPreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站数量(合格数量或总数量)汇总不能大于下道合格汇总数 
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyNextQtyCtl")
                    {
                        omodel.MES_StationOutBill_QtyNextQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出战单判断本道工序是否做首件检验 
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_FirstCheckOut")
                    {