From 89d384623e1acdb3c58ec6d4094f9e8f2ec5ca57 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期三, 22 十月 2025 09:23:58 +0800
Subject: [PATCH] 销售发货同步防呆+合并单号

---
 StandardInterface/MES.Service/service/ZjdbManager.cs |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/StandardInterface/MES.Service/service/ZjdbManager.cs b/StandardInterface/MES.Service/service/ZjdbManager.cs
index bcf870e..cb5766f 100644
--- a/StandardInterface/MES.Service/service/ZjdbManager.cs
+++ b/StandardInterface/MES.Service/service/ZjdbManager.cs
@@ -56,6 +56,7 @@
                 DrCk = dto.dr_ck,   //璋冨叆浠撳簱
                 DcBm = dto.dc_bm,   //璋冨嚭閮ㄩ棬
                 DrBm = dto.dr_bm,   //璋冨叆閮ㄩ棬 
+                Gys=dto.GYS,       //渚涘簲鍟�
                 Type2 = "鐩存帴璋冩嫧鍗�",   //   
                 Remark = dto.bz,
                 Erpid = dto.erpid,
@@ -94,6 +95,11 @@
                     Remark = dto.bz,
                     Erpid = dto.erpid,
                     Eid = dto.eid,
+                    YdLx=dto.YD_lx,
+                    YdBm=dto.yd_bm,
+                    DdBm=dto.dd_bm,
+                    DdLx=dto.dd_lx,
+                    TzdDh=dto.tzd_dh,
                 };
 
                 var existing = Db.Queryable<MesInvItemDbsqItems>().Where(s => s.Erpid == item.Erpid).Single();
@@ -107,6 +113,15 @@
 
         private bool SaveOrUpdateData(SqlSugarScope db, MesInvItemDbsq head, List<MesInvItemDbsqItems> details)
         {
+            // 1. 鏍¢獙鏄惁瀛樺湪璋冩嫧璁板綍锛圡esInvItemMoves锛�
+            var hasMaterialOut = db.Queryable<MesInvItemMoves>()
+                                   .Any(x => x.WomdaahbNo == head.BillNo);
+
+            if (hasMaterialOut)
+            {
+                throw new Exception($"MES宸叉湁璋冩嫧璁板綍锛屽崟鍙凤細{head.BillNo}锛屼笉鑳芥洿鏂帮紒");
+            }
+
             if (head.Id != null)
                 base.DeleteById(head.Id);
 

--
Gitblit v1.9.3