From 1285752d532db452edda09fbbb2006836a7084d3 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 14 八月 2025 18:14:42 +0800
Subject: [PATCH] 杂收杂发添加校验，控制不能物料重复
---
StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs b/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
index 3093fe2..0fd0ff0 100644
--- a/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
@@ -2,20 +2,21 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using System.Security.Cryptography;
namespace MES.Service.service.BasicData;
public class MesDeliveryNoteManager : Repository<MesDeliveryNote>
{
- private readonly MesDeliveryDetailsManager mesDeliveryNoteManager= new ();
+ private readonly MesDeliveryDetailsManager mesDeliveryNoteManager = new();
// Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜 RohIn 璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
public bool Save(Delivery delivery)
{
var erpDelivery = delivery.ErpDelivery;
var mesDeliveryNote = GetMesDeliveryNote(erpDelivery);
- var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(delivery.ErpDeliveryData, erpDelivery.DeliveryNo, mesDeliveryNote.Status);
+ var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(
+ delivery.ErpDeliveryData, erpDelivery.DeliveryNo,
+ mesDeliveryNote.Status);
return UseTransaction(db =>
{
@@ -24,10 +25,16 @@
case "2":
case "4":
case "5":
- return SaveOrUpdateData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1 : 0;
+ return SaveOrUpdateData(db, mesDeliveryNote,
+ mesDeliveryNoteDetails)
+ ? 1
+ : 0;
case "3":
case "6":
- return DeleteData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1: 0;
+ return DeleteData(db, mesDeliveryNote,
+ mesDeliveryNoteDetails)
+ ? 1
+ : 0;
default:
throw new NotImplementedException(
$"type娌℃湁{erpDelivery.Type}杩欎釜绫诲瀷");
@@ -36,7 +43,8 @@
}
// 鎻掑叆鏁版嵁鐨勬柟娉�
- private bool InsertData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ private bool InsertData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,
+ List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
{
var decimals = mesDeliveryNoteDetails.Select(s => s.Id).ToArray();
@@ -46,33 +54,42 @@
db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand();
var insert = base.Insert(mesDeliveryNote);
- var insertRange = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
+ var insertRange =
+ mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
if (insert && insertRange) return true;
throw new NotImplementedException("鎻掑叆澶辫触");
}
// 鏇存柊鏁版嵁鐨勬柟娉�
- private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,
+ List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
{
var decimals = mesDeliveryNoteDetails.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesDeliveryNote.Id);
- var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>()
+ .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
+ .ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
throw new NotImplementedException("鍒犻櫎澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ private bool SaveOrUpdateData(SqlSugarScope db,
+ MesDeliveryNote mesDeliveryNote,
+ List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
{
if (mesDeliveryNote.Id != null) base.DeleteById(mesDeliveryNote.Id);
if (mesDeliveryNoteDetails.Count > 0)
- db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand();
+ db.Deleteable<MesDeliveryNoteDetails>()
+ .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
+ .ExecuteCommand();
var orUpdate = base.Insert(mesDeliveryNote);
- var baOrUpdate = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
+ var baOrUpdate =
+ mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -102,15 +119,18 @@
}
else
{
- mesDeliveryNote.Status =0;
+ mesDeliveryNote.Status = 0;
}
+
mesDeliveryNote.CreateDate = DateTime.Now;
mesDeliveryNote.DepotNo = delivery.DepotNo;
mesDeliveryNote.ErpId = delivery.ErpId;
return mesDeliveryNote;
}
- public List<MesDeliveryNoteDetails> GetMesDeliveryNoteDetails(List<ErpDeliveryData> erpDeliveryDatas, string? type,decimal? status)
+
+ public List<MesDeliveryNoteDetails> GetMesDeliveryNoteDetails(
+ List<ErpDeliveryData> erpDeliveryDatas, string? type, decimal? status)
{
return erpDeliveryDatas.Select(s =>
{
@@ -132,8 +152,10 @@
Fsrcbill_no = s.SalesOrderId,
RealQty = Convert.ToDecimal(s.IncludeQty)
};
- var single = mesDeliveryNoteManager.GetSingle(it =>it.LineNo == entity.LineNo);
- if (single !=null && status==1) entity.RealQty = single.RealQty;
+ var single =
+ mesDeliveryNoteManager.GetSingle(it =>
+ it.LineNo == entity.LineNo);
+ if (single != null && status == 1) entity.RealQty = single.RealQty;
return entity;
}).ToList();
--
Gitblit v1.9.3