页面合并

yangle

2022-03-31 e178fc47bd7c3ee89fdcf09e79d764f571e01146

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -127,6 +127,10 @@
                    {
                        omodel.Kf_POStockInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BarCodeMustSameSourceBill")
                    {
                        omodel.Kf_POStockInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //领料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
                    {
@@ -205,7 +209,11 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BillTypeOneScan")
                    {
                        omodel.Kf_ProductInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    } 
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BarCodeMustSameSourceBill")
                    {
                        omodel.Kf_ProductInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产退库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
                    {
@@ -604,6 +612,21 @@
                    {
                        omodel.BarCode_SourceQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //允许条码打印次数（1、2、3.....）
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_PrintQty")
                    {
                        omodel.BarCode_PrintQty = ClsPub.isLong(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //条码打印次数控制（是否只允许打印一次控制，Y 只允许打印一次）
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_PrintQtyCtl")
                    {
                        omodel.BarCode_PrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //条码打印次数更新(打印条码时，是否更新条码打印次数，Y 更新)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_UpdatePrintQtyCtl")
                    {
                        omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //-======进站单
                    //先进先出
@@ -724,6 +747,12 @@
                    {
                        omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==========返工单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESReturnWorkBill_AutoCheck")
                    {
                        omodel.Sc_MESReturnWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==========结班单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESEndWorkBill_AutoCheck")
@@ -763,6 +792,13 @@
                        omodel.Sc_MaterToSourceBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========异常反馈单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "OA_ErrMsgBackBill_AutoCheck")
                    {
                        omodel.OA_ErrMsgBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========工序进站接收单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_SaveAutoAddnew")
@@ -791,6 +827,11 @@
                        omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //报工台，工序汇报自动审核参数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
                    {
                        omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                }
                sReturn = "显示单据成功！";
                return true;