From 1bd8a7db574d5970186e30f7d00ab239d45663c8 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期三, 29 三月 2023 09:58:40 +0800
Subject: [PATCH] 系统参数优化

---
 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs |  161 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 86 insertions(+), 75 deletions(-)

diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 93daf59..702a5d8 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1575,8 +1575,8 @@
 
                 for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                 {
-                    //WMS条码 系统参数
-                    //生产汇报单
+                    //========================================================WMS条码 系统参数
+                    //===========生产汇报单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
                     {
                         omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1625,7 +1625,7 @@
                     {
                         omodel.Sc_ICMOReportBill_MESFlag = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //收料通知单(送货单、到货确认)
+                    //========收料通知单(送货单、到货确认)
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl")
                     {
                         omodel.Cg_POInStockBill_BarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1638,7 +1638,7 @@
                     {
                         omodel.Cg_POInStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //采购入库单
+                    //===========采购入库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck")
                     {
                         omodel.Kf_POStockInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1684,7 +1684,7 @@
                         omodel.Kf_POStockInBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //产品入库单
+                    //===========产品入库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
                     {
                         omodel.Kf_ProductInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1730,7 +1730,7 @@
                         omodel.Kf_ProductInBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //其他入库单
+                    //=========其他入库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
                     {
                         omodel.Kf_OtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1771,7 +1771,7 @@
                     {
                         omodel.Kf_OtherInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //其他入库单  校验
+                    //============其他入库单  校验
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
                     {
                         omodel.Kf_OtherInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1785,7 +1785,7 @@
                         omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //委外入库单
+                    //=========委外入库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
                     {
                         omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1827,7 +1827,7 @@
                         omodel.Kf_EntrustInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //生产领料单
+                    //==========生产领料单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
                     {
                         omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1880,7 +1880,7 @@
                     {
                         omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //生产领料单    校验
+                    //==========生产领料单    校验
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
                     {
                         omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1894,7 +1894,7 @@
                         omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //销售出库单
+                    //============销售出库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
                     {
                         omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1951,7 +1951,7 @@
                     {
                         omodel.Kf_SellOutBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //销售出库单    校验
+                    //============销售出库单    校验
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MustQtyCtl")
                     {
                         omodel.Kf_SellOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1965,7 +1965,7 @@
                         omodel.Kf_SellOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //其他出库单
+                    //============其他出库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck")
                     {
                         omodel.Kf_OtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2010,7 +2010,7 @@
                     {
                         omodel.Kf_OtherOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //其他出库单  校验
+                    //===========其他出库单  校验
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
                     {
                         omodel.Kf_OtherOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2024,7 +2024,7 @@
                         omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //委外出库单
+                    //==========委外出库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
                     {
                         omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2073,7 +2073,7 @@
                     {
                         omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //委外领料单    校验
+                    //==========委外领料单    校验
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
                     {
                         omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2087,7 +2087,7 @@
                         omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //生产补料单
+                    //===========生产补料单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
                     {
                         omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2124,7 +2124,7 @@
                     {
                         omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //生产补料单    校验
+                    //==========生产补料单    校验
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MustQtyCtl")
                     {
                         omodel.Kf_MateReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2138,7 +2138,7 @@
                         omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //委外补料单
+                    //===========委外补料单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
                     {
                         omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2175,7 +2175,7 @@
                     {
                         omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //委外补料单    校验
+                    //===========委外补料单    校验
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
                     {
                         omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2189,7 +2189,7 @@
                         omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //直接调拨单
+                    //=========直接调拨单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
                     {
                         omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2238,7 +2238,7 @@
                     {
                         omodel.Kf_MoveStockBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-                    //直接调拨单  校验
+                    //==========直接调拨单  校验
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
                     {
                         omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2252,7 +2252,7 @@
                         omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //分步式调出单
+                    //============分步式调出单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck")
                     {
                         omodel.Kf_MoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2298,7 +2298,7 @@
                         omodel.Kf_MoveStockStepOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //分步式调入单
+                    //===========分步式调入单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck")
                     {
                         omodel.Kf_MoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2348,7 +2348,7 @@
                         omodel.Kf_MoveStockStepInBill_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //采购退料单
+                    //===============采购退料单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
                     {
                         omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2386,7 +2386,7 @@
                         omodel.Kf_POStockInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //生产退库单
+                    //===========生产退库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
                     {
                         omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2424,7 +2424,7 @@
                         omodel.Kf_ProductInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //其他入库红字
+                    //===========其他入库红字
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
                     {
                         omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2462,7 +2462,7 @@
                         omodel.Kf_OtherInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //委外退库单
+                    //===========委外退库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
                     {
                         omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2500,7 +2500,7 @@
                         omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //生产退料单
+                    //========生产退料单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
                     {
                         omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2542,7 +2542,7 @@
                         omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //销售退库单
+                    //==========销售退库单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
                     {
                         omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2584,7 +2584,7 @@
                         omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //其他出库红字
+                    //=========其他出库红字
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")
                     {
                         omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2622,7 +2622,7 @@
                         omodel.Kf_OtherOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //委外退料单
+                    //===========委外退料单
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
                     {
                         omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2664,7 +2664,7 @@
                         omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //WMS   通用
+                    //==============================================WMS   通用
                     //库存控制-ERP负库存控制
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl")
                     {
@@ -2783,7 +2783,7 @@
                         omodel.BarCode_AutoSellOutBackBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //==============================================================================================
+                    //============================================================================MES系统参数
                     //-==================工序流转卡
                     //工序流转卡保存自动同步条码档案
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_AutoBarCode")
@@ -2792,7 +2792,12 @@
                     }
 
 
-                    //-======进站单
+                    //-======工序进站接收单
+                    //自动新增
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_SaveAutoAddnew")
+                    {
+                        omodel.MES_StationInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
                     //先进先出
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_FIFOCtl")
                     {
@@ -2828,9 +2833,18 @@
                     {
                         omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //进站接收单删除时是否进行关联控制
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DeleteRelationCtl")
+                    {
+                        omodel.MES_StationInBill_DeleteRelationCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
 
-
-                    //===============出站单
+                    //===============工序出站汇报单
+                    //自动新增
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_SaveAutoAddnew")
+                    {
+                        omodel.MES_StationOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
                     //出站数量不能大于本道进站汇总数
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
                     {
@@ -2856,6 +2870,17 @@
                     {
                         omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //出站汇报单删除时是否进行关联控制
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_DeleteRelationCtl")
+                    {
+                        omodel.MES_StationOutBill_DeleteRelationCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+                    //工序末道入库仓库取值类型  末道工序自动入库时仓库取值类型(物料、工序、工艺路线)
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
+                    {
+                        omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+
 
                     //=====不良评审单
                     //不良品数不能大于出站单报废数量
@@ -2873,8 +2898,14 @@
                     {
                         omodel.QC_NoPassProdCheckBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    
 
-                    //=======委外发出
+                    //=======工序委外发出单//
+                    //自动新增
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
+                    {
+                        omodel.MES_StationEntrustInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
                     //工站或工序先进先出(同上)
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
                     {
@@ -2901,7 +2932,13 @@
                         omodel.MES_StationEntrustInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //===========委外接收单
+                    //===========工序委外接收单 
+                    //自动新增
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_SaveAutoAddnew")
+                    {
+                        omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+
                     //出站数量不能大于本道进站汇总数
                     if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_QtyCtl")
                     {
@@ -2913,14 +2950,10 @@
                         omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //工序末道入库仓库取值类型
-                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
-                    {
-                        omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
-                    }
+                    
 
 
-                    //=======JIT
+                    //=======JIT系统参数
 
                     //==========开班单
                     //自动审核
@@ -2979,34 +3012,13 @@
                     {
                         omodel.OA_ErrMsgBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
-
-                    //=========工序进站接收单
-                    //自动新增
-                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_SaveAutoAddnew")
+                    //=======报工台,工序汇报自动审核参数
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
                     {
-                        omodel.MES_StationInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                        omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
 
-                    //=========工序出站汇报单
-                    //自动新增
-                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_SaveAutoAddnew")
-                    {
-                        omodel.MES_StationOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
-                    }
-
-                    //=========工序委外发出单
-                    //自动新增
-                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
-                    {
-                        omodel.MES_StationEntrustInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
-                    }
-
-                    //=========工序委外接收单
-                    //自动新增
-                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_SaveAutoAddnew")
-                    {
-                        omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
-                    }
+                    //=================================================基础资料
 
                     //=========工艺路线
                     //自动新增   保存到数据库时自动加上转工序
@@ -3015,11 +3027,10 @@
                         omodel.Gy_RoutingBill_SaveAutoLastProc = 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;

--
Gitblit v1.9.1