2024-04-18 11:34:49 +08:00
|
|
|
|
using System;
|
|
|
|
|
|
using SqlSugar;
|
|
|
|
|
|
using Infrastructure.Attribute;
|
|
|
|
|
|
using Infrastructure.Extensions;
|
|
|
|
|
|
using ZR.Model;
|
|
|
|
|
|
using ZR.Model.Dto;
|
|
|
|
|
|
using ZR.Model.MES.wms;
|
|
|
|
|
|
using ZR.Repository;
|
|
|
|
|
|
using ZR.Service.Business.IBusinessService;
|
|
|
|
|
|
using System.Linq;
|
|
|
|
|
|
using ZR.Service.mes.wms.IService;
|
|
|
|
|
|
using ZR.Model.MES.wms.Dto;
|
2024-04-18 17:02:17 +08:00
|
|
|
|
using System.Text.Json;
|
2024-04-19 14:00:33 +08:00
|
|
|
|
using MimeKit.Utils;
|
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
|
using Org.BouncyCastle.Crypto;
|
2024-04-26 11:22:33 +08:00
|
|
|
|
using static System.Runtime.InteropServices.JavaScript.JSType;
|
2024-05-10 14:57:47 +08:00
|
|
|
|
using Microsoft.AspNetCore.Http.HttpResults;
|
|
|
|
|
|
using System.Text.Json.Nodes;
|
2024-04-18 11:34:49 +08:00
|
|
|
|
|
|
|
|
|
|
namespace ZR.Service.Business
|
|
|
|
|
|
{
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 仓库操作日志Service业务层处理
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
[AppService(ServiceType = typeof(IWmGoodsActionService), ServiceLifetime = LifeTime.Transient)]
|
|
|
|
|
|
public class WmGoodsActionService : BaseService<WmGoodsChangeLog>, IWmGoodsActionService
|
|
|
|
|
|
{
|
|
|
|
|
|
public WmGoodsChangeLog doConsolidationGoods(WmGoodsConsolidationDto parm)
|
|
|
|
|
|
{
|
2024-04-18 17:02:17 +08:00
|
|
|
|
List<ResultionPackageCodeDto> list = parm.PackageList;
|
|
|
|
|
|
string description = "";
|
|
|
|
|
|
// 拼箱计数器
|
|
|
|
|
|
int num = 0;
|
|
|
|
|
|
int? quantityCount = 0;
|
2024-04-20 10:46:36 +08:00
|
|
|
|
// 第二箱录入数量(限制只能输入两箱)
|
|
|
|
|
|
int secondNum = parm.secondNum;
|
|
|
|
|
|
int? secondHas = 0;
|
|
|
|
|
|
bool isDelete = false;
|
|
|
|
|
|
string secondId = "";
|
2024-04-18 17:02:17 +08:00
|
|
|
|
// 箱验证
|
|
|
|
|
|
foreach (ResultionPackageCodeDto package in list)
|
|
|
|
|
|
{
|
|
|
|
|
|
num++;
|
2024-04-20 10:46:36 +08:00
|
|
|
|
// 有第二箱录入数量的情况下只能两箱拼
|
|
|
|
|
|
if (num == 3)
|
|
|
|
|
|
{
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
2024-04-18 17:02:17 +08:00
|
|
|
|
WmGoodsNowProduction check1 = Context.Queryable<WmGoodsNowProduction>().Where(it => it.PackageCodeClient == package.PatchCode).First();
|
|
|
|
|
|
if (check1 == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
2024-04-20 10:46:36 +08:00
|
|
|
|
|
2024-04-18 17:02:17 +08:00
|
|
|
|
if (num == 1)
|
|
|
|
|
|
{
|
2024-04-23 11:02:38 +08:00
|
|
|
|
description = "\n主箱:" + package.PatchCode+" 数量:"+ package.Quantity + ",\n次箱:";
|
2024-04-20 10:46:36 +08:00
|
|
|
|
quantityCount += package.Quantity;
|
|
|
|
|
|
continue;
|
2024-04-18 17:02:17 +08:00
|
|
|
|
}
|
2024-04-20 10:46:36 +08:00
|
|
|
|
if(num==2)
|
2024-04-18 17:02:17 +08:00
|
|
|
|
{
|
2024-04-20 10:46:36 +08:00
|
|
|
|
secondId = check1.Id;
|
2024-04-23 11:02:38 +08:00
|
|
|
|
description += package.PatchCode + " 数量:" + package.Quantity + ",";
|
2024-04-18 17:02:17 +08:00
|
|
|
|
}
|
2024-05-10 14:57:47 +08:00
|
|
|
|
// 如果PDA所填合并的数量为正数且比次箱子的总数量小
|
2024-04-20 10:46:36 +08:00
|
|
|
|
if (num == 2 && secondNum < package.Quantity && secondNum > 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
isDelete = false;
|
|
|
|
|
|
secondHas = package.Quantity - secondNum;
|
|
|
|
|
|
quantityCount += secondNum;
|
2024-04-23 11:02:38 +08:00
|
|
|
|
description += "\n移动数量" + secondNum;
|
2024-04-20 10:46:36 +08:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
isDelete = true;
|
|
|
|
|
|
secondHas = 0;
|
|
|
|
|
|
quantityCount += package.Quantity;
|
2024-04-23 11:02:38 +08:00
|
|
|
|
description += "\n移动数量" + package.Quantity;
|
2024-04-20 10:46:36 +08:00
|
|
|
|
}
|
2024-04-18 17:02:17 +08:00
|
|
|
|
}
|
|
|
|
|
|
ResultionPackageCodeDto mainPackage = list[0];
|
|
|
|
|
|
// 短批次
|
|
|
|
|
|
string shortPatchCode = mainPackage.PatchCode.Split('_')[0];
|
|
|
|
|
|
// 该批次最后一个拼箱记录
|
2024-04-22 11:12:58 +08:00
|
|
|
|
WmGoodsNowProduction lastConsolidationPackage = Context.Queryable<WmGoodsNowProduction>()
|
|
|
|
|
|
.Where(it => it.PackageCodeClient.Contains(shortPatchCode + "_4"))
|
|
|
|
|
|
.OrderBy(it => it.PackageCodeClient, OrderByType.Desc)
|
|
|
|
|
|
.First();
|
2024-04-19 14:00:33 +08:00
|
|
|
|
string newPatchCode = shortPatchCode;
|
2024-05-10 14:57:47 +08:00
|
|
|
|
// 最终初始编号
|
2024-04-18 17:02:17 +08:00
|
|
|
|
int lastCode = 400;
|
2024-04-22 11:12:58 +08:00
|
|
|
|
// 检测包装是否已打印4XX标签
|
|
|
|
|
|
// 该工单标签最大一个
|
|
|
|
|
|
var packingrecordExp = Expressionable.Create<WmPackingrecord>()
|
|
|
|
|
|
.And(it => it.WorkOrderNum == mainPackage.WorkoderID)
|
|
|
|
|
|
.And(it => it.Machine == "4")
|
|
|
|
|
|
.And(it => !it.PackingCode.Contains("Iminate"))
|
|
|
|
|
|
.ToExpression();
|
|
|
|
|
|
WmPackingrecord lastPackingrecord = Context.Queryable<WmPackingrecord>()
|
|
|
|
|
|
.Where(packingrecordExp)
|
|
|
|
|
|
.OrderBy(it=>it.PackingCode, OrderByType.Desc)
|
|
|
|
|
|
.First();
|
2024-05-10 14:57:47 +08:00
|
|
|
|
// 优先处理箱打印有历史数据情况
|
|
|
|
|
|
if (lastPackingrecord != null)
|
2024-04-18 17:02:17 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
int subIndex = lastPackingrecord.PackingCode.Length - 5;
|
|
|
|
|
|
// XXX 此代码中 AsSpan 方法 .NET Framework 4.7.2 不支持需要更高版本 或替换为 Substring
|
|
|
|
|
|
if (int.TryParse(lastPackingrecord.PackingCode.AsSpan(subIndex).TrimStart('0'), out int lastPackingrecordCode))
|
2024-04-22 11:12:58 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
if (lastPackingrecordCode > lastCode)
|
2024-04-22 11:12:58 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
lastCode = lastPackingrecordCode;
|
2024-04-22 11:12:58 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2024-05-10 14:57:47 +08:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
throw new Exception("生成标签数据异常:" + lastPackingrecord.PackingCode);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
// 其次处理成品库历史最大数字
|
|
|
|
|
|
if (lastConsolidationPackage != null)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (int.TryParse(lastConsolidationPackage.PackageCodeClient.Split('_')[1], out int lastConsolidationPackageCode))
|
2024-04-18 17:02:17 +08:00
|
|
|
|
{
|
2024-04-22 11:12:58 +08:00
|
|
|
|
// 取最大值
|
2024-05-10 14:57:47 +08:00
|
|
|
|
if (lastConsolidationPackageCode > lastCode)
|
2024-04-18 17:02:17 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
lastCode = lastConsolidationPackageCode;
|
2024-04-18 17:02:17 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2024-05-10 14:57:47 +08:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
throw new Exception("生成标签数据异常:" + lastConsolidationPackage.PackageCodeClient);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (lastCode > 400)
|
|
|
|
|
|
{
|
|
|
|
|
|
newPatchCode += "_" + (lastCode + 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
newPatchCode += "_401";
|
2024-04-18 17:02:17 +08:00
|
|
|
|
}
|
2024-04-23 11:02:38 +08:00
|
|
|
|
description += "\n拼箱结果:" + newPatchCode + " 总数量:" + quantityCount;
|
2024-04-19 14:00:33 +08:00
|
|
|
|
DateTime nowTime = DateTime.Now.ToLocalTime();
|
2024-04-18 17:02:17 +08:00
|
|
|
|
var jsonObject = new
|
|
|
|
|
|
{
|
2024-04-19 14:00:33 +08:00
|
|
|
|
packageList = list,
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 拼箱批次号
|
2024-04-19 14:00:33 +08:00
|
|
|
|
newPatchCode = newPatchCode,
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 拼箱流水号
|
|
|
|
|
|
serialNumber = newPatchCode.Split("_")[1],
|
|
|
|
|
|
// 拼箱数量
|
2024-04-19 14:00:33 +08:00
|
|
|
|
newQuantityCount = quantityCount,
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 拼箱班组
|
|
|
|
|
|
Team = "C",
|
|
|
|
|
|
// 拼箱零件号
|
|
|
|
|
|
newPartnumber = mainPackage.PartNumner,
|
|
|
|
|
|
// 拼箱时间
|
2024-04-19 14:00:33 +08:00
|
|
|
|
time = DateUtils.FormatDate(nowTime)
|
2024-04-18 17:02:17 +08:00
|
|
|
|
};
|
|
|
|
|
|
// 日志记录
|
2024-04-19 14:00:33 +08:00
|
|
|
|
WmGoodsChangeLog log = new()
|
|
|
|
|
|
{
|
|
|
|
|
|
CreatedBy = parm.CreateBy,
|
|
|
|
|
|
CreatedTime = nowTime,
|
|
|
|
|
|
Description = description,
|
|
|
|
|
|
JsonMsg = JsonSerializer.Serialize(jsonObject),
|
|
|
|
|
|
Type = 1
|
|
|
|
|
|
};
|
2024-04-18 17:02:17 +08:00
|
|
|
|
Context.Insertable(log).ExecuteReturnEntity();
|
|
|
|
|
|
// 执行修改
|
|
|
|
|
|
// 1.主箱查出并修改参数
|
|
|
|
|
|
WmGoodsNowProduction nowProduction = Context.Queryable<WmGoodsNowProduction>()
|
|
|
|
|
|
.Where(it => it.PackageCodeClient == mainPackage.PatchCode).First();
|
|
|
|
|
|
if (nowProduction == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
|
|
|
|
|
nowProduction.UpdatedBy = parm.CreateBy;
|
2024-04-19 14:00:33 +08:00
|
|
|
|
nowProduction.UpdatedTime = nowTime;
|
|
|
|
|
|
nowProduction.PackageCodeClient = newPatchCode;
|
|
|
|
|
|
nowProduction.PackageCodeOriginal = "Code=" + newPatchCode
|
2024-04-18 17:02:17 +08:00
|
|
|
|
+ "^ItemNumber=" + nowProduction.Partnumber
|
2024-04-19 14:00:33 +08:00
|
|
|
|
+ "^Order=" + newPatchCode.Split('_')[0].Substring(2)
|
2024-04-18 17:02:17 +08:00
|
|
|
|
+ "^Qty=" + quantityCount;
|
|
|
|
|
|
nowProduction.GoodsNumLogic = quantityCount;
|
|
|
|
|
|
nowProduction.GoodsNumAction = quantityCount;
|
2024-04-20 10:46:36 +08:00
|
|
|
|
nowProduction.Remark = "拼箱整箱";
|
2024-04-23 11:02:38 +08:00
|
|
|
|
//TODO 20240422开会讨论结果:拼箱完需要重新扫码入库,原数据删除
|
2024-04-26 11:22:33 +08:00
|
|
|
|
Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == nowProduction.Id).ExecuteCommand();
|
|
|
|
|
|
Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == secondId).ExecuteCommand();
|
2024-05-10 14:57:47 +08:00
|
|
|
|
//TODO 20240510添加标签记录信息到标签记录信息表
|
|
|
|
|
|
try
|
|
|
|
|
|
{
|
|
|
|
|
|
Context.Ado.BeginTran();
|
|
|
|
|
|
WmPackageLcl mainPackageLcl = new()
|
|
|
|
|
|
{
|
|
|
|
|
|
Id = SnowFlakeSingle.instance.NextId().ToString(),
|
|
|
|
|
|
Partnumber = nowProduction.Partnumber,
|
|
|
|
|
|
PackageCode = newPatchCode,
|
|
|
|
|
|
SerialNumber = newPatchCode.Split('_')[1],
|
|
|
|
|
|
LocationCode = nowProduction.LocationCode,
|
|
|
|
|
|
GoodsNum = nowProduction.GoodsNumAction ?? 0,
|
|
|
|
|
|
Team = "C",
|
|
|
|
|
|
Type = 1,
|
|
|
|
|
|
Status = 0,
|
|
|
|
|
|
CreatedBy = "拼箱",
|
|
|
|
|
|
CreatedTime = nowTime,
|
|
|
|
|
|
Remark = "拼箱整箱"
|
|
|
|
|
|
};
|
|
|
|
|
|
Context.Insertable(mainPackageLcl).ExecuteCommand();
|
|
|
|
|
|
if (!isDelete)
|
|
|
|
|
|
{
|
|
|
|
|
|
WmPackageLcl oddPackageLcl = new()
|
|
|
|
|
|
{
|
|
|
|
|
|
Id = SnowFlakeSingle.instance.NextId().ToString(),
|
|
|
|
|
|
Partnumber = list[1].PartNumner,
|
|
|
|
|
|
PackageCode = list[1].PatchCode,
|
|
|
|
|
|
SerialNumber = list[1].PatchCode.Split('_')[1],
|
|
|
|
|
|
LocationCode = "LS",
|
|
|
|
|
|
GoodsNum = secondHas ?? 0,
|
|
|
|
|
|
Team = "C",
|
|
|
|
|
|
Type = 1,
|
|
|
|
|
|
Status = 0,
|
|
|
|
|
|
CreatedBy = "拼箱",
|
|
|
|
|
|
CreatedTime = nowTime,
|
|
|
|
|
|
Remark = "拼箱零头箱"
|
|
|
|
|
|
};
|
|
|
|
|
|
Context.Insertable(oddPackageLcl).ExecuteCommand();
|
|
|
|
|
|
}
|
|
|
|
|
|
Context.Ado.CommitTran();
|
|
|
|
|
|
return log;
|
|
|
|
|
|
}
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
{
|
|
|
|
|
|
Context.Ado.RollbackTran();
|
|
|
|
|
|
throw new Exception("生成打印标签信息异常!" + ex);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2024-04-26 11:22:33 +08:00
|
|
|
|
return log;
|
2024-04-18 17:02:17 +08:00
|
|
|
|
// 修改主箱
|
|
|
|
|
|
Context.Updateable(nowProduction).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
|
2024-04-20 10:46:36 +08:00
|
|
|
|
// 次箱操作
|
|
|
|
|
|
if (isDelete)
|
|
|
|
|
|
{
|
|
|
|
|
|
// 删除次箱
|
|
|
|
|
|
Context.Deleteable<WmGoodsNowProduction>().Where(it=>it.Id == secondId).ExecuteCommand();
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
// 修改次箱子
|
|
|
|
|
|
WmGoodsNowProduction nowProduction2 = Context.Queryable<WmGoodsNowProduction>()
|
|
|
|
|
|
.Where(it => it.Id == secondId).First();
|
|
|
|
|
|
if (nowProduction2 == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
|
|
|
|
|
nowProduction2.UpdatedBy = parm.CreateBy;
|
|
|
|
|
|
nowProduction2.UpdatedTime = nowTime;
|
|
|
|
|
|
nowProduction2.PackageCodeOriginal = "Code=" + nowProduction2.PackageCodeClient
|
|
|
|
|
|
+ "^ItemNumber=" + nowProduction2.Partnumber
|
|
|
|
|
|
+ "^Order=" + nowProduction2.PackageCodeClient.Split('_')[0].Substring(2)
|
|
|
|
|
|
+ "^Qty=" + secondHas;
|
|
|
|
|
|
nowProduction2.GoodsNumLogic = secondHas;
|
|
|
|
|
|
nowProduction2.GoodsNumAction = secondHas;
|
2024-04-23 11:02:38 +08:00
|
|
|
|
nowProduction2.LocationCode = "LS";
|
2024-04-20 10:46:36 +08:00
|
|
|
|
nowProduction2.Remark = "拼箱零头箱";
|
2024-04-20 10:56:06 +08:00
|
|
|
|
Context.Updateable(nowProduction2).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
|
2024-04-20 10:46:36 +08:00
|
|
|
|
}
|
2024-04-18 17:02:17 +08:00
|
|
|
|
return log;
|
2024-04-18 11:34:49 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public WmGoodsChangeLog doUnpackingGoods(WmGoodsUnpackingDto parm)
|
|
|
|
|
|
{
|
2024-04-19 14:00:33 +08:00
|
|
|
|
string description = "";
|
|
|
|
|
|
// 待拆箱
|
|
|
|
|
|
ResultionPackageCodeDto mainPackage = parm.Package;
|
|
|
|
|
|
|
|
|
|
|
|
// 验证
|
|
|
|
|
|
WmGoodsNowProduction mainNowProduction = Context.Queryable<WmGoodsNowProduction>().Where(it => it.PackageCodeClient == mainPackage.PatchCode).First();
|
|
|
|
|
|
if (mainNowProduction == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
2024-04-20 10:46:36 +08:00
|
|
|
|
|
2024-04-23 11:02:38 +08:00
|
|
|
|
description += "\n由主箱:" + mainPackage.PatchCode + " 数量:" + mainPackage.Quantity + "拆分:";
|
2024-04-19 14:00:33 +08:00
|
|
|
|
// 短批次
|
|
|
|
|
|
string shortPatchCode = mainPackage.PatchCode.Split('_')[0];
|
|
|
|
|
|
// 该批次最后一个拼箱记录
|
|
|
|
|
|
WmGoodsNowProduction lastConsolidationPackage = Context.Queryable<WmGoodsNowProduction>().Where(it => it.PackageCodeClient.Contains(shortPatchCode + "_4")).OrderBy(it => it.PackageCodeClient, OrderByType.Desc).First();
|
|
|
|
|
|
string newPatchCode1 = shortPatchCode;
|
|
|
|
|
|
string newPatchCode2 = shortPatchCode;
|
2024-04-22 11:12:58 +08:00
|
|
|
|
// 检测包装是否已打印4XX标签
|
|
|
|
|
|
// 该工单标签最大一个
|
|
|
|
|
|
var packingrecordExp = Expressionable.Create<WmPackingrecord>()
|
|
|
|
|
|
.And(it => it.WorkOrderNum == mainPackage.WorkoderID)
|
|
|
|
|
|
.And(it => it.Machine == "4")
|
|
|
|
|
|
.And(it => !it.PackingCode.Contains("Iminate"))
|
|
|
|
|
|
.ToExpression();
|
|
|
|
|
|
WmPackingrecord lastPackingrecord = Context.Queryable<WmPackingrecord>()
|
|
|
|
|
|
.Where(packingrecordExp)
|
|
|
|
|
|
.OrderBy(it => it.PackingCode, OrderByType.Desc)
|
|
|
|
|
|
.First();
|
2024-04-19 14:00:33 +08:00
|
|
|
|
int lastCode = 400;
|
2024-05-10 14:57:47 +08:00
|
|
|
|
// 优先处理箱打印有历史数据情况
|
|
|
|
|
|
if (lastPackingrecord != null)
|
2024-04-19 14:00:33 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
int subIndex = lastPackingrecord.PackingCode.Length - 5;
|
|
|
|
|
|
// XXX 此代码中 AsSpan 方法 .NET Framework 4.7.2 不支持需要更高版本 或替换为 Substring
|
|
|
|
|
|
if (int.TryParse(lastPackingrecord.PackingCode.AsSpan(subIndex).TrimStart('0'), out int lastPackingrecordCode))
|
2024-04-22 11:12:58 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
if (lastPackingrecordCode > lastCode)
|
2024-04-22 11:12:58 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
lastCode = lastPackingrecordCode;
|
2024-04-22 11:12:58 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2024-05-10 14:57:47 +08:00
|
|
|
|
else
|
2024-04-19 14:00:33 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
throw new Exception("生成标签数据异常:" + lastPackingrecord.PackingCode);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if(lastConsolidationPackage != null )
|
|
|
|
|
|
{
|
|
|
|
|
|
if (int.TryParse(lastConsolidationPackage.PackageCodeClient.Split('_')[1], out int lastConsolidationPackageCode))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (lastConsolidationPackageCode > lastCode)
|
2024-04-19 14:00:33 +08:00
|
|
|
|
{
|
2024-05-10 14:57:47 +08:00
|
|
|
|
lastCode = lastConsolidationPackageCode;
|
2024-04-19 14:00:33 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2024-05-10 14:57:47 +08:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
throw new Exception("生成标签数据异常:" + lastConsolidationPackage.PackageCodeClient);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (lastCode > 400)
|
|
|
|
|
|
{
|
|
|
|
|
|
newPatchCode1 += "_" + (lastCode + 1);
|
|
|
|
|
|
newPatchCode2 += "_" + (lastCode + 2);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
newPatchCode1 += "_401";
|
|
|
|
|
|
newPatchCode2 += "_402";
|
2024-04-19 14:00:33 +08:00
|
|
|
|
}
|
|
|
|
|
|
int firstNum = parm.firstNum;
|
2024-04-20 10:46:36 +08:00
|
|
|
|
|
2024-04-19 14:00:33 +08:00
|
|
|
|
int? secondNum = mainNowProduction.GoodsNumAction - firstNum;
|
|
|
|
|
|
if (secondNum <= 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
|
|
|
|
|
description += "\n拆箱结果1:" + newPatchCode1 + "数量为" + firstNum + "个";
|
|
|
|
|
|
description += "\n拆箱结果2:" + newPatchCode2 + "数量为" + secondNum + "个";
|
|
|
|
|
|
DateTime nowTime = DateTime.Now.ToLocalTime();
|
|
|
|
|
|
var jsonObject = new
|
|
|
|
|
|
{
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 主箱信息
|
2024-04-19 14:00:33 +08:00
|
|
|
|
mainPackage = mainPackage,
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 新标签1
|
2024-04-19 14:00:33 +08:00
|
|
|
|
newPatchCode1 = newPatchCode1,
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 新流水号1
|
|
|
|
|
|
serialNumber1 = newPatchCode1.Split("_")[1],
|
|
|
|
|
|
// 新标签2
|
2024-04-19 14:00:33 +08:00
|
|
|
|
newPatchCode2 = newPatchCode2,
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 新流水号2
|
|
|
|
|
|
serialNumber2 = newPatchCode2.Split("_")[1],
|
|
|
|
|
|
// 拆箱1数量
|
2024-04-19 14:00:33 +08:00
|
|
|
|
firstNum = firstNum,
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 拆箱2数量
|
2024-04-19 14:00:33 +08:00
|
|
|
|
secondNum = secondNum,
|
2024-04-26 11:22:33 +08:00
|
|
|
|
// 班组
|
|
|
|
|
|
Team = "C",
|
|
|
|
|
|
// 全部箱子零件号
|
|
|
|
|
|
newPartnumber = mainPackage.PartNumner,
|
|
|
|
|
|
// 拆箱时间
|
2024-04-19 14:00:33 +08:00
|
|
|
|
time = DateUtils.FormatDate(nowTime)
|
|
|
|
|
|
};
|
|
|
|
|
|
// 日志记录
|
|
|
|
|
|
WmGoodsChangeLog log = new()
|
|
|
|
|
|
{
|
|
|
|
|
|
CreatedBy = parm.CreateBy,
|
|
|
|
|
|
CreatedTime = nowTime,
|
|
|
|
|
|
Description = description,
|
|
|
|
|
|
JsonMsg = JsonSerializer.Serialize(jsonObject),
|
|
|
|
|
|
Type = 2
|
|
|
|
|
|
};
|
|
|
|
|
|
Context.Insertable(log).ExecuteReturnEntity();
|
2024-04-23 11:02:38 +08:00
|
|
|
|
//TODO 20240422开会讨论结果:拆箱完需要重新扫码入库,原主箱数据删除
|
2024-04-26 11:22:33 +08:00
|
|
|
|
Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == mainNowProduction.Id).ExecuteCommand();
|
2024-05-10 14:57:47 +08:00
|
|
|
|
//TODO 20240510 添加待打印的记录
|
|
|
|
|
|
try
|
|
|
|
|
|
{
|
|
|
|
|
|
Context.Ado.BeginTran();
|
|
|
|
|
|
WmPackageLcl packageLcl1 = new()
|
|
|
|
|
|
{
|
|
|
|
|
|
Id = SnowFlakeSingle.instance.NextId().ToString(),
|
|
|
|
|
|
Partnumber = mainNowProduction.Partnumber,
|
|
|
|
|
|
PackageCode = jsonObject.newPatchCode1,
|
|
|
|
|
|
SerialNumber = jsonObject.serialNumber1,
|
|
|
|
|
|
LocationCode = mainNowProduction.LocationCode,
|
|
|
|
|
|
GoodsNum = jsonObject.firstNum,
|
|
|
|
|
|
Team = "C",
|
|
|
|
|
|
Type = 2,
|
|
|
|
|
|
Status = 0,
|
|
|
|
|
|
CreatedBy = "拆箱",
|
|
|
|
|
|
CreatedTime = nowTime,
|
|
|
|
|
|
Remark = "拆箱1"
|
|
|
|
|
|
};
|
|
|
|
|
|
Context.Insertable(packageLcl1).ExecuteCommand();
|
|
|
|
|
|
WmPackageLcl packageLcl2 = new()
|
|
|
|
|
|
{
|
|
|
|
|
|
Id = SnowFlakeSingle.instance.NextId().ToString(),
|
|
|
|
|
|
Partnumber = mainNowProduction.Partnumber,
|
|
|
|
|
|
PackageCode = jsonObject.newPatchCode2,
|
|
|
|
|
|
SerialNumber = jsonObject.serialNumber2,
|
|
|
|
|
|
LocationCode = "LS",
|
|
|
|
|
|
GoodsNum = jsonObject.secondNum ?? 0,
|
|
|
|
|
|
Team = "C",
|
|
|
|
|
|
Type = 2,
|
|
|
|
|
|
Status = 0,
|
|
|
|
|
|
CreatedBy = "拆箱",
|
|
|
|
|
|
CreatedTime = nowTime,
|
|
|
|
|
|
Remark = "拆箱2"
|
|
|
|
|
|
};
|
|
|
|
|
|
Context.Insertable(packageLcl2).ExecuteCommand();
|
|
|
|
|
|
Context.Ado.CommitTran();
|
|
|
|
|
|
return log;
|
|
|
|
|
|
}
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
{
|
|
|
|
|
|
Context.Ado.RollbackTran();
|
|
|
|
|
|
throw new Exception("生成打印标签信息异常!" + ex);
|
|
|
|
|
|
}
|
2024-04-26 11:22:33 +08:00
|
|
|
|
return log;
|
2024-04-19 14:00:33 +08:00
|
|
|
|
// 执行修改
|
|
|
|
|
|
// 1.主箱修改为1号分箱参数
|
|
|
|
|
|
WmGoodsNowProduction newPackage1 = mainNowProduction;
|
|
|
|
|
|
newPackage1.UpdatedBy = parm.CreateBy;
|
|
|
|
|
|
newPackage1.UpdatedTime = nowTime;
|
|
|
|
|
|
newPackage1.PackageCodeClient = newPatchCode1;
|
|
|
|
|
|
newPackage1.PackageCodeOriginal = "Code=" + newPatchCode1
|
|
|
|
|
|
+ "^ItemNumber=" + newPackage1.Partnumber
|
|
|
|
|
|
+ "^Order=" + newPatchCode1.Split('_')[0].Substring(2)
|
|
|
|
|
|
+ "^Qty=" + firstNum;
|
|
|
|
|
|
newPackage1.GoodsNumLogic = firstNum;
|
|
|
|
|
|
newPackage1.GoodsNumAction = firstNum;
|
|
|
|
|
|
newPackage1.Remark = "拆箱";
|
|
|
|
|
|
// 修改主箱
|
|
|
|
|
|
Context.Updateable(newPackage1).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
|
|
|
|
|
|
// 2.添加一个分箱
|
|
|
|
|
|
WmGoodsNowProduction newPackage2 = mainNowProduction;
|
|
|
|
|
|
newPackage2.CreatedBy = parm.CreateBy;
|
|
|
|
|
|
newPackage2.CreatedTime = nowTime;
|
|
|
|
|
|
newPackage2.PackageCodeClient = newPatchCode2;
|
|
|
|
|
|
newPackage2.PackageCodeOriginal = "Code=" + newPatchCode2
|
|
|
|
|
|
+ "^ItemNumber=" + newPackage2.Partnumber
|
|
|
|
|
|
+ "^Order=" + newPatchCode2.Split('_')[0].Substring(2)
|
|
|
|
|
|
+ "^Qty=" + secondNum;
|
|
|
|
|
|
newPackage2.GoodsNumLogic = secondNum;
|
|
|
|
|
|
newPackage2.GoodsNumAction = secondNum;
|
|
|
|
|
|
newPackage2.Remark = "拆箱";
|
|
|
|
|
|
newPackage2.Id = SnowFlakeSingle.Instance.NextId().ToString();
|
2024-04-22 11:12:58 +08:00
|
|
|
|
// 添加分箱
|
|
|
|
|
|
Context.Insertable(newPackage2).ExecuteCommand();
|
2024-04-19 14:00:33 +08:00
|
|
|
|
return log;
|
2024-04-18 11:34:49 +08:00
|
|
|
|
}
|
2024-04-22 12:25:20 +08:00
|
|
|
|
// 添加包装箱标签记录(暂不使用)
|
2024-04-22 11:12:58 +08:00
|
|
|
|
public void AddPackingrecord(WmGoodsNowProduction production,string workOrderId, bool isFill = false)
|
|
|
|
|
|
{
|
|
|
|
|
|
try
|
|
|
|
|
|
{
|
|
|
|
|
|
if(int.TryParse(production.PackageCodeClient.Split('_')[1], out int packageNum)) {
|
|
|
|
|
|
WmPackingrecord packingrecord = new()
|
|
|
|
|
|
{
|
|
|
|
|
|
PartNum = production.Partnumber,
|
|
|
|
|
|
Machine = "4",
|
|
|
|
|
|
ProductCode = "Iminate_P_0",
|
|
|
|
|
|
PackingCode = workOrderId + packageNum.ToString("00000"),
|
|
|
|
|
|
ScannerContent = production.PackageCodeOriginal,
|
|
|
|
|
|
WorkOrderNum = workOrderId,
|
|
|
|
|
|
BFilled = isFill,
|
|
|
|
|
|
CreateTime = DateTime.Now,
|
|
|
|
|
|
};
|
|
|
|
|
|
Context.Insertable(packingrecord).ExecuteCommand();
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
throw new Exception("包装箱标签批次号数量解析失败!");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
{
|
|
|
|
|
|
throw new Exception("包装箱标签插入失败!" + ex);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2024-04-18 11:34:49 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|