From 5e0be58a1d37c92afb4fc1b0df6d69f12245c412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 15 May 2024 11:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E7=AE=B1=E6=8B=BC=E7=AE=B1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=E6=A0=87=E7=AD=BE=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WMentryWarehousing_productController.cs   |  20 +++--
 ....NET-毛坯库存库存变动记录表-0513140439.zip | Bin 8688 -> 0 bytes
 .../ZrAdmin.NET-毛坯库存表-0513140434.zip     | Bin 8845 -> 0 bytes
 .../MES/wms/Dto/ResultionPackageCodeDto.cs    |   6 +-
 ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs      |  85 ++++++++++++++++++
 .../wms/WMentryWarehousing_productService.cs  |  43 ++++++++-
 .../mes/wms/WmGoodsNowProductionService.cs    |  51 +++--------
 7 files changed, 155 insertions(+), 50 deletions(-)
 delete mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-毛坯库存库存变动记录表-0513140439.zip
 delete mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-毛坯库存表-0513140434.zip

diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs
index 27cc64cc..8a130d11 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs
@@ -159,17 +159,25 @@ namespace ZR.Admin.WebApi.Controllers.mes.wms
         [HttpGet("resolution_package")]
         public IActionResult ResolutionPackage(string code = "")
         {
-            if (string.IsNullOrEmpty(code))
+            try
             {
+                if (string.IsNullOrEmpty(code))
+                {
 
-                return ToResponse(new ApiResult(200, "传入为空", false));
+                    return ToResponse(new ApiResult(200, "传入为空", false));
+                }
+                ResultionPackageCodeDto data = this.wm_entryWarehousing_productService.ResolutionPackage(code);
+                if (data == null)
+                {
+                    return ToResponse(new ApiResult(500, "外标签解析异常", data));
+                }
+                return ToResponse(new ApiResult(200, "success", data));
             }
-            ResultionPackageCodeDto data = this.wm_entryWarehousing_productService.ResolutionPackage(code);
-            if (data == null)
+            catch(Exception ex)
             {
-                return ToResponse(new ApiResult(500, "外标签解析异常", data));
+                return ToResponse(new ApiResult(500, ex.Message, "外标签解析异常"));
             }
-            return ToResponse(new ApiResult(200, "success", data));
+            ;
 
         }
         /// <summary>
diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-毛坯库存库存变动记录表-0513140439.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-毛坯库存库存变动记录表-0513140439.zip
deleted file mode 100644
index 7e132c55e162a25e077e98d7c8243a8defa49d87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8688
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

diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-毛坯库存表-0513140434.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-毛坯库存表-0513140434.zip
deleted file mode 100644
index 864ffebf60d93de2b3781edb8f64b3285a72a2f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8845
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
G+rI%BVi9lv

diff --git a/ZR.Model/MES/wms/Dto/ResultionPackageCodeDto.cs b/ZR.Model/MES/wms/Dto/ResultionPackageCodeDto.cs
index b454d0e0..822128cd 100644
--- a/ZR.Model/MES/wms/Dto/ResultionPackageCodeDto.cs
+++ b/ZR.Model/MES/wms/Dto/ResultionPackageCodeDto.cs
@@ -39,7 +39,9 @@
         /// </summary>
         public string ProductionDescribe { get; set; }
 
-
-
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }
diff --git a/ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs b/ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs
index 82d02e0b..6d6cc224 100644
--- a/ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs
+++ b/ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs
@@ -20,6 +20,45 @@ namespace ZR.Model.MES.wms.Dto
 
     }
 
