From 0db27b2ea4752d71db98745b76a1805db8f57aaf Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:10:49 +0800
Subject: [PATCH] 修改
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs | 14 ++++++-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs | 9 ++--
DBScript/02_DML/01_InitData.sql | 43 +++++++++++++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 9 +---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs | 5 +-
DBScript/01_DDL/04_DDL_INDEX.sql | 10 ++++
6 files changed, 74 insertions(+), 16 deletions(-)
diff --git a/DBScript/01_DDL/04_DDL_INDEX.sql b/DBScript/01_DDL/04_DDL_INDEX.sql
index 707a509..6438f2e 100644
--- a/DBScript/01_DDL/04_DDL_INDEX.sql
+++ b/DBScript/01_DDL/04_DDL_INDEX.sql
@@ -1 +1,9 @@
-/* 这里写整个系统的索引脚本 */
\ No newline at end of file
+/* 这里写整个系统的索引脚本 */
+
+-- 替代品编号创建一个新的唯一索引 update liuwq 2024-04-25
+CREATE UNIQUE INDEX idx_substitute_good_substituteCode
+ON wms_substitute_good (SubstituteCode);
+
+-- 客户编号创建一个新的唯一索引 update liuwq 2024-04-25
+CREATE UNIQUE INDEX idx_base_customer_custCode
+ON base_customer (CustCode);
\ No newline at end of file
diff --git a/DBScript/02_DML/01_InitData.sql b/DBScript/02_DML/01_InitData.sql
index f2613a0..6e36df0 100644
--- a/DBScript/02_DML/01_InitData.sql
+++ b/DBScript/02_DML/01_InitData.sql
@@ -20,3 +20,46 @@
INSERT INTO dbo.Base_SerialRuleDetail
(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
VALUES(14, N'1', 10, 5, N'SN', 3, 0, 1, NULL, 0, N'娴嬭瘯缂栧彿缂栧彿-娴佹按鍙�', NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+
+
+-- 鍒濆鍖� 鏇夸唬鍝佺紪鍙� 銆怑ditby liuwq,2024-04-25銆�
+ DELETE Base_SerialRuleDetail where SerialType =20;
+ GO
+
+ INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(20, N'1', 20, 1, N'UD', 15, 0, 1, N'SC_', 0, N'鏇夸唬鍝佺紪鍙�-鍓嶇紑', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(21, N'1', 20, 2, N'Y4', 4, 0, 1, NULL, 0, N'鏇夸唬鍝佺紪鍙�-骞翠唤', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(22, N'1', 20, 3, N'M2', 4, 0, 1, NULL, 0, N'鏇夸唬鍝佺紪鍙�-鏈堜唤', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(23, N'1', 20, 4, N'D2', 4, 0, 1, NULL, 0, N'鏇夸唬鍝佺紪鍙�-鏃�', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(24, N'1', 20, 5, N'SN', 3, 0, 1, NULL, 0, N'鏇夸唬鍝佺紪鍙�-娴佹按鍙�', NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+
+
+-- 鍒濆鍖� 瀹㈡埛缂栧彿 銆怑ditby liuwq,2024-04-25銆�
+ DELETE Base_SerialRuleDetail where SerialType =30;
+ GO
+
+ INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(30, N'1', 30, 1, N'UD', 15, 0, 1, N'BC_', 0, N'瀹㈡埛缂栧彿-鍓嶇紑', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(31, N'1', 30, 2, N'Y4', 4, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-骞翠唤', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(32, N'1', 30, 3, N'M2', 4, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-鏈堜唤', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(33, N'1', 30, 4, N'D2', 4, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-鏃�', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO dbo.Base_SerialRuleDetail
+(Id, SerialRuleNo, SerialType, ItemNo, SourceType, SerialLength, SearchStart, DecimalType, UserDefine, SerialCodeFlag, Description, SerialTypeNo, GetData, PadLeft, IssueStatus, CreatedTime, UpdatedTime, CreatedUserId, CreatedUserName, UpdatedUserId, UpdatedUserName, IsDeleted)
+VALUES(34, N'1', 30, 5, N'SN', 3, 0, 1, NULL, 0, N'瀹㈡埛缂栧彿-娴佹按鍙�', NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
index 0f9c112..9af5e09 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
@@ -155,7 +155,7 @@
public async Task Add(AddBaseCustomerInput input)
{
var baseCustomer = input.Adapt<BaseCustomer>();
- baseCustomer.CustCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString();//TODO 瑕佽皟鐢ㄧ敓鎴� 缂栧彿鐨勬柟娉� 鍏堢敤闆姳ID
+ baseCustomer.CustCode = await SerialUtil.GetSerial(EnumSerialType.瀹㈡埛缂栧彿);
baseCustomer.CustTypeName = baseCustomer.CustType.ToString();
//楠岃瘉
@@ -242,12 +242,11 @@
{
index++;
- //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
+ //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
+ var _custCode = await SerialUtil.GetSerial(EnumSerialType.瀹㈡埛缂栧彿);
var addItem = new BaseCustomer()
{
- CustCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),//TODO 瑕佽皟鐢ㄧ敓鎴� 缂栧彿鐨勬柟娉� 鍏堢敤闆姳ID
- CreatedTime = SysHelper.GetNowTime(),
+ CustCode = _custCode,//
CreatedUserId = SysHelper.GetUserId(),
CreatedUserName = SysHelper.GetUserName(),
UpdatedTime = SysHelper.GetNowTime(),
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
index f4f854e..037feb8 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
@@ -1,5 +1,6 @@
锘縰sing Admin.NET.Core;
using Admin.NET.Core.Service;
+using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
namespace Admin.NET.Application
@@ -203,7 +204,13 @@
/// 寰�鏉ュ叧绯昏緭鍏ュ弬鏁�
/// </summary>
public class BaseCustomerInput
- {
+ {
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [Comment("瀹㈡埛缂栧彿")]
+ [MaxLength(50)]
+ public string CustCode { get; set; }
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
@@ -265,7 +272,10 @@
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
+
+
+
}
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
index 697f97c..181de85 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
@@ -1,4 +1,5 @@
-锘縰sing Admin.NET.Core.Util.LowCode.Dto;
+锘縰sing Admin.NET.Core;
+using Admin.NET.Core.Util.LowCode.Dto;
using System;
namespace Admin.NET.Application
@@ -51,7 +52,7 @@
/// <summary>
/// ABC鍒嗙被
/// </summary>
- public int? ABCClass { get; set; }
+ public ABCClassEnum? ABCClass { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
index 1986e68..2f34e10 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -176,7 +176,7 @@
var wmsMaterialInfo =(await _wmsMaterialRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsMaterialOutput>();
//鑾峰彇鏇挎崲鐗╂枡淇℃伅
var wmsSubstituteGoods = await _wmsSubstituteGoodRep.DetachedEntities
- .Where(u => u.MaterialCode == wmsMaterialInfo.MaterialName)
+ .Where(u => u.MaterialCode == wmsMaterialInfo.MaterialCode)
.Where(u => u.IsDeleted == false)
.Where(u => u.IsDisabled == false)
.OrderBy(o => o.CreatedTime)
@@ -246,15 +246,13 @@
var materialCustomerList=new List<WmsMaterialCustomer>();
foreach (var baseCustomer in baseCustomerList)
{
-
- var _custCode= await SerialUtil.GetSerial(EnumSerialType.瀹㈡埛缂栧彿);
materialCustomerList.Add(new WmsMaterialCustomer()
{
CreatedTime = DateTime.Now,
CreatedUserId = CurrentUserInfo.UserId,
CreatedUserName = CurrentUserInfo.Name,
CustChinaName = baseCustomer.CustChinaName,
- CustCode = _custCode,
+ CustCode = baseCustomer.CustCode,
CustEnglishName = baseCustomer.CustEnglishName,
CustId = baseCustomer.Id,
MaterialCode = wmsMaterial.MaterialCode,
@@ -348,14 +346,13 @@
var materialCustomerList = new List<WmsMaterialCustomer>();
foreach (var baseCustomer in baseCustomerList)
{
- var _custCode = await SerialUtil.GetSerial(EnumSerialType.瀹㈡埛缂栧彿);
materialCustomerList.Add(new WmsMaterialCustomer()
{
CreatedTime = DateTime.Now,
CreatedUserId = CurrentUserInfo.UserId,
CreatedUserName = CurrentUserInfo.Name,
CustChinaName = baseCustomer.CustChinaName,
- CustCode = _custCode,
+ CustCode = baseCustomer.CustCode,
CustEnglishName = baseCustomer.CustEnglishName,
CustId = baseCustomer.Id,
MaterialCode = wmsMaterial.MaterialCode,
--
Gitblit v1.9.3