From 9b754ddc20b4fbdc8e2bfbd77ac9143984d5551c Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期一, 29 七月 2024 08:42:02 +0800 Subject: [PATCH] 良率统计,任务单通过率后端查询 --- Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 595 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 594 insertions(+), 1 deletions(-) diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs index b9eab62..1c15991 100644 --- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs +++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs @@ -142,6 +142,11 @@ { omodel.Sc_ICMOReportBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //生产汇报单 报工台报检申请生产汇报单前判断是否过程检验 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_ProcessCheckOut") + { + omodel.Sc_ICMOReportBill_ProcessCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //==========================================收料通知单(送货单、到货确认) if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl") @@ -691,6 +696,14 @@ { omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_FIFOList") + { + omodel.Kf_MateReplenishOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_FIFOCtl") + { + omodel.Kf_MateReplenishOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //生产补料单暂存删除人必须是制单人 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_DeleterAndMakerMustSame") { @@ -746,6 +759,14 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_SourceWHSPCtl") { omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_FIFOList") + { + omodel.Kf_EntrustReplenishOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_FIFOCtl") + { + omodel.Kf_EntrustReplenishOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //委外补料单暂存删除人必须是制单人 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame") @@ -1388,6 +1409,155 @@ omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //============================================================================器具管理EAM系统参数 + //===========器具采购入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_AutoCheck") + { + omodel.Sc_MouldProdInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_BarCodeQty") + { + omodel.Sc_MouldProdInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具领用出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_AutoCheck") + { + omodel.Sc_MouldProdOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_BarCodeQty") + { + omodel.Sc_MouldProdOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_SaveAutoAddnew") + { + omodel.Sc_MouldProdOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_DeleterAndMakerMustSame") + { + omodel.Sc_MouldProdOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_MouldLifeCtrl") + { + omodel.Sc_MouldProdOutBill_MouldLifeCtrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_MouldLifeCtrlType") + { + omodel.Sc_MouldProdOutBill_MouldLifeCtrlType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具领用退库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_AutoCheck") + { + omodel.Sc_MouldProdBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_BarCodeQty") + { + omodel.Sc_MouldProdBackBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具改制出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_AutoCheck") + { + omodel.Sc_MouldRepairOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_BarCodeQty") + { + omodel.Sc_MouldRepairOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具改制入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_AutoCheck") + { + omodel.Sc_MouldRepairInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_BarCodeQty") + { + omodel.Sc_MouldRepairInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具其他入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_AutoCheck") + { + omodel.Sc_MouldOtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_BarCodeQty") + { + omodel.Sc_MouldOtherInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具其他出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_AutoCheck") + { + omodel.Sc_MouldOtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_BarCodeQty") + { + omodel.Sc_MouldOtherOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具暂借入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_AutoCheck") + { + omodel.Sc_MouldBorrowInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_BarCodeQty") + { + omodel.Sc_MouldBorrowInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具暂借出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_AutoCheck") + { + omodel.Sc_MouldBorrowOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_BarCodeQty") + { + omodel.Sc_MouldBorrowOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具报废入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_AutoCheck") + { + omodel.Sc_MouldScrapInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_BarCodeQty") + { + omodel.Sc_MouldScrapInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具报废出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_AutoCheck") + { + omodel.Sc_MouldScrapOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_BarCodeQty") + { + omodel.Sc_MouldScrapOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具直接调拨单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_AutoCheck") + { + omodel.Sc_MouldProdMoveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_BarCodeQty") + { + omodel.Sc_MouldProdMoveBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具分步调出单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_AutoCheck") + { + omodel.Sc_MouldMoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_BarCodeQty") + { + omodel.Sc_MouldMoveStockStepOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具分步调入单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_AutoCheck") + { + omodel.Sc_MouldMoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_BarCodeQty") + { + omodel.Sc_MouldMoveStockStepInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具盘点单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdCheckStockBill_AutoCheck") + { + omodel.Sc_MouldProdCheckStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //============================================================================================== //-======进站单 @@ -1435,6 +1605,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_ShowUSERProcess") { omodel.MES_StationInBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //工序进站时默认带入数量(1.流转卡数,2.上道合格数量,3.物料最小包装数量,4.不带入) + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty") + { + omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } @@ -1590,6 +1765,11 @@ { omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //当下一个生产日计划是相同产品时,MES系统自动开工下一单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoNextWorkBill") + { + omodel.Sc_ICMOBillWorkQtyStatus_AutoNextWorkBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //==========质量汇报单 //自动审核 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillQualityStatus_AutoCheck") @@ -1616,6 +1796,11 @@ 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"]) == "OA_ErrMsgBackBill_SendDingDingMsg") + { + omodel.OA_ErrMsgBackBill_SendDingDingMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //=========工序进站接收单 @@ -1646,6 +1831,78 @@ omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + + //=============================首件检验单 + //保存后是否自动审核 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_AutoCheck") + { + omodel.QC_FirstPieceCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //保存后变为新增状态 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_SaveAutoAddnew") + { + omodel.QC_FirstPieceCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_DeleterAndMakerMustSame") + { + omodel.QC_FirstPieceCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //质检方案来源 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_QCSchemeSource") + { + omodel.QC_FirstPieceCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + + + //=============================巡检单 + //保存后是否自动审核 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_AutoCheck") + { + omodel.QC_PatrolProcCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //保存后变为新增状态 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_SaveAutoAddnew") + { + omodel.QC_PatrolProcCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_DeleterAndMakerMustSame") + { + omodel.QC_PatrolProcCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //质检方案来源 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_QCSchemeSource") + { + omodel.QC_PatrolProcCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + + //=============================工序转序检验单 + //保存后是否自动审核 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_AutoCheck") + { + omodel.QC_ProcessCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //保存后变为新增状态 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_SaveAutoAddnew") + { + omodel.QC_ProcessCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_DeleterAndMakerMustSame") + { + omodel.QC_ProcessCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //质检方案来源 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_QCSchemeSource") + { + omodel.QC_ProcessCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + + //报工台,工序汇报自动审核参数 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck") { @@ -1657,6 +1914,35 @@ { omodel.BarCode_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + + //-==================生产订单 + //生产订单同步时自动生成流转卡 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_AutoProcExchBill") + { + omodel.Sc_ICMOBill_AutoProcExchBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_DeleterAndMakerMustSame") + { + omodel.Sc_ICMOBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + + //-==================工序流转卡 + //工序流转卡保存自动同步条码档案 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_AutoBarCode") + { + omodel.Sc_ProcessExchangeBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_DeleterAndMakerMustSame") + { + omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_SaveDeptIsNull") + { + omodel.Sc_ProcessExchangeBill_SaveDeptIsNull = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + ////=========工序进站单 ////自动匹配流水号 //if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo") @@ -1743,6 +2029,16 @@ { omodel.Sc_ICMOReportBill_MESFlag = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //生产汇报单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_DeleterAndMakerMustSame") + { + omodel.Sc_ICMOReportBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //生产汇报单 报工台报检申请生产汇报单前判断是否过程检验 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_ProcessCheckOut") + { + omodel.Sc_ICMOReportBill_ProcessCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //========收料通知单(送货单、到货确认) if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl") { @@ -1801,6 +2097,11 @@ { omodel.Kf_POStockInBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //采购入库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_DeleterAndMakerMustSame") + { + omodel.Kf_POStockInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //===========产品入库单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck") @@ -1847,6 +2148,11 @@ { omodel.Kf_ProductInBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //产品入库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_DeleterAndMakerMustSame") + { + omodel.Kf_ProductInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //=========其他入库单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck") @@ -1888,6 +2194,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_SourceWHSPCtl") { omodel.Kf_OtherInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //其他入库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_DeleterAndMakerMustSame") + { + omodel.Kf_OtherInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //============其他入库单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl") @@ -1943,6 +2254,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_SourceWHSPCtl") { omodel.Kf_EntrustInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //委外入库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_DeleterAndMakerMustSame") + { + omodel.Kf_EntrustInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //==========生产领料单 @@ -2069,6 +2385,11 @@ { omodel.Kf_SellOutBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //销售出库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_DeleterAndMakerMustSame") + { + omodel.Kf_SellOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //============销售出库单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MustQtyCtl") { @@ -2131,6 +2452,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_FIFOCtl") { omodel.Kf_OtherOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //其他出库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_DeleterAndMakerMustSame") + { + omodel.Kf_OtherOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //===========其他出库单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl") @@ -2195,6 +2521,11 @@ { omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //委外出库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_DeleterAndMakerMustSame") + { + omodel.Kf_EntrustOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //==========委外领料单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl") { @@ -2246,6 +2577,19 @@ { omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_FIFOList") + { + omodel.Kf_MateReplenishOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_FIFOCtl") + { + omodel.Kf_MateReplenishOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //生产补料单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_DeleterAndMakerMustSame") + { + omodel.Kf_MateReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //==========生产补料单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MustQtyCtl") { @@ -2296,6 +2640,19 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_SourceWHSPCtl") { omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_FIFOList") + { + omodel.Kf_EntrustReplenishOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_FIFOCtl") + { + omodel.Kf_EntrustReplenishOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //委外补料单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame") + { + omodel.Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //===========委外补料单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl") @@ -2360,6 +2717,11 @@ { omodel.Kf_MoveStockBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //直接调拨单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_DeleterAndMakerMustSame") + { + omodel.Kf_MoveStockBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //==========直接调拨单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl") { @@ -2419,6 +2781,11 @@ { omodel.Kf_MoveStockStepOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //分步式调出单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_DeleterAndMakerMustSame") + { + omodel.Kf_MoveStockStepOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //===========分步式调入单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck") @@ -2469,6 +2836,11 @@ { omodel.Kf_MoveStockStepInBill_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //分步式调入单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_DeleterAndMakerMustSame") + { + omodel.Kf_MoveStockStepInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //===============采购退料单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck") @@ -2506,6 +2878,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_SourceWHSPCtl") { omodel.Kf_POStockInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //采购退料单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_DeleterAndMakerMustSame") + { + omodel.Kf_POStockInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //===========生产退库单 @@ -2545,6 +2922,11 @@ { omodel.Kf_ProductInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //产品退库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_DeleterAndMakerMustSame") + { + omodel.Kf_ProductInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //===========其他入库红字 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck") @@ -2583,6 +2965,11 @@ { omodel.Kf_OtherInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //其他入库红字单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_DeleterAndMakerMustSame") + { + omodel.Kf_OtherInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //===========委外退库单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck") @@ -2617,6 +3004,11 @@ { omodel.Kf_EntrustInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_SourceWHSPCtl") + { + omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //其他入库红字单暂存删除人必须是制单人 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_SourceWHSPCtl") { omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); @@ -2663,6 +3055,11 @@ { omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //生产退料单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_DeleterAndMakerMustSame") + { + omodel.Kf_MateOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //==========销售退库单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck") @@ -2705,6 +3102,11 @@ { omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //销售退库单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_DeleterAndMakerMustSame") + { + omodel.Kf_SellOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //=========其他出库红字 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck") @@ -2742,6 +3144,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_SourceWHSPCtl") { omodel.Kf_OtherOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //其他出库红字单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_DeleterAndMakerMustSame") + { + omodel.Kf_OtherOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //===========委外退料单 @@ -2784,6 +3191,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SimpleMode") { omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //委外退料单暂存删除人必须是制单人 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_DeleterAndMakerMustSame") + { + omodel.Kf_EntrustOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //===========生产组托单 @@ -2919,6 +3331,156 @@ { omodel.BarCode_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + + //============================================================================器具管理EAM系统参数 + //===========器具采购入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_AutoCheck") + { + omodel.Sc_MouldProdInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_BarCodeQty") + { + omodel.Sc_MouldProdInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具领用出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_AutoCheck") + { + omodel.Sc_MouldProdOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_BarCodeQty") + { + omodel.Sc_MouldProdOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_SaveAutoAddnew") + { + omodel.Sc_MouldProdOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_DeleterAndMakerMustSame") + { + omodel.Sc_MouldProdOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_MouldLifeCtrl") + { + omodel.Sc_MouldProdOutBill_MouldLifeCtrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_MouldLifeCtrlType") + { + omodel.Sc_MouldProdOutBill_MouldLifeCtrlType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具领用退库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_AutoCheck") + { + omodel.Sc_MouldProdBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_BarCodeQty") + { + omodel.Sc_MouldProdBackBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具改制出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_AutoCheck") + { + omodel.Sc_MouldRepairOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_BarCodeQty") + { + omodel.Sc_MouldRepairOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具改制入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_AutoCheck") + { + omodel.Sc_MouldRepairInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_BarCodeQty") + { + omodel.Sc_MouldRepairInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具其他入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_AutoCheck") + { + omodel.Sc_MouldOtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_BarCodeQty") + { + omodel.Sc_MouldOtherInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具其他出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_AutoCheck") + { + omodel.Sc_MouldOtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_BarCodeQty") + { + omodel.Sc_MouldOtherOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具暂借入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_AutoCheck") + { + omodel.Sc_MouldBorrowInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_BarCodeQty") + { + omodel.Sc_MouldBorrowInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具暂借出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_AutoCheck") + { + omodel.Sc_MouldBorrowOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_BarCodeQty") + { + omodel.Sc_MouldBorrowOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具报废入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_AutoCheck") + { + omodel.Sc_MouldScrapInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_BarCodeQty") + { + omodel.Sc_MouldScrapInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具报废出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_AutoCheck") + { + omodel.Sc_MouldScrapOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_BarCodeQty") + { + omodel.Sc_MouldScrapOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具直接调拨单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_AutoCheck") + { + omodel.Sc_MouldProdMoveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_BarCodeQty") + { + omodel.Sc_MouldProdMoveBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具分步调出单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_AutoCheck") + { + omodel.Sc_MouldMoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_BarCodeQty") + { + omodel.Sc_MouldMoveStockStepOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具分步调入单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_AutoCheck") + { + omodel.Sc_MouldMoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_BarCodeQty") + { + omodel.Sc_MouldMoveStockStepInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //===========器具盘点单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdCheckStockBill_AutoCheck") + { + omodel.Sc_MouldProdCheckStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //============================================================================MES系统参数 //-==================生产订单 @@ -2926,6 +3488,10 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_AutoProcExchBill") { omodel.Sc_ICMOBill_AutoProcExchBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_DeleterAndMakerMustSame") + { + omodel.Sc_ICMOBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } @@ -2935,7 +3501,14 @@ { omodel.Sc_ProcessExchangeBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_DeleterAndMakerMustSame") + { + omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_SaveDeptIsNull") + { + omodel.Sc_ProcessExchangeBill_SaveDeptIsNull = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //-======工序进站接收单 //自动新增 @@ -2987,6 +3560,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_PreQtyCtl") { omodel.MES_StationInBill_PreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //工序进站时默认带入数量(1.流转卡数,2.上道合格数量,3.物料最小包装数量,4.不带入) + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty") + { + omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } @@ -3118,6 +3696,11 @@ { omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //刷卡验证 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_SwipeCardStart") + { + omodel.Sc_MESBeginWorkBill_SwipeCardStart = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //==========返工单 //自动审核 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESReturnWorkBill_AutoCheck") @@ -3141,6 +3724,11 @@ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoCheck") { omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //当下一个生产日计划是相同产品时,MES系统自动开工下一单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoNextWorkBill") + { + omodel.Sc_ICMOBillWorkQtyStatus_AutoNextWorkBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //==========质量汇报单 //自动审核 @@ -3169,6 +3757,11 @@ { omodel.OA_ErrMsgBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //是否发送钉钉消息 本地不发,(斯莫尔)客户发 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "OA_ErrMsgBackBill_SendDingDingMsg") + { + omodel.OA_ErrMsgBackBill_SendDingDingMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } //=======报工台,工序汇报自动审核参数 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck") { -- Gitblit v1.9.1