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

wtt

2024-10-31 8a829f00d0582a32c7bef960cab5c6fd855c5ea5

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1732,6 +1732,11 @@
                    {
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工艺路线是否启用多级审批，启用多级审批要求普通审批不启用
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_EnableMultiLevel")
                    {
                        omodel.Gy_RoutingBill_EnableMultiLevel = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=======JIT

@@ -1820,7 +1825,12 @@
                    {
                        omodel.MES_StationOutBill_MustBeginWorkCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========出站汇报单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_AutoCheck")
                    {
                        omodel.MES_StationOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========设备工艺参数点检                   
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_MustBeginWorkCtl")
                    {
@@ -1955,6 +1965,61 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_StockInRequestBill_AutoCheck")
                    {
                        omodel.Kf_StockInRequestBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========采购订单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POOrderBill_AutoCheck")
                    {
                        omodel.Cg_POOrderBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========应付单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_PayableBill_AutoCheck")
                    {
                        omodel.Cg_PayableBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========付款单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "YF_PayMentBill_AutoCheck")
                    {
                        omodel.YF_PayMentBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========销售订单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_SeOrderBill_AutoCheck")
                    {
                        omodel.Xs_SeOrderBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========发货通知单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_SeOutStockBill_AutoCheck")
                    {
                        omodel.Xs_SeOutStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========应收单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_ReceivableBill_AutoCheck")
                    {
                        omodel.Xs_ReceivableBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========收款单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "YS_ReceiveBill_AutoCheck")
                    {
                        omodel.YS_ReceiveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========考勤汇报单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Pay_WorkTimesBill_AutoCheck")
                    {
                        omodel.Pay_WorkTimesBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    ////=========工序进站单
@@ -3699,7 +3764,14 @@
                        omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    


                    //工资系统参数
                    //==============================考勤汇报单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Pay_WorkTimesBill_AutoCheck")
                    {
                        omodel.Pay_WorkTimesBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    //=======JIT系统参数
@@ -3790,8 +3862,12 @@
                    {
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工艺路线是否启用多级审批，启用多级审批要求普通审批不启用
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_EnableMultiLevel")
                    {
                        omodel.Gy_RoutingBill_EnableMultiLevel = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }