日志调整

ZR.Admin.WebApi/Filters/VerifyAttribute.cs

@@ -37,7 +37,7 @@ namespace ZR.Admin.WebApi.Filters
 
 
             // 这个是什么？？？？？  HttpContext的用户信息从何而来啊？？？？？
-            Console.WriteLine("用户信息--》" + context.HttpContext.User.Identity.Name);
+            //Console.WriteLine("权限认证:用户信息--》" + context.HttpContext.User.Identity.Name);
             var isAuthed = context.HttpContext.User.Identity.IsAuthenticated;
 
             //使用jwt token校验2020-11-21

ZR.Model/MES/wms/ERP_WMS_interactiveModel.cs

@@ -13,6 +13,10 @@ namespace ZR.Model.MES.wms
 
     public class ERP_WMS_interactiveModelQuery
     {
+        /// <summary>
+        /// 客户编码
+        /// </summary>
+        public string customerCode { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>

ZR.Service/mes/qc/backend/QcBackEndService.cs

@@ -915,6 +915,8 @@ namespace ZR.Service.Business
             bool isFull = (innerLabelCount > 0) && (innerLabelCount % maxPackageNum == 0);
             // 是否需要扫箱标签
             bool needScanPackageLabel = packageLabelCount * maxPackageNum < innerLabelCount;
+            // TODO额外附加标签
+/*            Console.WriteLine($"======= CheckPackageIsFullAndNeedScanPackageLabel,maxPackageNum:{maxPackageNum},innerLabelCount:{innerLabelCount},packageLabelCount:{packageLabelCount},isFull:{isFull},needScanPackageLabel:{needScanPackageLabel}");*/
             neeedScan = isFull && needScanPackageLabel;
             return neeedScan;
         }
@@ -934,6 +936,8 @@ namespace ZR.Service.Business
             int maxPackage = packageLabelConfig.PackageNum ?? 0;
             if (checkSort >= maxPackage && checkSort % maxPackage == 0)
             {
+                // TODO额外附加标签
+                _logger.LogWarning($"=======> 需要打满箱标签{nowTime.ToString()},checkSort:{checkSort},maxPackage:{maxPackage}");
                 // 需要打外箱标签
                 SendPrintPackageLabelAsync(newLabelScran, packageLabelConfig.FileUrl, maxPackage)
                     .Wait();

ZR.Service/mes/wms/WmGoodsOutProductionService.cs

@@ -24,6 +24,7 @@ namespace ZR.Service.mes.wms
             IWmGoodsOutProductionService
     {
         private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+
         /// <summary>
         /// 查询出库货物记录表列表
         /// </summary>
@@ -145,10 +146,18 @@ namespace ZR.Service.mes.wms
             // 出库信息转发U8
 
             //1.构建信息
-            List<WmGoodsOutRecord> outPackagelist = new()
+
-            {
+            // TODO 客户编号获取
-                model
+            string _outOrder = model.FkOutOrderId ?? "无出库单";
-            };
+
+            string _customerCode =
+                Context
+                    .Queryable<WmOutOrder>()
+                    .Where(x => x.ShipmentNum == _outOrder)
+                    .Select(x => x.CustomNo)
+                    .First() ?? "无客户代码";
+
+            List<WmGoodsOutRecord> outPackagelist = new() { model };
             List<ERP_WMS_interactiveModelQuery> u8PackageList = new();
             foreach (var item in outPackagelist)
             {
@@ -175,6 +184,7 @@ namespace ZR.Service.mes.wms
                 ERP_WMS_interactiveModelQuery u8PackageItem =
                     new()
                     {
+                        customerCode = _customerCode,
                         materialCode = item.Partnumber,
                         location = item.LocationCode,
                         Qty = item.GoodsNumLogic.ToString(),
@@ -190,8 +200,12 @@ namespace ZR.Service.mes.wms
             string urlBase = "http://gam.com.cn:8053/";
             ERP_WMS_interactiveService _eRP_WMS_InteractiveService = new();
             // 后台执行不阻塞主线程
-            _ = Task.Run(async () => {
+            _ = Task.Run(async () =>
-                var u8ErpResult = await _eRP_WMS_InteractiveService.OutboundedAsync(urlBase, u8PackageList);
+            {
+                var u8ErpResult = await _eRP_WMS_InteractiveService.OutboundedAsync(
+                    urlBase,
+                    u8PackageList
+                );
                 // 处理结果...
                 //TODO 对U8返回结果进行解析
                 logger.Warn(u8ErpResult);
@@ -236,7 +250,7 @@ namespace ZR.Service.mes.wms
             int totalPackage = 0;
             int totalPartnumber = 0;
             List<string> packageCodeRemark = new();
-            List< WmGoodsOutRecord > outRecordList = new();
+            List<WmGoodsOutRecord> outRecordList = new();
             if (type == 1)
             {
                 var list = parm.Ids;
@@ -283,7 +297,6 @@ namespace ZR.Service.mes.wms
                         .Deleteable<WmGoodsNowProduction>()
                         .Where(it => it.Id == nowProduction.Id)
                         .ExecuteCommand();
-                    
                 }
             }
             else if (type == 2)
@@ -345,7 +358,6 @@ namespace ZR.Service.mes.wms
                         .Deleteable<WmGoodsNowProduction>()
                         .Where(it => it.Id == nowProduction.Id)
                         .ExecuteCommand();
-                   
                 }
             }
             // 插入记录
@@ -380,6 +392,16 @@ namespace ZR.Service.mes.wms
             // 出库信息转发U8
 
             //1.构建信息
+
+            // TODO 客户编号获取
+            string _outOrder = parm.FkOutOrderId ?? "无出库单";
+
+            string _customerCode =
+                Context
+                    .Queryable<WmOutOrder>()
+                    .Where(x => x.ShipmentNum == _outOrder)
+                    .Select(x => x.CustomNo)
+                    .First() ?? "无客户代码";
             List<ERP_WMS_interactiveModelQuery> u8PackageList = new();
             foreach (var item in outRecordList)
             {
@@ -406,6 +428,7 @@ namespace ZR.Service.mes.wms
                 ERP_WMS_interactiveModelQuery u8PackageItem =
                     new()
                     {
+                        customerCode = _customerCode,
                         materialCode = item.Partnumber,
                         location = item.LocationCode,
                         Qty = item.GoodsNumLogic.ToString(),
@@ -421,8 +444,12 @@ namespace ZR.Service.mes.wms
             string urlBase = "http://gam.com.cn:8053/";
             ERP_WMS_interactiveService _eRP_WMS_InteractiveService = new();
             // 后台执行不阻塞主线程
-            _ = Task.Run(async () => {
+            _ = Task.Run(async () =>
-                var u8ErpResult = await _eRP_WMS_InteractiveService.OutboundedAsync(urlBase, u8PackageList);
+            {
+                var u8ErpResult = await _eRP_WMS_InteractiveService.OutboundedAsync(
+                    urlBase,
+                    u8PackageList
+                );
                 // 处理结果...
                 //TODO 对U8返回结果进行解析
                 logger.Warn(u8ErpResult);

ZR.Service/mes/wms/WmOutOrderService.cs

@@ -3,6 +3,7 @@ using System.Data;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Aliyun.OSS;
 using Infrastructure.Attribute;
 using Mapster;
 using SqlSugar;
@@ -583,6 +584,15 @@ namespace ZR.Service.mes.wms
                 // 出库信息转发U8
 
                 //1.构建信息
+                // TODO 客户编号获取
+                string _outOrder = shipnumber ?? "无出库单";
+
+                string _customerCode =
+                    Context
+                        .Queryable<WmOutOrder>()
+                        .Where(x => x.ShipmentNum == _outOrder)
+                        .Select(x => x.CustomNo)
+                        .First() ?? "无客户代码";
                 List<ERP_WMS_interactiveModelQuery> u8PackageList = new();
                 foreach (var item in insertList)
                 {
@@ -609,6 +619,7 @@ namespace ZR.Service.mes.wms
                     ERP_WMS_interactiveModelQuery u8PackageItem =
                         new()
                         {
+                            customerCode = _customerCode,
                             materialCode = item.Partnumber,
                             location = item.LocationCode,
                             Qty = item.GoodsNumLogic.ToString(),