From 83873cde542f641b0fabb01c0cdbaf9eff335400 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 05 八月 2022 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 141 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 138 insertions(+), 3 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 03dae82..a47a8de 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -127,6 +127,10 @@
{
omodel.Kf_POStockInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BarCodeMustSameSourceBill")
+ {
+ omodel.Kf_POStockInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//领料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
{
@@ -148,6 +152,10 @@
{
omodel.Kf_MateOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_MateOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOCtl") //先进先出控制
{
omodel.Kf_MateOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -159,6 +167,18 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_SimpleMode") //简洁模式，只显示已扫码源单记录
{
omodel.Kf_MateOutBill_SimpleMode = 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"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_WHSPCtl") //校验-是否校对仓库仓位
+ {
+ omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配
+ {
+ omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//生产退料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
@@ -205,7 +225,11 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BillTypeOneScan")
{
omodel.Kf_ProductInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
- }
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BarCodeMustSameSourceBill")
+ {
+ omodel.Kf_ProductInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//生产退库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
{
@@ -290,6 +314,10 @@
{
omodel.Kf_EntrustOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_EntrustOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOCtl")
{
omodel.Kf_EntrustOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -344,6 +372,10 @@
{
omodel.Kf_SellOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_SellOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOCtl")
{
omodel.Kf_SellOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -390,9 +422,17 @@
{
omodel.Kf_OtherInBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_MulSourceBill")
+ {
+ omodel.Kf_OtherInBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_BillTypeOneScan")
{
omodel.Kf_OtherInBill_BillTypeOneScan = 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"]);
}
//其他出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck")
@@ -410,6 +450,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_BillTypeOneScan")
{
omodel.Kf_OtherOutBill_BillTypeOneScan = 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"]);
}
//调拨单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
@@ -431,6 +475,26 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BillTypeOneScan")
{
omodel.Kf_MoveStockBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_MoveStockBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOCtl")
+ {
+ omodel.Kf_MoveStockBill_FIFOCtl = 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"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_WHSPCtl") //校验-是否校对仓库仓位
+ {
+ omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配
+ {
+ omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//补料单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
@@ -507,6 +571,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_BillTypeOneScan")
{
omodel.Kf_MoveStockStepOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_FIFOList") //先进先出下架清单
+ {
+ omodel.Kf_MoveStockStepOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_FIFOCtl")
{
@@ -604,6 +672,21 @@
{
omodel.BarCode_SourceQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //允许条码打印次数（1、2、3.....）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_PrintQty")
+ {
+ omodel.BarCode_PrintQty = ClsPub.isLong(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //条码打印次数控制（是否只允许打印一次控制，Y 只允许打印一次）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_PrintQtyCtl")
+ {
+ omodel.BarCode_PrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //条码打印次数更新(打印条码时，是否更新条码打印次数，Y 更新)
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_UpdatePrintQtyCtl")
+ {
+ omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//-======进站单
//先进先出
@@ -631,8 +714,17 @@
{
omodel.MES_StationInBill_ProcessCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
-
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DeleteCtl")
+ {
+ omodel.MES_StationInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //进站接收时是否绑定该工序的配件清单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_LineBindCtl")
+ {
+ omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//===============出站单
//出站数量不能大于本道进站汇总数
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
@@ -644,12 +736,27 @@
{
omodel.MES_StationOutBill_FirstCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_DeleteCtl")
+ {
+ omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=====不良评审单
//不良品数不能大于出站单报废数量
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_NoPassProdCheckBill_QtyCtl")
{
omodel.QC_NoPassProdCheckBill_QtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //不良品评审单不良数量和不良原因总数必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_NoPassProdCheckBill_BadReasonQtyCtrl")
+ {
+ omodel.QC_NoPassProdCheckBill_BadReasonQtyCtrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_NoPassProdCheckBill_DeleteCtl")
+ {
+ omodel.QC_NoPassProdCheckBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//=======委外发出
@@ -673,12 +780,22 @@
{
omodel.MES_StationEntrustInBill_OneCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_DeleteCtl")
+ {
+ omodel.MES_StationEntrustInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========委外接收单
//出站数量不能大于本道进站汇总数
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_QtyCtl")
{
omodel.MES_StationEntrustOutBill_QtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //删除单据时制单人与删除人必须一致
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_DeleteCtl")
+ {
+ omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//==========生产汇报单
@@ -720,6 +837,12 @@
{
omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //==========返工单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESReturnWorkBill_AutoCheck")
+ {
+ omodel.Sc_MESReturnWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========结班单
//自动审核
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESEndWorkBill_AutoCheck")
@@ -759,6 +882,13 @@
omodel.Sc_MaterToSourceBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //=========异常反馈单
+ //自动审核
+ 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"]) == "MES_StationInBill_SaveAutoAddnew")
@@ -787,6 +917,11 @@
omodel.MES_StationEntrustOutBill_SaveAutoAddnew = 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