From 8328aed1bca2a30c3105b19f41d324acb59437c9 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 18 十二月 2025 14:11:42 +0800
Subject: [PATCH] 采购订单：添加组合键、添加单别。生产订单：添加整单删除、主表id生产改为序列化
---
MES.Service/service/BasicData/MesRohInManager.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index cdc658e..b63fd8b 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -140,9 +140,6 @@
mesRohIn.EbelnK3id = eid;
mesRohIn.BillNo = rohIn.FBillNo;
- mesRohIn.DocumentType = rohIn.FBillTypeID;
- mesRohIn.BusinessType = rohIn.FBusinessType;
-
////erp浼犺繃鏉ョ殑Y->C,琛ㄧず瀹℃牳銆侼->A銆傦紙涓庨噾铦堕�昏緫淇濇寔涓�鑷达級
//mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
@@ -259,6 +256,12 @@
mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;//娌诲叿涓舵ā鍏峰姞宸ュ強閲囪喘
mesRohIn.urgent_material = rohIn.FUrgent_Material;//鎬ユ枡
+ //mesRohIn.DocumentType = rohIn.FBillTypeID;
+ mesRohIn.BusinessType = rohIn.FBusinessType;//涓氬姟绫诲瀷
+ mesRohIn.DocumentType = rohIn.FBusinessType;//涓氬姟绫诲瀷
+
+ mesRohIn.MBillNo = $"{rohIn.FBillNo}-{rohIn.FBillTypeID}";//缁勫悎鍗曞彿锛氱粍鍚堝崟鍙凤細鍗曞彿-鍗曞埆
+ mesRohIn.NumberType= rohIn.FBillTypeID;//鍗曟嵁绫诲瀷:330锛氶噰璐崟銆�331锛氶噰璐ˉ璐у崟銆�332锛氭墜宸ラ噰璐崟
return mesRohIn;
}
@@ -331,9 +334,15 @@
DemandSource = s.FDEMANDTYPE,
DemandDocumentId = s.FDEMANDBILLNO,
OrderLineId = s.FDEMANDBILLENTRYSEQ,
- DemandOrg = s.FRequireOrgId,
- ReceivingOrg = s.FReceiveOrgId,
- SettlementOrg = s.FEntrySettleOrgId,
+ //闇�姹傜粍缁囬粯璁や负1
+ DemandOrg = string.IsNullOrEmpty(s.FRequireOrgId) ? "1" : s.FRequireOrgId,
+ //DemandOrg = s.FRequireOrgId,
+ //鏀舵枡缁勭粐榛樿涓�1
+ ReceivingOrg = string.IsNullOrEmpty(s.FEntrySettleOrgId) ? "1" : s.FEntrySettleOrgId,
+ //ReceivingOrg = s.FReceiveOrgId,
+ //缁撶畻缁勭粐榛樿涓�1
+ SettlementOrg = string.IsNullOrEmpty(s.FEntrySettleOrgId) ? "1" : s.FEntrySettleOrgId,
+ //SettlementOrg = s.FEntrySettleOrgId,
PurchaseOrderLineNumber = s.FSEQ,
Demand = s.FRequireOrgId,
Receiving = s.FReceiveOrgId,
--
Gitblit v1.9.3