From e27604afd884df113b3c77ba1de6d5e6193a730e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 19 三月 2025 10:59:19 +0800
Subject: [PATCH] 优化接口逻辑

---
 Tiger.Business.WMS/ERP/U9C_WMS.cs |   28 ++++++++++++++--------------
 Tiger.Business.WMS/ERP/WMS_U9C.cs |   14 +-------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 4366634..b646743 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -7,14 +7,8 @@
 using Tiger.Model.MES.Yada;
 using Tiger.Model;
 using Tiger.IBusiness;
-using Microsoft.CodeAnalysis.Options;
-using Tiger.Model.Entitys.MES.U9C;
 using SqlSugar;
-using System.Collections;
 using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
-using static IronPython.Modules.PythonDateTime;
-using System.Net;
-using static IronPython.Modules._ast;
 
 namespace Tiger.Business.WMS
 {
@@ -144,28 +138,34 @@
                 Logger.Scheduler.Info($"閫佽揣鍗曟槑缁嗚淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
                 foreach (var asn in asns)
                 {
-                    var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO ).ToList();
+                    var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO || x.Segment2 == asn.ORDER_NO).ToList();
                     foreach (var item in snlist)
                     {
+                        var barcode = new Barcode(item.Code);
                         BIZ_U9_ASN_SN info = new()
                         {
-                            STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
-                            ORDER_NO = item.Segment1,
-                            LINE_NO = item.Segment2,
-                            SN = item.Code,
-                            ITEM_CODE = item.Segment5,
-                            QTY = item.WhQty.ToDouble(),
-                            LOTNO = item.Segment7,
                             AUTH_ORG = asn.AUTH_ORG,
                             CREATE_TIME = DateTime.Now,//--鏃堕棿涓嶆洿鏂�
                             CREATE_USER = UserCode,
                             UPDATE_TIME = DateTime.Now,
                             UPDATE_USER = UserCode,
+                            STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
+                            ORDER_NO = barcode.OrderNo,
+                            LINE_NO = barcode.OrderLine,
+                            SN = barcode.SN,
+                            META_SN = item.Code,
+                            ITEM_CODE = barcode.ItemCode,
+                            QTY = item.WhQty,
+                            LOTNO = barcode.LotNo,
+                            CARTON_NO = barcode.SN,
                         };
                         sns.Add(info);
                     }
+
                     Logger.Scheduler.Info($"閫佽揣鍗昜{asn.ORDER_NO}]鏉$爜鏄庣粏淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{snlist.Count}]");
                 }
+
+
                 db = Biz.Db;
                 if (asns.Any())
                 {
diff --git a/Tiger.Business.WMS/ERP/WMS_U9C.cs b/Tiger.Business.WMS/ERP/WMS_U9C.cs
index 747d073..982cb83 100644
--- a/Tiger.Business.WMS/ERP/WMS_U9C.cs
+++ b/Tiger.Business.WMS/ERP/WMS_U9C.cs
@@ -1,5 +1,4 @@
-锘縰sing Tiger.Model;
-using SqlSugar;
+锘縰sing SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
@@ -10,18 +9,7 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Tiger.IBusiness;
-using Microsoft.AspNetCore.Http;
-using Tiger.Model.Minsun;
-using Org.BouncyCastle.Asn1.Tsp;
-using Tiger.Model.Entitys.MES.Position;
-using Apache.NMS.ActiveMQ.Commands;
-using System.Security.Cryptography;
-using System.Diagnostics;
 using Tiger.Model.Entitys.MES.U9C;
-using Newtonsoft.Json.Linq;
-using System.Security.Policy;
-using NetTaste;
-using static System.Net.WebRequestMethods;
 
 namespace Tiger.Business.WMS
 {

--
Gitblit v1.9.3