From e3c454b61eb969d186110c3ad7ab6a289cbc013a Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期五, 25 四月 2025 10:17:22 +0800
Subject: [PATCH] 生产订单 加 成品编号
---
MES.Service/service/BasicData/SalesReturnNoticeManager.cs | 83 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 44 deletions(-)
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index c4cca56..e7b730d 100644
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -25,18 +25,11 @@
{
switch (erpSalesReturnDto.Type)
{
- // case "2":
- // return InsertData(db, mesSalesReturn, mesSalesReturnDatas,
- // rohInErpRohIn.FBILLTYPE)
- // ? 1
- // : 0;
case "3":
return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type)
- ? 1
- : 0;
+ return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type) ? 1: 0;
default:
throw new NotImplementedException(
$"type娌℃湁{erpSalesReturnDto.Type}杩欎釜绫诲瀷");
@@ -44,32 +37,38 @@
}) > 0;
}
- private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
- List<SalesReturnNoticeDetail> mesSalesReturnDatas)
+ private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas)
{
var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesReturn.Id);
- var insertOrUpdate = db
- .Deleteable<SalesReturnNoticeDetail>().In(decimals)
- .ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
- List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
{
- if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);
+ if (mesSalesReturn.Id != null)
+ {
+ base.DeleteById(mesSalesReturn.Id);
+ }
if (mesSalesReturnDatas.Count > 0)
- db.Deleteable<SalesReturnNoticeDetail>()
- .Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
+ {
+ db.Deleteable<SalesReturnNoticeDetail>().Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesSalesReturn);
var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
- if (orUpdate && baOrUpdate) return true;
+ if (orUpdate && baOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
@@ -82,20 +81,17 @@
return result.All(b => b);
}
- private SalesReturnNotice ConvertErpToSalesReturn(
- ErpSalesReturnDto erpDto)
+ private SalesReturnNotice ConvertErpToSalesReturn(ErpSalesReturnDto erpDto)
{
DateTime parsedDate;
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture,
- DateTimeStyles.None,
- out parsedDate))
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
+ {
return parsedDate;
-
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -108,7 +104,6 @@
Currency = erpDto.FSettleCurrld, // 缁撶畻甯佸埆
SalesDept = erpDto.FSaleDeptId, //閿�鍞儴闂�
ReturnCustomer = erpDto.FRetcustId, // 閫�璐у鎴�
- TaobaoRemark = erpDto.F_UNW_LargeText_TBKHBZ, // 娣樺疂瀹㈡埛澶囨敞
ReturnReason = erpDto.FRetcustReason, // 閫�璐у師鍥�
DeliveryLocation = erpDto.FHeadLocId, // 浜よ揣鍦扮偣
InventoryDept = erpDto.FRetDeptId, // 搴撳瓨閮ㄩ棬
@@ -116,7 +111,6 @@
WarehouseManager = erpDto.FStockerId, // 浠撶鍛�
SalesGroup = erpDto.FSaleGroupId, // 閿�鍞粍
SalesPerson = erpDto.FSalesManId,//閿�鍞憳
- ExpressNo = erpDto.F_UNW_Text_KDDH, // 蹇�掑崟鍙�
Receiver = erpDto.FReceiveCusId, // 鏀惰揣鏂�
ReceiverContact = erpDto.FReceiveCusContact, // 鏀惰揣鏂硅仈绯讳汉
ReceiverAddress = erpDto.FReceiveAddress, // 鏀惰揣鏂瑰湴鍧�
@@ -140,27 +134,28 @@
};
var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
- if (single != null) salesOrder.Id = single.Id;
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
return salesOrder;
}
- private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
- List<ErpSalesReturnDetailDto> erpDtoList)
+ private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(List<ErpSalesReturnDetailDto> erpDtoList)
{
- var salesOrderSubList =
- new List<SalesReturnNoticeDetail>();
+ var salesOrderSubList = new List<SalesReturnNoticeDetail>();
DateTime parsedDate;
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture,
- DateTimeStyles.None,
- out parsedDate))
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
+ {
return parsedDate;
+ }
+
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -173,20 +168,18 @@
{
ErpLineId = erpDto.ErpID,//ERP琛孖D
ErpHeadId = erpDto.EHID,//ERP澶碔D
- SalesOrderId = erpDto.F_UNW_Text_xsddh,//閿�鍞鍗曞彿
MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
MaterialSpecification = erpDto.FMaterialModel,//瑙勬牸鍨嬪彿
SalesUnitId = erpDto.FUnitID,//閿�鍞崟浣�
SalesQuantity = Convert.ToDecimal(erpDto.FQty),//閿�鍞暟閲�
- IsFree = erpDto.FIsFree,//鏄惁璧犲搧
+ IsFree = Convert.ToDecimal(erpDto.FIsFree),//鏄惁璧犲搧
ReturnDate = ParseDateTime(erpDto.FDeliverydate),//閫�璐ф棩鏈�
Warehouse = erpDto.FStockId,//浠撳簱
PlanTrackingNumber = erpDto.FMtoNo,//璁″垝璺熻釜鍙�
LotNumber = erpDto.FLot,//鎵瑰彿
Note = erpDto.FEntryDescription,//澶囨敞
ReturnType = erpDto.FRmType,//閫�璐х被鍨�
- SalesClerk = erpDto.F_UNW_Base_GDY,//璺熷崟鍛�
InventoryUnit = erpDto.FStockUnitID,//搴撳瓨鍗曚綅
InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//搴撳瓨鏁伴噺
MaterialCategory = erpDto.FMaterialType,//鐗╂枡绫诲埆
@@ -200,9 +193,11 @@
};
- var single = _SalesReturnDetailManager.GetSingle(it =>
- it.ErpLineId == salesOrderSub.ErpLineId);
- if (single != null) salesOrderSub.Id = single.Id;
+ var single = _SalesReturnDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
salesOrderSubList.Add(salesOrderSub);
}
--
Gitblit v1.9.3