From 6d0e2e0068ea481f94caf53cb5198ceb622fb7ed Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Wed, 7 May 2025 15:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E6=9D=A1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 30 +++++++++++++++++++
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 15 ++++++++++
src/WMS.Web.Core/Dto/OpsBoxResponse.cs | 20 ++++++++++++-
.../SerialNumbers/SerialNumbersWmsResponse.cs | 13 ++++++++
src/WMS.Web.Domain/Entitys/SerialNumbers.cs | 28 +++++++++++++----
src/WMS.Web.Domain/Services/BoxService.cs | 2 +-
.../Services/SerialNumberService.cs | 4 +--
7 files changed, 102 insertions(+), 10 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 7e7ced9e..4d8867c6 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -5245,6 +5245,21 @@
序列号生成用户
+
+
+ 是否套装
+
+
+
+
+ 第二个序列号
+
+
+
+
+ 是否不参与记数
+
+
物料编码
@@ -6385,6 +6400,21 @@
生成时间
+
+
+ 是否套装
+
+
+
+
+ 第二个序列号
+
+
+
+
+ 是否不参与记数
+
+
ID请求对象
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 6bb2b1ca..8f9293af 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2334,6 +2334,21 @@
是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
+
+
+ 产生第二个
+
+
+
+
+ 是否套装
+
+
+
+
+ 是否不参与记数
+
+
操作(绑定箱信息)
diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
index 5ecacc97..b8f0b7cc 100644
--- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
+++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
@@ -73,7 +73,25 @@ namespace WMS.Web.Core.Dto
///
[JsonProperty("barCereateUser")]
public string BarCereateUser { get; set; }
-
+
+ ///
+ /// 是否套装
+ ///
+ [JsonProperty("isTwo")]
+ public int IsTwo { get; set; }
+ ///
+ /// 第二个序列号
+ ///
+ [JsonProperty("twoSerialNumber")]
+ public string TwoSerialNumber { get; set; }
+ ///
+ /// 是否不参与记数
+ ///
+ [JsonProperty("isNotCount")]
+ public string IsNotCount { get; set; }
+
+
+
}
public class OpsBoxDetailsResponse {
///
diff --git a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
index c8dafe87..16e7459c 100644
--- a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
+++ b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
@@ -27,5 +27,18 @@ namespace WMS.Web.Core.Dto.SerialNumbers
/// 生成时间
///
public DateTime CreateTime { get; set; } = DateTime.Now;
+ ///
+ /// 是否套装
+ ///
+ public int IsTwo { get; set; }
+ ///
+ /// 第二个序列号
+ ///
+ public string TwoSerialNumber { get; set; }
+ ///
+ /// 是否不参与记数
+ ///
+ public string IsNotCount { get; set; }
+
}
}
diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
index 245f1f13..c5eede70 100644
--- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
+++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
@@ -17,7 +17,7 @@ namespace WMS.Web.Domain.Entitys
public class SerialNumbers : EntityBase
{
public SerialNumbers() { }
- public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime)
+ public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount)
{
this.SerialNumber = serialNumber;
this.MaterialNumber = materialNumber;
@@ -26,6 +26,9 @@ namespace WMS.Web.Domain.Entitys
this.Creator = creator;
this.CreateTime = createTime == null ? DateTime.Now : (DateTime)createTime;
this.CompleteCartonTime = completeCartonTime;
+ this.IsTwo = isTwo;
+ this.TwoSerialNumber = twoSerialNumber;
+ this.IsNotCount = isNotCount;
}
///
/// 主键 订单编号
@@ -102,11 +105,24 @@ namespace WMS.Web.Domain.Entitys
///
[Column("IsActivate")]
public bool? IsActivate { get; set; } = false;
- /////
- ///// 产生第二个
- /////
- //[Column("TwoSerialNumber")]
- //public string? TwoSerialNumber { get; set; } = string.Empty;
+ ///
+ /// 产生第二个
+ ///
+ [Column("TwoSerialNumber")]
+ public string TwoSerialNumber { get; set; } = string.Empty;
+
+ ///
+ /// 是否套装
+ ///
+ [Column("isTwo")]
+ public int? IsTwo { get; set; }
+
+ ///
+ /// 是否不参与记数
+ ///
+ [Column("isNotCount")]
+ public string IsNotCount { get; set; }= string.Empty;
+
///
/// 操作(绑定箱信息)
diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs
index 604e33e8..20f18a31 100644
--- a/src/WMS.Web.Domain/Services/BoxService.cs
+++ b/src/WMS.Web.Domain/Services/BoxService.cs
@@ -111,7 +111,7 @@ namespace WMS.Web.Domain.Services
//SerialNumbers s = new SerialNumbers(serialList[i].SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime);
//sList.Add(s);
- SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime);
+ SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount);
sList.Add(s);
//序列号记录(序列号生成)
SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialNumber, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime);
diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs
index 36137579..5e8eb0c7 100644
--- a/src/WMS.Web.Domain/Services/SerialNumberService.cs
+++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs
@@ -489,7 +489,7 @@ namespace WMS.Web.Domain.Services
if (s_entity == null)
{
//序列号
- SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now);
+ SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0");
sList.Add(s_new);
}
else
@@ -594,7 +594,7 @@ namespace WMS.Web.Domain.Services
_logger.LogInformation($"拉取供应链系统条码结果:->{JsonConvert.SerializeObject(res)}");
//插入序列码信息
SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber
- , 0, 0, res.Data.Creator, res.Data.CreateTime, null);
+ , 0, 0, res.Data.Creator, res.Data.CreateTime, null,res.Data.IsTwo, res.Data.TwoSerialNumber,res.Data.IsNotCount);
var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity });
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);