+    /// <summary>
+    /// 拼箱操作Json记录
+    /// </summary>
+    public class WmGoodsConsolidationJSON
+    {
+        /// <summary>
+        /// 拼箱涉及箱数据
+        /// </summary>
+        public List<ResultionPackageCodeDto> PackageList { get; set; }
+        /// <summary>
+        /// 拼箱最终工单号
+        /// </summary>
+        public string WorkOrderId { get; set; }
+        /// <summary>
+        /// 拼箱最终零件号
+        /// </summary>
+        public string NewPartnumber { get; set; }
+        /// <summary>
+        /// 拼箱最终生成的批次号
+        /// </summary>
+        public string NewPatchCode { get; set; }
+        /// <summary>
+        /// 拼箱最终生成的流水号
+        /// </summary>
+        public string SerialNumber { get; set; }
+        /// <summary>
+        /// 拼箱最终数量
+        /// </summary>
+        public int NewQuantityCount { get; set; }
+        /// <summary>
+        /// 拼箱班组
+        /// </summary>
+        public string Team { get; set; }
+        /// <summary>
+        /// 拼箱时间
+        /// </summary>
+        public DateTime? Time { get; set; }
+    }
+
     /// <summary>
     /// 拆箱操作
     /// </summary>
@@ -31,4 +70,50 @@ namespace ZR.Model.MES.wms.Dto
         public string CreateBy { get; set; }
 
     }
