From 2a95e842466816dac10bc1735bad0bd118497c88 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 12 四月 2023 21:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 12 ++++++++++++
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 3 +++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 9583385..bc7675f 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -2847,6 +2847,13 @@
{
omodel.MES_StationInBill_DeleteRelationCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //本道进站数量不能大于上道出站合格数量
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_PreQtyCtl")
+ {
+ omodel.MES_StationInBill_PreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+
//===============工序出站汇报单
//自动新增
@@ -2889,6 +2896,11 @@
{
omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //本道出站数量不允许小于下道进站数量
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_NextQtyCtl")
+ {
+ omodel.MES_StationOutBill_NextQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=====不良评审单
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 9cf0ed2..798e3f1 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -371,6 +371,8 @@
public string MES_StationInBill_ShowUSERProcess; //进站接收单只显示用户对应工序
public string MES_StationInBill_SaveAutoAddnew; //保存后变为新增状态
public string MES_StationInBill_DeleteRelationCtl; //进站接收单删除时是否进行关联控制
+ public string MES_StationInBill_PreQtyCtl; //本道进站数量不能大于上道出站合格数量
+
//工序出站汇报单
public string MES_StationOutBill_QtyCtl; //出站数量不能大于本道进站汇总数
public string MES_StationOutBill_QtyPreQtyCtl; //出站数量(合格数量或总数量)汇总不能大于上道合格汇总数
@@ -386,6 +388,7 @@
public string MES_StationOutBill_ShowUSERProcess; //出站汇报单只显示用户对应工序
public string MES_StationOutBill_SaveAutoAddnew; //保存后变为新增状态
public string MES_StationOutBill_DeleteRelationCtl; //出站汇报单删除时是否进行关联控制
+ public string MES_StationOutBill_NextQtyCtl; //本道出站数量不允许小于下道进站数量
//不良品评审单
public string QC_NoPassProdCheckBill_QtyCtl; //不良品数不能大于出站单报废数量
--
Gitblit v1.9.1