From c815a888b1c0487847372bc178444921de8e4a15 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期二, 26 八月 2025 10:57:34 +0800
Subject: [PATCH] 1、
---
MES.Service/service/BasicData/MesCgthSqManager.cs | 102 +++++++++++++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 40 deletions(-)
diff --git a/MES.Service/service/BasicData/MesCgthSqManager.cs b/MES.Service/service/BasicData/MesCgthSqManager.cs
index 1b663c8..1d73ce9 100644
--- a/MES.Service/service/BasicData/MesCgthSqManager.cs
+++ b/MES.Service/service/BasicData/MesCgthSqManager.cs
@@ -36,7 +36,7 @@
// 鎻愬彇涓昏〃鍜屾槑缁嗚〃DTO
var erpMain = erpCgth.ErpCgtha;
- var erpDetails = erpCgth.ErpCgthB ?? new List<ErpCgthB>(); // 閬垮厤鏄庣粏涓簄ull
+ var erpDetails = erpCgth.ErpCgthBList ?? new List<ErpCgthBList>(); // 閬垮厤鏄庣粏涓簄ull
// 姝ラ1锛氭槧灏勪富琛ㄥ熀纭�鏁版嵁锛堟殏涓嶅鐞咺d锛�
var mesMain = MapErpCgthaToMesCgthSq(erpMain);
@@ -55,8 +55,10 @@
case "1": // 鏂板
case "2": // 鏇存柊
case "4": // 鍏朵粬鏂板/鏇存柊绫诲瀷
+ case "5": // 鎻愪氦
return SaveOrUpdateData(db, mesMain, mesDetails, mainId) ? 1 : 0;
case "3": // 鍒犻櫎
+ case "6": // 鎾ら攢
return DeleteData(db, mesMain, mesDetails, mainId) ? 1 : 0;
default:
throw new NotImplementedException($"鏈疄鐜扮殑鎿嶄綔绫诲瀷锛歿erpMain.TYPE}");
@@ -150,51 +152,70 @@
/// 涓昏〃鏄犲皠锛堜粎澶勭悊鍩虹瀛楁锛孖d鐢盙etOrCreateMainId纭畾锛�
/// </summary>
private MesCgthSq MapErpCgthaToMesCgthSq(ErpCgtha erpMain)
+{
+ return new MesCgthSq
{
- return new MesCgthSq
+ // Id鏆備笉璧嬪�硷紙鐢盙etOrCreateMainId鍚庣画纭畾锛�
+ ErpId = erpMain.ERPID, // ERP涓昏〃ID
+ BillNo = erpMain.billNo ?? throw new ArgumentNullException(nameof(erpMain.billNo), "鍗曟嵁缂栧彿涓嶈兘涓虹┖"),
+ Type = erpMain.TYPE,
+ FDate = erpMain.FDate,
+ FDocumentStatus = erpMain.FDocumentStatus,
+ FSupplierId = erpMain.FSupplierID,
+ FBillTypeId = erpMain.FBillTypeID,
+ FBusinessType = erpMain.FBusinessType,
+ // 杞崲ReturnType: A->妫�楠岄��鏂�, B->搴撳瓨閫�鏂�
+ ReturnType = erpMain.FMRTYPE switch
{
-
- // Id鏆備笉璧嬪�硷紙鐢盙etOrCreateMainId鍚庣画纭畾锛�
- ErpId = erpMain.ERPID, // ERP涓昏〃ID
- BillNo = erpMain.billNo ?? throw new ArgumentNullException(nameof(erpMain.billNo), "鍗曟嵁缂栧彿涓嶈兘涓虹┖"),
- Type = erpMain.TYPE,
- FDate = erpMain.FDate,
- FDocumentStatus = erpMain.FDocumentStatus,
- FSupplierId = erpMain.FSupplierID,
- FBillTypeId = erpMain.FBillTypeID,
- FBusinessType = erpMain.FBusinessType,
- ReturnType = erpMain.FMRTYPE,
- ReturnMethod = erpMain.FMRMODE,
- CreateBy = erpMain.FCreatorId,
- FPurchaseOrgId = erpMain.FPurchaseOrgId,
- ThOrgId = erpMain.FStockOrgId,
- FRequireOrgId = erpMain.FRequireOrgId,
- FMRDeptId = erpMain.FMRDeptId,
- FStockerId = erpMain.FSTOCKERID,
- FPurchaserId = erpMain.FPURCHASERID,
- FMRReason = erpMain.FMRREASON,
- FPurchaseDeptId = erpMain.FPURCHASEDEPTID,
- FPurchaserGroupId = erpMain.FPURCHASERGROUPID,
- FACCTYPE = erpMain.FACCTYPE,
- FCreateDate = erpMain.FCreateDate,
- FWPVTINTEGERL6W = erpMain.F_WPVT_INTEGER_L6W,
+ "A" => "妫�楠岄��鏂�",
+ "B" => "搴撳瓨閫�鏂�",
+ _ => erpMain.FMRTYPE // 淇濇寔鍘熷�间笉鍙�
+ },
+ // 杞崲ReturnMethod: A->閫�鏂欒ˉ鏂�, B->閫�鏂欐墸娆�
+ ReturnMethod = erpMain.FMRMODE switch
+ {
+ "A" => "閫�鏂欒ˉ鏂�",
+ "B" => "閫�鏂欏苟鎵ｆ",
+ _ => erpMain.FMRMODE // 淇濇寔鍘熷�间笉鍙�
+ },
+ CreateBy = erpMain.FCreatorId,
+ LastUpdateUser = erpMain.FCreatorId,
+ FPurchaseOrgId = erpMain.FPurchaseOrgId,
+ ThOrgId = erpMain.FStockOrgId,
+ FRequireOrgId = erpMain.FRequireOrgId,
+ FMRDeptId = erpMain.FMRDeptId,
+ FStockerId = erpMain.FSTOCKERID,
+ FPurchaserId = erpMain.FPURCHASERID,
+ FMRReason = erpMain.FMRREASON,
+ FPurchaseDeptId = erpMain.FPURCHASEDEPTID,
+ FPurchaserGroupId = erpMain.FPURCHASERGROUPID,
+ // 杞崲FACCTYPE: Q->鏁伴噺楠屾敹, A->閲戦楠屾敹, R->姣斾緥楠屾敹
+ FACCTYPE = erpMain.FACCTYPE switch
+ {
+ "Q" => "Q:鏁伴噺楠屾敹",
+ "A" => "A:閲戦楠屾敹",
+ "R" => "R:姣斾緥楠屾敹",
+ _ => erpMain.FACCTYPE // 淇濇寔鍘熷�间笉鍙�
+ },
+ FCreateDate = erpMain.FCreateDate,
+ FWPVTINTEGERL6W = 0,
- // 渚涘簲鍟咺D锛堝畨鍏ㄨ浆鎹級
- SuppId = !string.IsNullOrEmpty(erpMain.FSupplierID)
- && int.TryParse(erpMain.FSupplierID, out int suppId)
- ? suppId
- : null,
-
- // 绯荤粺瀛楁锛堝垱寤烘椂闂翠粎鏂板鏃惰祴鍊硷紝鏇存柊鏃朵笉瑕嗙洊锛�
- CreateDate = DateTime.Now,
- LastUpdateTime = DateTime.Now
- };
- }
-
+ // 渚涘簲鍟咺D锛堝畨鍏ㄨ浆鎹級
+ SuppId = !string.IsNullOrEmpty(erpMain.FSupplierID)
+ && int.TryParse(erpMain.FSupplierID, out int suppId)
+ ? suppId
+ : null,
+ Status = false,
+ // 绯荤粺瀛楁锛堝垱寤烘椂闂翠粎鏂板鏃惰祴鍊硷紝鏇存柊鏃朵笉瑕嗙洊锛�
+ CreateDate = DateTime.Now,
+ LastUpdateTime = DateTime.Now
+ };
+}
+
/// <summary>
/// 鏄庣粏琛ㄦ槧灏勶紙浣跨敤鎻愬墠纭畾鐨刴ainId浣滀负Mid锛�
/// </summary>
- private List<MesCgthSqDetail> MapErpCgthBToMesCgthSqDetail(List<ErpCgthB> erpDetails, Guid mainId)
+ private List<MesCgthSqDetail> MapErpCgthBToMesCgthSqDetail(List<ErpCgthBList> erpDetails, Guid mainId)
{
return erpDetails.Select(erpDetail => new MesCgthSqDetail
{
@@ -213,6 +234,7 @@
: null,
FsrcBillNo = erpDetail.FSRCBillNo,
+ InvBillNo = erpDetail.FSRCBillNo,
FsrcBillTypeId = erpDetail.FSRCBillTypeId,
// 鐗╂枡ID锛堝畨鍏ㄨ浆鎹級
--
Gitblit v1.9.3