From 7e8117e92cacfe27094e03f58e04f382e12c1347 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期四, 12 八月 2021 17:05:34 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 33 +++++++++++++++++++++++++++++++++ Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 16 ++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs index 78c9619..8e40f14 100644 --- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs +++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs @@ -696,6 +696,39 @@ omodel.Sc_ICMOReportBill_UpdateSourceInterID = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //=======JIT + + //==========开班单 + //自动审核 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_AutoCheck") + { + omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //==========结班单 + //自动审核 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESEndWorkBill_AutoCheck") + { + omodel.Sc_MESEndWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //==========停工单 + //自动审核 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESStopWorkBill_AutoCheck") + { + omodel.Sc_MESStopWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //==========产量汇报单 + //自动审核 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoCheck") + { + omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //==========质量汇报单 + //自动审核 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillQualityStatus_AutoCheck") + { + omodel.Sc_ICMOBillQualityStatus_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + } sReturn = "显示单据成功!"; return true; diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs index 939c058..2b26d3b 100644 --- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs +++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs @@ -191,6 +191,22 @@ public string Sc_ICMOReportBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) public string Sc_ICMOReportBill_UpdateSourceInterID;//覆盖源单内码 + + //JIT + + + //开班单 + public string Sc_MESBeginWorkBill_AutoCheck; //自动审核 + //结班单 + public string Sc_MESEndWorkBill_AutoCheck; //自动审核 + //停工挂起单 + public string Sc_MESStopWorkBill_AutoCheck; //自动审核 + //产量汇报单 + public string Sc_ICMOBillWorkQtyStatus_AutoCheck; //自动审核 + //质量汇报单 + public string Sc_ICMOBillQualityStatus_AutoCheck; //自动审核 + + // } } -- Gitblit v1.9.1