凯贝立讯客户标签内箱码生成时流水号回填修正，金蝶云生成委外工序发出单调用方法修正

yxj

10 天以前 552fda4967d0f762fae21fae54c5f8b57b8eb3ea

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -2266,6 +2266,11 @@
                    }

                    //=======委外发出
                    //保存后是否自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_AutoCheck")
                    {
                        omodel.MES_StationEntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工站或工序先进先出（同上）
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
                    {
@@ -2293,6 +2298,11 @@
                    }

                    //===========委外接收单
                    //保存后是否自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_AutoCheck")
                    {
                        omodel.MES_StationEntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站数量不能大于本道进站汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_QtyCtl")
                    {
@@ -2777,6 +2787,59 @@
                        omodel.Sc_ShiftsBeginInfoBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具点检记录单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldDotCheckBill_AutoCheck")
                    {
                        omodel.Sc_MouldDotCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具保养记录单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMaintainBill_AutoCheck")
                    {
                        omodel.Sc_MouldMaintainBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具故障登记单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldConkBookBill_AutoCheck")
                    {
                        omodel.Sc_MouldConkBookBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具维修派工单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairSendWorkBill_AutoCheck")
                    {
                        omodel.Sc_MouldRepairSendWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具维修记录单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairWorkBill_AutoCheck")
                    {
                        omodel.Sc_MouldRepairWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具维修验收单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairCheckBill_AutoCheck")
                    {
                        omodel.Sc_MouldRepairCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========上模单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldUpperBill_AutoCheck")
                    {
                        omodel.Sc_MouldUpperBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========下模单 - 必须做上模单才能生成下模单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_MouldUpper")
                    {
                        omodel.Sc_MouldLowerBill_MouldUpper = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========下模单 - 自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_AutoCheck")
                    {
                        omodel.Sc_MouldLowerBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    // 投料防错表是否启用 投料校验(反写物料档案 单据状态)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_FeedingErrorProofingBill_BarCodeCTL")
@@ -2792,6 +2855,19 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckOtherBill_FirstCheckCtl")
                    {
                        omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
      
                    //=========返修条码
                    //生成物料条码时，机型码不允许为空
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_BarCodeBill_Rework_Ctrl")
                    {
                        omodel.Gy_BarCodeBill_Rework_Ctrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    
                    // 取样单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_TakeSampleCheckBill_AutoCheck")
                    {
                        omodel.QC_TakeSampleCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                }
                sReturn = "显示单据成功！";
@@ -5082,6 +5158,11 @@
                    {
                        omodel.MES_StationEntrustInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //保存后是否自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_AutoCheck")
                    {
                        omodel.MES_StationEntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工站或工序先进先出（同上）
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
                    {
@@ -5115,6 +5196,11 @@
                        omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //保存后是否自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_AutoCheck")
                    {
                        omodel.MES_StationEntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站数量不能大于本道进站汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_QtyCtl")
                    {
@@ -5532,6 +5618,65 @@
                    {
                        omodel.HR_PostSkillBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具点检记录单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldDotCheckBill_AutoCheck")
                    {
                        omodel.Sc_MouldDotCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具保养记录单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMaintainBill_AutoCheck")
                    {
                        omodel.Sc_MouldMaintainBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具故障登记单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldConkBookBill_AutoCheck")
                    {
                        omodel.Sc_MouldConkBookBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具维修派工单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairSendWorkBill_AutoCheck")
                    {
                        omodel.Sc_MouldRepairSendWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具维修记录单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairWorkBill_AutoCheck")
                    {
                        omodel.Sc_MouldRepairWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========模具维修验收单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairCheckBill_AutoCheck")
                    {
                        omodel.Sc_MouldRepairCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========上模单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldUpperBill_AutoCheck")
                    {
                        omodel.Sc_MouldUpperBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========下模单 - 必须做上模单才能生成下模单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_MouldUpper")
                    {
                        omodel.Sc_MouldLowerBill_MouldUpper = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=========下模单 - 自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_AutoCheck")
                    {
                        omodel.Sc_MouldLowerBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========取样单 - 自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_TakeSampleCheckBill_AutoCheck")
                    {
                        omodel.QC_TakeSampleCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                }
                sReturn = "显示单据成功！";
                return true;