diff --git a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
index f58f84aa..7c197255 100644
--- a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
+++ b/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
diff --git a/ZR.Model/MES/wms/ERP_WMS_interactiveModel.cs b/ZR.Model/MES/wms/ERP_WMS_interactiveModel.cs
index 46e62184..6f631907 100644
--- a/ZR.Model/MES/wms/ERP_WMS_interactiveModel.cs
+++ b/ZR.Model/MES/wms/ERP_WMS_interactiveModel.cs
@@ -13,6 +13,10 @@ namespace ZR.Model.MES.wms
public class ERP_WMS_interactiveModelQuery
{
+ ///
+ /// 客户编码
+ ///
+ public string customerCode { get; set; }
///
/// 物料编码
///
diff --git a/ZR.Service/mes/qc/backend/QcBackEndService.cs b/ZR.Service/mes/qc/backend/QcBackEndService.cs
index fbcb5cb8..e9f953f7 100644
--- a/ZR.Service/mes/qc/backend/QcBackEndService.cs
+++ b/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();
diff --git a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
index ca11948d..fd0dde93 100644
--- a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
+++ b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
@@ -24,6 +24,7 @@ namespace ZR.Service.mes.wms
IWmGoodsOutProductionService
{
private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+
///
/// 查询出库货物记录表列表
///
@@ -145,10 +146,18 @@ namespace ZR.Service.mes.wms
// 出库信息转发U8
//1.构建信息
- List outPackagelist = new()
- {
- model
- };
+
+ // TODO 客户编号获取
+ string _outOrder = model.FkOutOrderId ?? "无出库单";
+
+ string _customerCode =
+ Context
+ .Queryable()
+ .Where(x => x.ShipmentNum == _outOrder)
+ .Select(x => x.CustomNo)
+ .First() ?? "无客户代码";
+
+ List outPackagelist = new() { model };
List 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 () => {
- var u8ErpResult = await _eRP_WMS_InteractiveService.OutboundedAsync(urlBase, u8PackageList);
+ _ = Task.Run(async () =>
+ {
+ 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 packageCodeRemark = new();
- List< WmGoodsOutRecord > outRecordList = new();
+ List outRecordList = new();
if (type == 1)
{
var list = parm.Ids;
@@ -283,7 +297,6 @@ namespace ZR.Service.mes.wms
.Deleteable()
.Where(it => it.Id == nowProduction.Id)
.ExecuteCommand();
-
}
}
else if (type == 2)
@@ -345,7 +358,6 @@ namespace ZR.Service.mes.wms
.Deleteable()
.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()
+ .Where(x => x.ShipmentNum == _outOrder)
+ .Select(x => x.CustomNo)
+ .First() ?? "无客户代码";
List 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 () => {
- var u8ErpResult = await _eRP_WMS_InteractiveService.OutboundedAsync(urlBase, u8PackageList);
+ _ = Task.Run(async () =>
+ {
+ var u8ErpResult = await _eRP_WMS_InteractiveService.OutboundedAsync(
+ urlBase,
+ u8PackageList
+ );
// 处理结果...
//TODO 对U8返回结果进行解析
logger.Warn(u8ErpResult);
diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs
index 6d2aed7f..c9ae0f9d 100644
--- a/ZR.Service/mes/wms/WmOutOrderService.cs
+++ b/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()
+ .Where(x => x.ShipmentNum == _outOrder)
+ .Select(x => x.CustomNo)
+ .First() ?? "无客户代码";
List 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(),