From d57d44bf22f7516500999a4935d8a589ae90e29c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 15 四月 2025 08:43:29 +0800
Subject: [PATCH] 1.委外订单主表入参新增fbillno 2.erp-》mes调拨单新增有无源单字段 3.生产订单优化
---
MES.Service/service/BasicData/TransferRequestManager.cs | 3 ++-
MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs | 1 +
MES.Service/service/WomcaaManager.cs | 7 ++++---
MES.Service/Modes/MesDbck.cs | 8 ++++++++
MES.Service/service/BasicData/ProductionOrderManager.cs | 10 ++++++----
5 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
index 895b238..8e0b94d 100644
--- a/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
+++ b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
@@ -2,6 +2,7 @@
public class ErpProductionOrderSubDto
{
+ public string? FBILLNO { get; set; } // 搴忓彿
public string? FSEQ { get; set; } // 搴忓彿
public string? FMaterialID2 { get; set; } // 瀛愰」鐗╂枡缂栫爜
public string? FMustQty { get; set; } // 闇�棰嗙敤閲�
diff --git a/MES.Service/Modes/MesDbck.cs b/MES.Service/Modes/MesDbck.cs
index 0b82a70..64e96fa 100644
--- a/MES.Service/Modes/MesDbck.cs
+++ b/MES.Service/Modes/MesDbck.cs
@@ -1,4 +1,5 @@
锘縰sing SqlSugar;
+using System.Reflection.Metadata;
namespace MES.Service.Modes;
@@ -175,4 +176,11 @@
/// </summary>
[SugarColumn(ColumnName = "DJTYPE")]
public string? DJTYPE { get; set; }
+
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷锛堣皟鎷ㄥ崟锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FHasLink")]
+ public bool? FHasLink { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index 9c3cd46..28b494d 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -14,12 +14,14 @@
private readonly ProductionOrderSubManager _productionOrderSubManager =
new();
+ private string ORDERNO = "";
+
//ErpWYOrder
public bool Save(ErpWYOrder wyOrder)
{
var erpProductionOrderDto = wyOrder.OrderDto;
- var mesRohIn = ConvertErpToProductionOrder(erpProductionOrderDto);
+ var mesRohIn = ConvertErpToProductionOrder(erpProductionOrderDto, wyOrder.Items[0].FBILLNO);
var mesRohInDatas =
ConvertErpToProductionOrderSub(wyOrder.Items);
@@ -98,7 +100,7 @@
}
private ProductionOrder ConvertErpToProductionOrder(
- ErpProductionOrderDto erpDto)
+ ErpProductionOrderDto erpDto,string SUBBOM)
{
DateTime parsedDate;
@@ -116,7 +118,7 @@
var productionOrder = new ProductionOrder
{
- OrderNo = erpDto.FBillNo,
+ OrderNo = SUBBOM,
Warehouse = erpDto.FStockID,
OrderDate = ParseDateTime(erpDto.FDate) ?? null,
OrderType = erpDto.FBillType,
@@ -164,7 +166,7 @@
Typea = erpDto.TypeA,
};
- var single = base.GetSingle(it => it.ErpId == erpDto.FID);
+ var single = base.GetSingle(it => it.ErpProductionEntryCode == erpDto.FSUBENTRYID);
if (single != null) productionOrder.Guid = single.Guid;
return productionOrder;
diff --git a/MES.Service/service/BasicData/TransferRequestManager.cs b/MES.Service/service/BasicData/TransferRequestManager.cs
index 75c43fc..8ad405e 100644
--- a/MES.Service/service/BasicData/TransferRequestManager.cs
+++ b/MES.Service/service/BasicData/TransferRequestManager.cs
@@ -141,7 +141,7 @@
FDocumentStatus = erpDto.FDocumentStatus, // 鍗曟嵁鐘舵��
FDate = !String.IsNullOrEmpty(erpDto.FDate) ? DateTime.ParseExact(erpDto.FDate, "yyyy-MM-dd HH:mm:ss", null) : null, // 鐢宠鏃ユ湡
FAppOrgId = erpDto.FAPPORGID, // 鐢宠缁勭粐
-
+
FBusinessType = erpDto.FBusinessType, // 涓氬姟绫诲瀷
//FTransType = erpDto.FTRANSTYPE, // 璋冩嫧绫诲瀷
//FTransferDirect = erpDto.FTransferDirect, // 璋冩嫧鏂瑰悜
@@ -159,6 +159,7 @@
FUnwBaseBomBb = erpDto.F_UNW_Base_BOMBB, // BOM鐗堟湰
FUnwBaseFxwlBm = erpDto.F_UNW_Base_FXWLBM, // 鐖堕」鐗╂枡缂栧彿
Source = "ERP",//鍗曟嵁鏉ユ簮
+ FHasLink = true,
FApproveStatus = 1,//瀹℃牳鐘舵��
};
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index e88f9fb..e9fc3f4 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -23,7 +23,8 @@
public bool Save(ErpWOM wom)
{
var womErpCaa = wom.ErpCaa;
- var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
+
+ var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FBillNo);
var mesWomcabs =
MapErpCABtoWomcab(wom.ErpCabs);
@@ -84,12 +85,12 @@
throw new NotImplementedException("鏇存柊澶辫触");
}
- private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
+ private Womcaa MapErpCAAtoWomcaa(ErpCAA dto,string PPBOMNO)
{
var entity = new Womcaa
{
Erpid = Convert.ToInt32(dto.Id), /// ERPID
- Caa001 = dto.FBillNo, /// 鍗曞彿
+ Caa001 = PPBOMNO, /// 鍗曞彿
Caa021 = dto.FWorkShopID, /// 宸ヤ綔杞﹂棿
RoutingId = dto.FRoutingId, /// 宸ヨ壓璺嚎
WorkShopId = dto.FREMWorkShopId, /// 浜х嚎
--
Gitblit v1.9.3