From 6912d8235648a51e2e7b7e93d0f5b5e868511462 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 06 八月 2024 12:45:59 +0800
Subject: [PATCH] 添加读取配置的类。将数据库连接，接口地址写入到配置文件中，获取时通过配置文件获取
---
MES.Service/service/WomcaaManager.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 3e98070..4203eb1 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -2,6 +2,8 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using System;
+using System.Security.Cryptography;
namespace MES.Service.service;
@@ -74,12 +76,14 @@
private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
{
- return new Womcaa
+
+ var entity = new Womcaa
{
Erpid = Convert.ToDecimal(dto.Id),
Caa001 = dto.FBillNo,
- WorkShopId = dto.FWorkShopID0,
+ Caa021 = dto.FWorkShopID0,
RoutingId = dto.FRoutingId,
+ WorkShopId = dto.FREMWorkShopId,
DepotCode = dto.FStockId,
CreateDate = dto.FDate,
Caa004 = dto.FBillType,
@@ -114,6 +118,11 @@
Caa019 = Convert.ToDecimal(dto.planSeq),
Caa020 = dto.planNum
};
+
+ var single = base.GetSingle(it => it.Erpid == entity.Erpid);
+ if (single != null) entity.Id = single.Id;
+
+ return entity;
}
private List<Womcab> MapErpCABtoWomcab(List<ErpCAB> dtoList)
@@ -126,6 +135,7 @@
{
Erpid = Convert.ToDecimal(dto.ID),
Cab001 = dto.FBillNo,
+ Cab002 = dto.FSeq,
Cab003 = dto.FMaterialID2,
Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
? Convert.ToDecimal(dto.FNeedQty2)
@@ -151,6 +161,9 @@
Eid = Convert.ToDecimal(dto.PID)
};
+ var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
+ if (entity != null) womcab.Id = entity.Id;
+
womcabList.Add(womcab);
}
--
Gitblit v1.9.3