+    /// <summary>
+    /// 拆箱操作Json记录
+    /// </summary>
+    public class WmGoodsUnpackingJSON
+    {
+        /// <summary>
+        /// 拆箱主箱信息
+        /// </summary>
+        public ResultionPackageCodeDto MainPackage { get; set; }
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        public string NewPartnumber { get; set; }
+        /// <summary>
+        /// 新标签1
+        /// </summary>
+        public string NewPatchCode1 { get; set; }
+        /// <summary>
+        /// 新标签2
+        /// </summary>
+        public string NewPatchCode2 { get; set; }
+        /// <summary>
+        /// 新流水号1
+        /// </summary>
+        public string SerialNumber1 { get; set; }
+        /// <summary>
+        /// 新流水号2
+        /// </summary>
+        public string SerialNumber2 { get; set; }
+        /// <summary>
+        /// 拆箱数量1
+        /// </summary>
+        public int FirstNum { get; set; }
+        /// <summary>
+        /// 拆箱数量2
+        /// </summary>
+        public int SecondNum { get; set; }
+        /// <summary>
+        /// 班组
+        /// </summary>
+        public string Team { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public DateTime? Time { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
index 0c2f7962..7ebf917c 100644
--- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
+++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
@@ -1,7 +1,11 @@
 using Infrastructure.Attribute;
+using MimeKit.Utils;
+using Org.BouncyCastle.Utilities.IO.Pem;
 using SqlSugar;
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Text.RegularExpressions;
 using ZR.Model.MES.pro;
 using ZR.Model.MES.wms;
@@ -213,8 +217,41 @@ namespace ZR.Service.mes.wms
         //解析外箱标签码
         public ResultionPackageCodeDto ResolutionPackage(string code)
         {
-            MaterialUtils materialToos = new MaterialUtils();
-            return materialToos.ResolutionPackage(code);
+            try
+            {
+                MaterialUtils materialToos = new MaterialUtils();
+                ResultionPackageCodeDto packageCodeDto = materialToos.ResolutionPackage(code);
+                if(packageCodeDto == null)
+                {
+                    return null;
+                }
+                WmGoodsChangeLog changeLog = Context.Queryable<WmGoodsChangeLog>()
+                    .Where(it => it.Description.Contains(packageCodeDto.PatchCode))
+                    .OrderByDescending(it => it.CreatedTime)
+                    .First();
+                if(changeLog != null)
+                {
+                    // 拼箱
+                    if(changeLog.Type == 1)
+                    {
+                        var json = JsonSerializer.Deserialize<WmGoodsConsolidationJSON>(changeLog.JsonMsg);
+                        packageCodeDto.Remark = "标签涉及拼箱，参考标签:" + json.NewPartnumber;
+                    }
+                    // 拆箱
+                    else if (changeLog.Type == 2)
+                    {
+                        var json = JsonSerializer.Deserialize<WmGoodsUnpackingJSON>(changeLog.JsonMsg);
+                        packageCodeDto.Remark = "标签涉及拆箱参考数据，主箱:" + json.MainPackage.PatchCode + "\n次标签1:"+json.NewPatchCode1 + "\n次标签2:" + json.NewPatchCode2;
+                    }
+                }
+                
+            return packageCodeDto;
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+            
             /*// 初步进行解析检测，增加解析成功率
             string[] splitstr = code.Split('^');
             if (splitstr.Length < 1)
@@ -342,7 +379,7 @@ namespace ZR.Service.mes.wms
             }
             catch (Exception e)
             {
-                return "标签存在异常！";
+                return "标签存在异常！" + e.Message;
             }
 
         }
diff --git a/ZR.Service/mes/wms/WmGoodsNowProductionService.cs b/ZR.Service/mes/wms/WmGoodsNowProductionService.cs
index 7d802202..1375279c 100644
--- a/ZR.Service/mes/wms/WmGoodsNowProductionService.cs
+++ b/ZR.Service/mes/wms/WmGoodsNowProductionService.cs
@@ -148,7 +148,6 @@ namespace ZR.Service.mes.wms
             int startIndex = (page - 1) * rows;
             //数据总数 
             int sum = resultList.Count;
-
             if (startIndex + rows > sum)
             {
                 resultList = resultList.Skip(startIndex).Take(sum).ToList();
@@ -158,44 +157,6 @@ namespace ZR.Service.mes.wms
                 resultList = resultList.Skip(startIndex).Take(startIndex + rows).ToList();
             }
             return resultList;
-            /*if (rawdatas != null && rawdatas.Count > 0)
-            {
-                //todo 对字段进行拆分
-
-                List<WmGoods_nodeDto> WmGoods_nodeDto_list = rawdatas.Select(p => new WmGoods_nodeDto()
-                {
-                    Id = p.Id,
-                    PackageCode = p.PackageCode,
-                    PackageCodeClient_short_parent = p.PackageCodeClient.Split("_")[0],
-                    PackageCodeClient_son = p.PackageCodeClient,
-                    PackageCodeOriginal = p.PackageCodeClient,
-                    LocationCode = p.LocationCode,
-                    Partnumber = p.Partnumber,
-                    GoodsNumLogic = p.GoodsNumLogic,
-                    GoodsNumAction = p.GoodsNumAction,
-                    EntryWarehouseTime = p.EntryWarehouseTime,
-                    Remark = p.Remark,
-
-                }).ToList();
-                //todo 分组  聚合 生成父节点
-
-                List<WmGoods_nodeDto> WmGoods_nodeDto_list_parent = WmGoods_nodeDto_list.GroupBy(p => p.PackageCodeClient_short_parent)
-                   .Select(group => new WmGoods_nodeDto()
-                   {
-                       PackageCodeClient_short_parent = "",
-                       PackageCodeClient_son = group.Key,
-                       GoodsNumLogic = group.Sum(group => group.GoodsNumLogic),
-                       GoodsNumAction = group.Sum(group => group.GoodsNumAction),
-                       Partnumber = group.Max(group => group.Partnumber),
-                       Pack_num = group.Count()
-                   }).ToList();
-
-                //todo 合并
-
-                return WmGoods_nodeDto_list_parent.OrderByDescending(it => it.PackageCodeClient_son).ToList();
-
-            }
-            return null;*/
         }
         /// <summary>
         /// 移动端  短批次号详情
@@ -220,6 +181,18 @@ namespace ZR.Service.mes.wms
                     Remark = (!string.IsNullOrEmpty(it.Remark)? it.Remark:"无备注"),
                 })
                 .ToList();
+            foreach (WmGoodsNowProductionDto item in response)
+            {
+                WmMaterial material = Context.Queryable<WmMaterial>()
+                        .Where(it => it.Partnumber == item.Partnumber)
+                        .First();
+                if (material == null)
+                {
+                    item.Description = "此零件号不在物料清单内！";
+                    continue;
+                }
+                item.Description = !string.IsNullOrEmpty(material.Description) ? material.Description : material.ProductName;
+            }
             return response;
 
         }