From 406896ef93ec12bb1d9821f05b14c9ca8dcf7fc8 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期五, 31 十月 2025 17:48:30 +0800
Subject: [PATCH] 物料反禁用，生产订单需领
---
StandardInterface/MES.Service/service/WomcaaManager.cs | 6 ++++--
StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs | 7 ++++---
StandardInterface/MESApplication/appsettings.json | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
index 77be21a..73f0459 100644
--- a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
@@ -107,10 +107,11 @@
.SetColumns(s => s.Fforbidstatus == status)
.Where(s => s.Id == itemId).ExecuteCommand();
- if (result > 0)
- return true;
+ /* if (result > 0)
+ return true;
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");*/
+ return true;
}
private bool InsertItem(SqlSugarScope db, MesItems entity)
diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs
index ef9344e..5651b46 100644
--- a/StandardInterface/MES.Service/service/WomcaaManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -303,8 +303,10 @@
Cab001 = dto.FBillNo, //鍗曟嵁缂栧彿
Cab002 = dto.FSeq, //搴忓彿
Cab003 = dto.FMaterialID, //瀛愰」鐗╂枡缂栫爜
- Cab006 = Convert.ToDecimal(dto.FNeedQty), //闇�姹傛暟閲�
- MustQty = Convert.ToDecimal(dto.FMustQty), //搴斿彂鏁伴噺
+ // Cab006 = Convert.ToDecimal(dto.FNeedQty), //闇�姹傛暟閲�
+ Cab006 = Convert.ToDecimal(dto.FMustQty), //搴斿彂鏁伴噺
+ MustQty = Convert.ToDecimal(dto.FNeedQty), //闇�姹傛暟閲�
+ // MustQty = Convert.ToDecimal(dto.FMustQty), //搴斿彂鏁伴噺
Cab007 = Convert.ToDecimal(dto.FPickedQty), //宸查鏁伴噺
PositionNo = dto.FPositionNO, //浣嶇疆鍙�
SupplyOrganization = dto.FChildSupplyOrgId, //渚涘簲缁勭粐
diff --git a/StandardInterface/MESApplication/appsettings.json b/StandardInterface/MESApplication/appsettings.json
index 59a3601..28cfc2a 100644
--- a/StandardInterface/MESApplication/appsettings.json
+++ b/StandardInterface/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd"
}
}
--
Gitblit v1.9.3