From 1cd4e66b490e4b6cc3368771cdff164990e152e7 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 17:35:57 +0800
Subject: [PATCH] 接口增加单位换算，dab增加两个字段
---
MES.Service/service/WomcaaManager.cs | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index cb30102..f0369f4 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -33,12 +33,15 @@
switch (womErpCaa.Type)
{
case "3":
- return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
+ return SaveOrUpdateData(db, mesWomcaa, mesWomcabs,womErpCaa.Type)
+ ? 1
+ : 0;
+ //return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0; //鍙嶅鏍镐笉鍒犻櫎锛屽仛update銆�
case "2":
case "4":
//kyy 2024-09-13 鍙樻洿
case "5":
- return SaveOrUpdateData(db, mesWomcaa, mesWomcabs)
+ return SaveOrUpdateData(db, mesWomcaa, mesWomcabs,womErpCaa.Type)
? 1
: 0;
default:
@@ -49,8 +52,16 @@
}
private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ List<Womcab> mesWomcabs, string type)
{
+ if(type == "3" || (mesWomcaa.DocumentStatus != null && mesWomcaa.DocumentStatus != "C"))
+ {
+ mesWomcaa.Typea = "3"; // 鏂板瀛楁璧嬪��
+ mesWomcaa.Caa001 = mesWomcaa.Caa001 + "F" + mesWomcaa.Erpid.ToString();
+ }
+
+
+
if (StringUtil.CheckGuid(mesWomcaa.Guid))
base.DeleteById(mesWomcaa.Guid);
@@ -73,6 +84,10 @@
if (orUpdate && baOrUpdate)
{
+ db.Ado.ExecuteCommand("exec [dbo].[prc_unit_check] @billno, @ModuleType",
+ new { billno = mesWomcaa.Caa001, ModuleType = "鐢熶骇宸ュ崟" });
+
+
// 璋冪敤瀛樺偍杩囩▼鏇存柊鐢ㄦ枡娓呭崟
db.Ado.ExecuteCommand("exec [dbo].[prc_update_womdab] @outMsg output,@outSum output,@inEdtUserGuid,@inCaaGuid",
new {
@@ -91,6 +106,8 @@
private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
List<Womcab> mesWomcabs)
{
+ //throw new NotImplementedException("瀛樺湪涓嬫湁鍗曟嵁锛屼笉鍏佽鍙嶅");
+
var decimals = mesWomcabs.Select(s => s.Guid).ToArray();
var update = base.DeleteById(mesWomcaa.Guid);
var insertOrUpdate = db
@@ -165,7 +182,8 @@
Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
Typea = dto.TypeA, /// 棰勮瀹屽伐鏃堕棿澶囦唤
//Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
- SynchronousDate = DateTime.Now
+ SynchronousDate = DateTime.Now,
+ DocumentStatus = dto.FDocumentStatus
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -218,7 +236,8 @@
UseRate = Convert.ToDecimal(dto.FUseRate),
MaterialType = dto.FMaterialType,
MustQty = Convert.ToDecimal(dto.FMustQty),
- Typeb = dto.TypeB
+ Typeb = dto.TypeB,
+ F_UNW_QTY_YFSL = dto.F_UNW_QTY_YFSL,
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
//
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
@@ -231,7 +250,12 @@
var entity = Db.Queryable<Womcab>()
.Where(s => s.Eid == womcab.Eid).Single();
- if (entity != null) womcab.Guid = entity.Guid;
+ if (entity != null) {
+ womcab.Guid = entity.Guid;
+ womcab.IS_LOCK = entity.IS_LOCK;
+ womcab.IS_LOCK_DATE = entity.IS_LOCK_DATE;
+
+ }
womcabList.Add(womcab);
}
--
Gitblit v1.9.3