From 1f4210087ef6103acc1fe0cc8d751e069012d4d4 Mon Sep 17 00:00:00 2001
From: hlb <894797954@qq.com>
Date: Mon, 3 Jul 2023 11:56:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9MES=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Consts/WmsWareHouseConst.cs | 34 +++++++++++++++++++
.../Tnb.WarehouseMgr/WmsInStockService.cs | 30 +++++++++++-----
2 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
index f05c2dfb..7f6b7c93 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -192,6 +192,40 @@ namespace Tnb.WarehouseMgr.Entities.Consts
/// 载具规格-料架
///
public const string CARRY_LJSTD_ID = "26037267399717";
+ ///
+ /// 打印状态-未打印
+ ///
+ public const string PRINT_STATUS_NOTPRINTED = "26191366982437";
+ ///
+ /// 打印状态-打印中
+ ///
+ public const string PRINT_STATUS_PRINTING = "26191369755173";
+ ///
+ /// 打印状态-打印完成
+ ///
+ public const string PRINT_STATUS_PRINTCOMPLETE= "26191372853541";
+ ///
+ /// 同步状态-无需同步
+ ///
+ public const string SYNC_STATUS_NONEEDSYNC = "26191359047461";
+ ///
+ /// 同步状态-未同步
+ ///
+ public const string SYNC_STATUS__NOTSYNC = "26191345740069";
+ ///
+ /// 同步状态-同步中
+ ///
+ public const string SYNC_STATUS__SYNCING = "26191348846117";
+ ///
+ /// 同步状态-同步完成
+ ///
+ public const string SYNC_STATUS__SYNCCOMPLETE = "26191351559205";
+ ///
+ /// 同步状态-同步失败
+ ///
+ public const string SYNC_STATUS__SYNCFAILED = "26191354152229";
+
+
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
index 86b968c3..c424d449 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
@@ -240,21 +240,21 @@ namespace Tnb.WarehouseMgr
List instockds = new();
List instockcodes = new();
//入库申请主表
- if (input.data.ContainsKey("wmsInStock")) {
- instock = input.data.ContainsKey("wmsInStock").ToObject();
+ if (input.data.ContainsKey("wmsInStockH")) {
+ instock = input.data.ContainsKey("wmsInStockH").ToObject();
}
//入库申请物料明细表
- if (input.data.ContainsKey("instockds"))
+ if (input.data.ContainsKey("wmsInStockds"))
{
- if (input.data["instockds"] != null && input.data["instockds"].IsNotEmptyOrNull())
+ if (input.data["wmsInStockds"] != null && input.data["wmsInStockds"].IsNotEmptyOrNull())
{
- instockds = input.data["instockds"].ToObject>();
+ instockds = input.data["wmsInStockds"].ToObject>();
}
}
//入库申请条码明细表
- if (input.data.ContainsKey("instockcodes")) {
- if (input.data["instockcodes"] != null && input.data["instockcodes"].IsNotEmptyOrNull()) {
- instockcodes = input.data["instockcodes"].ToObject>();
+ if (input.data.ContainsKey("wmsInStockCodes")) {
+ if (input.data["wmsInStockCodes"] != null && input.data["wmsInStockCodes"].IsNotEmptyOrNull()) {
+ instockcodes = input.data["wmsInStockCodes"].ToObject>();
}
}
//如果数据不全，
@@ -266,12 +266,21 @@ namespace Tnb.WarehouseMgr
instock.id = SnowflakeIdHelper.NextId();
instock.biz_type = WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID;
instock.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_INSTOCK_ENCODE).GetAwaiter().GetResult();
+ instock.generate_type = "1";// 自动
+ instock.sync_status =WmsWareHouseConst.SYNC_STATUS__NOTSYNC;//未同步
+ instock.print_status = WmsWareHouseConst.PRINT_STATUS_PRINTCOMPLETE;//已打印
+ instock.status = WmsWareHouseConst.BILLSTATUS_ADD_ID;// 新增
+ instock.create_time = DateTime.Now;
await _db.Insertable(instock).ExecuteCommandAsync();
//明细表
foreach (var instockd in instockds)
{
instockd.id = SnowflakeIdHelper.NextId();
instockd.bill_id = instock.id;
+ instockd.line_status = WmsWareHouseConst.BILLSTATUS_ADD_ID;
+ instockd.qty = 0;
+ instock.create_time = instock.create_time;
+ instock.create_id = instock.create_id;
}
await _db.Insertable(instockds).ExecuteCommandAsync();
var items = instockds.Adapt>();
@@ -290,6 +299,9 @@ namespace Tnb.WarehouseMgr
c.bill_d_id = instockcodes.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id!;
c.barcode = instockcode.barcode;
c.codeqty = instockcode.codeqty;
+ c.is_end = 0;// 未结束
+ c.create_time = instock.create_time;
+ c.create_id = instock.create_id;
instockCOdes.Add(c);
}
}
@@ -380,7 +392,7 @@ namespace Tnb.WarehouseMgr
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault()!.location_id!;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault()!.location_code!;
preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList()!;
- if (input.data.ContainsKey("wmsInStock"))
+ if (input.data.ContainsKey("wmsInStockH"))
{
//创建预任务操作记录
var operBillId = string.Empty;
From c9013402660151f1320eaf502cd719306b783a59 Mon Sep 17 00:00:00 2001
From: alex
Date: Mon, 3 Jul 2023 11:58:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B7=AF=E6=AE=B5=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=EF=BC=8C=E8=B5=B7=E9=87=8D=E7=82=B9=E9=AA=8C=E8=AF=81=E5=A4=B1?=
=?UTF-8?q?=E6=95=88bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Tnb.WarehouseMgr/WmsInStockService.cs | 28 ++++++++++++-------
.../Tnb.WarehouseMgr/WmsOutStockService.cs | 11 +++++++-
.../Tnb.WarehouseMgr/WmsRouteMgrService.cs | 5 ++--
common/Tnb.Common/Extension/Extensions.cs | 10 +++++++
4 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
index 86b968c3..a09b78b6 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
@@ -9,6 +9,7 @@ using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Extension;
using JNPF.Common.Security;
using JNPF.FriendlyException;
+using JNPF.Logging;
using JNPF.Systems.Interfaces.System;
using Mapster;
using Microsoft.AspNetCore.Mvc;
@@ -210,7 +211,8 @@ namespace Tnb.WarehouseMgr
await _db.Updateable().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
//如果是自动单据，需要回更上层系统
}
- else {
+ else
+ {
//任务没有结束，更新状态为工作中
await _db.Updateable().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
}
@@ -230,8 +232,8 @@ namespace Tnb.WarehouseMgr
///
///
///
- //[HttpPost]
- private async Task MESCreateInstock(VisualDevModelDataCrInput input)
+ [HttpPost]
+ public async Task MESCreateInstock(VisualDevModelDataCrInput input)
{
try
{
@@ -240,8 +242,9 @@ namespace Tnb.WarehouseMgr
List instockds = new();
List instockcodes = new();
//入库申请主表
- if (input.data.ContainsKey("wmsInStock")) {
- instock = input.data.ContainsKey("wmsInStock").ToObject();
+ if (input.data.ContainsKey("wmsInStock"))
+ {
+ instock = input.data.ContainsKey("wmsInStock").ToObject();
}
//入库申请物料明细表
if (input.data.ContainsKey("instockds"))
@@ -252,13 +255,16 @@ namespace Tnb.WarehouseMgr
}
}
//入库申请条码明细表
- if (input.data.ContainsKey("instockcodes")) {
- if (input.data["instockcodes"] != null && input.data["instockcodes"].IsNotEmptyOrNull()) {
+ if (input.data.ContainsKey("instockcodes"))
+ {
+ if (input.data["instockcodes"] != null && input.data["instockcodes"].IsNotEmptyOrNull())
+ {
instockcodes = input.data["instockcodes"].ToObject>();
}
}
//如果数据不全，
- if (instock.IsNotEmptyOrNull() || instock.carry_id.IsEmpty()|| instock.location_id.IsEmpty() || instockds.Count<1 || instockcodes.Count<1) {
+ if (instock.IsNull() || instock.carry_id.IsEmpty() || instock.location_id.IsEmpty() || instockds.Count < 1 || instockcodes.Count < 1)
+ {
//报错， 提示数据不全。
throw new AppFriendlyException("数据不全！", 500);
}
@@ -279,6 +285,7 @@ namespace Tnb.WarehouseMgr
//条码表
foreach (var instockcode in instockcodes)
{
+ instockcode.id = SnowflakeIdHelper.NextId();
var materialId = instockcode.material_id;
var materialCode = instockcode.material_code;
var codeBatch = instockcode.code_batch;
@@ -293,10 +300,10 @@ namespace Tnb.WarehouseMgr
instockCOdes.Add(c);
}
}
- var orgId = _userManager.User.OrganizeId;
+ var orgId = _userManager.User.OrganizeId;
await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync();
-
+
//生成预任务申请
//入库取终点 //出库起点
var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = instock.warehouse_id, Size = 1 };
@@ -434,6 +441,7 @@ namespace Tnb.WarehouseMgr
}
catch (Exception ex)
{
+ JNPF.Logging.Log.Error(ex.Message);
await _db.Ado.RollbackTranAsync();
throw;
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index 44e952a1..eacce6b3 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Aop.Api.Domain;
+using JNPF.Common.Contracts;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Extension;
@@ -231,7 +232,7 @@ namespace Tnb.WarehouseMgr
var curPreTaskCodes = partCodes.Adapt>();
curPreTaskCodes.ForEach(x =>
{
- x.id=SnowflakeIdHelper.NextId();
+ x.id = SnowflakeIdHelper.NextId();
x.bill_id = pt.id;
x.create_time = DateTime.Now;
});
@@ -480,4 +481,12 @@ namespace Tnb.WarehouseMgr
}
}
}
+
+ public class TestTT
+ {
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public int id { get; set; }
+ [SugarColumn()]
+ public int status { get; set; }
+ }
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs
index 3c806096..8da9436f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs
@@ -25,13 +25,12 @@ namespace Tnb.WarehouseMgr
///
[OverideVisualDev(ModuleId)]
- public class WmsRouteMgrService : BaseWareHouseService, IWmsRouteMgrService,IPdaStroage
+ public class WmsRouteMgrService : BaseWareHouseService, IWmsRouteMgrService
{
- private const string ModuleId = "26100621140773";
+ private const string ModuleId = "26100621140773";//26100621140773
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
- public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public WmsRouteMgrService(ISqlSugarRepository repository, IRunService runService, IVisualDevService visualDevService)
{
diff --git a/common/Tnb.Common/Extension/Extensions.cs b/common/Tnb.Common/Extension/Extensions.cs
index 31a2e9a4..df2b983a 100644
--- a/common/Tnb.Common/Extension/Extensions.cs
+++ b/common/Tnb.Common/Extension/Extensions.cs
@@ -691,6 +691,16 @@ public static partial class Extensions
{
return ObjToString(thisValue) != string.Empty && ObjToString(thisValue) != "undefined" && ObjToString(thisValue) != "null";
}
+ ///
+ /// 是否为空
+ /// added by ly on 20230703
+ ///
+ ///
+ ///
+ public static bool IsNull(this object thisValue)
+ {
+ return thisValue == null;
+ }
#endregion