1

yusijie

2023-03-10 3850c75709556da9f0234d2d882148d93787e77f

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -10,7 +10,9 @@
        public ClsXt_SystemParameterMain omodel = new ClsXt_SystemParameterMain();
        public List<ClsXt_SystemParameterMain> DetailColl = new List<ClsXt_SystemParameterMain>();
        ClsSqlHelper oCn = new ClsSqlHelper();
         

        public object Kf_POStockInBill_MulSourceBill { get; set; }

        //新增 
        public bool AddBill(ref string sReturn)
        {
@@ -1245,6 +1247,11 @@
                    {
                        omodel.WMS_CloudMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //单据日期是否取界面递入日期
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_BillDateMode")
                    {
                        omodel.WMS_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //桌面条码模块
                    //有源单生成条码，生成条码数量可否超源单数量控制
@@ -1306,7 +1313,19 @@
                    {
                        omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    
                    //进站接收单是否自动匹配对应流水号
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_AutoFindSNO")
                    {
                        omodel.MES_StationInBill_AutoFindSNO = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //进站接收单只显示用户对应工序
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_ShowUSERProcess")
                    {
                        omodel.MES_StationInBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }



                    //===============出站单
                    //出站数量不能大于本道进站汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
@@ -1323,6 +1342,39 @@
                    {
                        omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //首道工序出站后自动生成ERP生产汇报单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_FstAutoICMOReport")
                    {
                        omodel.MES_StationOutBill_FstAutoICMOReport = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //末道工序出站后自动生成ERP生产汇报单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_LastAutoICMOReport")
                    {
                        omodel.MES_StationOutBill_LastAutoICMOReport = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //末道工序出站后自动生成ERP生产入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_AutoStockIn")
                    {
                        omodel.MES_StationOutBill_AutoStockIn = 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"]);
                    }
                    //出站汇报单是否自动匹配对应流水号
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_AutoFindSNO")
                    {
                        omodel.MES_StationOutBill_AutoFindSNO = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站汇报单只显示用户对应工序
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_ShowUSERProcess")
                    {
                        omodel.MES_StationOutBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }




                    //=====不良评审单
                    //不良品数不能大于出站单报废数量
@@ -1380,6 +1432,18 @@
                        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"]);
                    }

                    //===========工艺路线
                    //保存到数据库时自动加上转工序
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_SaveAutoLastProc")
                    {
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=======JIT

@@ -1474,6 +1538,20 @@
                    {
                        omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    ////=========工序进站单
                    ////自动匹配流水号
                    //if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo")
                    //{
                    //    omodel.MES_StationBill_ProcNo = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    //}

                    ////=========工序进出站
                    ////只显示用户对应工序
                    //if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNoByUser")
                    //{
                    //    omodel.MES_StationBill_ProcNoByUser = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    //}
                }
                sReturn = "显示单据成功！";
                return true;
@@ -2657,6 +2735,11 @@
                    {
                        omodel.WMS_CloudMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //单据日期是否取界面递入日期
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_BillDateMode")
                    {
                        omodel.WMS_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //桌面条码模块
                    //有源单生成条码，生成条码数量可否超源单数量控制
@@ -2792,6 +2875,12 @@
                        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

@@ -2881,6 +2970,13 @@
                        omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========工艺路线
                    //自动新增   保存到数据库时自动加上转工序
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_SaveAutoLastProc")
                    {
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //报工台，工序汇报自动审核参数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
                    {