From ce86642feb81352ce43701fceda3ec59ce662905 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 16:46:42 +0800
Subject: [PATCH] 导出模板修改
---
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 1
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs | 1
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs | 1
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs | 71 ++++++++++++++
Weben_CMS专用代码生成器/Code/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Generate.cs | 5 +
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialContainer/WmsMaterialContainer.cs | 44 ++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs | 86 +++++++++++++++++
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 74 ++++++++++++++
8 files changed, 282 insertions(+), 1 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
index c4e2357..53210fd 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
@@ -1,4 +1,5 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CmsQueryExtensions;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs
new file mode 100644
index 0000000..50371c2
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs
@@ -0,0 +1,86 @@
+锘縰sing Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder
+{
+ /// <summary>
+ /// 鍑哄叆搴撳崟鎹�
+ /// </summary>
+ public class WmsInOutOrder
+ {
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string? MaterialName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡浠跺彿
+ /// </summary>
+ public string MaterialNo { get; set; }
+
+ /// <summary>
+ /// 鍏宠仈璁″垝缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鍏宠仈璁″垝缂栧彿", Length = 32)]
+ public string? PlanNo { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "StockType", ColumnDescription = "鎿嶄綔绫诲瀷")]
+ //public OperationType StockType { get; set; }
+ public StockType StockType { get; set; }
+
+ /// <summary>
+ /// 瀹瑰櫒缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ContainerNo", ColumnDescription = "瀹瑰櫒缂栧彿", Length = 32)]
+ public string? ContainerNo { get; set; }
+
+ /// <summary>
+ /// 鏈哄瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "MaterialModel", ColumnDescription = "鏈哄瀷", Length = 32)]
+ public string? MaterialModel { get; set; }
+
+ /// <summary>
+ /// 涓嬪彂鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DistributeNumber", ColumnDescription = "涓嬪彂鏁伴噺")]
+ public int? DistributeNumber { get; set; }
+
+ /// <summary>
+ /// 瀹屾垚鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CompleteNumber", ColumnDescription = "瀹屾垚鏁伴噺")]
+ public int? CompleteNumber { get; set; }
+
+ /// <summary>
+ /// 寮傚父鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "ExceptNumber", ColumnDescription = "寮傚父鏁伴噺")]
+ public int? ExceptNumber { get; set; }
+ /// <summary>
+ /// 鎿嶄綔鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "OperateTime", ColumnDescription = "鎿嶄綔鏃堕棿")]
+ public DateTime? OperateTime { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞", Length = 500)]
+ public string? Remark { get; set; }
+
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialContainer/WmsMaterialContainer.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialContainer/WmsMaterialContainer.cs
new file mode 100644
index 0000000..da1eea8
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialContainer/WmsMaterialContainer.cs
@@ -0,0 +1,44 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CMS.Plugin.HIAWms.Domain.WmsMaterialContainer
+{
+ /// <summary>
+ /// 鐗╂枡瀹瑰櫒鍏崇郴
+ /// </summary>
+ public class WmsMaterialContainer : FullAuditedAggregateRoot<Guid>
+ {
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string ContainerNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡Id
+ /// </summary>
+ public string MaterialId { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// Adjusts the sort.
+ /// </summary>
+ /// <param name="sort">The sort.</param>
+ public void AdjustSort(int sort)
+ {
+ Sort = sort;
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs
new file mode 100644
index 0000000..8538dd8
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs
@@ -0,0 +1,71 @@
+锘縰sing CMS.Plugin.HIAWms.Domain;
+using CMS.Plugin.HIAWms.Domain.WmsContainerPlaces;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialContainer;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+
+namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions
+{
+ public static partial class CMSPluginEfCoreExtensions
+ {
+ /// <summary>
+ /// Includes the details.
+ /// </summary>
+ /// <param name="queryable">The queryable.</param>
+ /// <param name="include">if set to <c>true</c> [include].</param>
+ /// <returns></returns>
+ public static IQueryable<WmsMaterialContainer> IncludeDetails(this IQueryable<WmsMaterialContainer> queryable, bool include = true)
+ {
+ if (!include)
+ {
+ return queryable;
+ }
+
+ return queryable;
+ }
+
+ /// <summary>
+ /// Configures the WMS container place relationship.
+ /// </summary>
+ /// <param name="builder">The builder.</param>
+ public static void ConfigureWmsMaterialContainer(this ModelBuilder builder)
+ {
+ Check.NotNull(builder, nameof(builder));
+
+ builder.Entity<WmsMaterialContainer>(b =>
+ {
+ b.ToTable((CMSPluginDbProperties.DbTablePrefix + "WmsMaterialContainer").ToLower(), CMSPluginDbProperties.DbSchema)
+ .HasComment("鐗╂枡瀹瑰櫒鍏崇郴琛�");
+
+ b.ConfigureByConvention();
+ // 涓婚敭閰嶇疆
+ b.HasKey(x => x.Id);
+ // Properties
+ b.Property(x => x.MaterialId)
+ .HasMaxLength(64)
+ .IsRequired()
+ .HasComment("鐗╂枡ID");
+
+ b.Property(x => x.ContainerNo)
+ .HasMaxLength(50)
+ .IsRequired()
+ .HasComment("鎵樼洏缂栧彿");
+
+ // Composite primary key
+ b.HasKey(x => new { x.MaterialId, x.ContainerNo });
+
+ // Indexes
+ b.HasIndex(x => x.MaterialId);
+ b.HasIndex(x => x.ContainerNo);
+
+ b.ApplyObjectExtensionMappings();
+ });
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs
index 42bb4a7..ba2a7b3 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs
@@ -42,6 +42,7 @@
builder.ConfigureWmsInOutStockRecord();
builder.ConfigureWmsContainerPlace();
builder.ConfigureWmsTask();
+ builder.ConfigureWmsMaterialContainer();
/* Configure your own tables/entities inside here */
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Generate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Generate.cs"
index 0e8dabf..8ad48ab 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Generate.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Generate.cs"
@@ -26,6 +26,11 @@
str = str.Replace("$EntityNameClass_enumOptions$", attrString);
+ attrString = "";
+ attrString += StructStrHelper.GetVueFormOptionsStrForPageAdd_QueryTableListForBool(param.ColumnNameList, param);
+ str = str.Replace("$QueryTableListForBool$", attrString);
+
+
attrString = "";
attrString += StructStrHelper.GetVueFormOptionsStr_EntityNameClass_fetchEnumData(param.ColumnNameList, param);
str = str.Replace("$EntityNameClass_fetchEnumData$", attrString);
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
index ca053ba..0231077 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
@@ -183,6 +183,7 @@
isHidePagination={isHidePagination}
pageSize={20}
v-slots={{
+ $QueryTableListForBool$
name: ({ row }: any) => {
return row?.name ? (
<TdButton
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
index 4eba488..4bc6468 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
@@ -1907,7 +1907,7 @@
isWriteInt = false;
}
}
- if(isWriteInt)
+ if (isWriteInt)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
sb.Append(" return h(inputNumber, { \n");
@@ -2360,6 +2360,78 @@
}
}
+ public static string GetVueFormOptionsStrForPageAdd_QueryTableListForBool(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+
+ isRead: ({ row }: any) => {
+ return (
+ <div>
+ {row.isRead != null ? (row.isRead ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+ },
+
+ creationTime: ({ row }: any) => {
+ return (
+ <div>
+ {row.creationTime != null
+ ? dayjs(row.creationTime).format('YYYY-MM-DD HH:mm:ss')
+ : '-'}
+ </div>
+ )
+ },
+
+ */
+
+ foreach (var columnModel in columnModelList)
+ {
+ //灞炴�у皬鍐�
+ var instanceColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ //鑾峰彇鏁版嵁绫诲瀷
+ DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+ switch (enumDT)
+ {
+ case DataTypeEnum.dt_datetime:
+ sb.Append(instanceColumnName + ": ({ row }: any) => { \n");
+ sb.Append(" return ( \n");
+ sb.Append(" <div> \n");
+ sb.Append(" {row." + instanceColumnName + " != null \n");
+ sb.Append(" ? dayjs(row." + instanceColumnName + ").format('YYYY-MM-DD HH:mm:ss') \n");
+ sb.Append(" : '-'} \n");
+ sb.Append(" </div> \n");
+ sb.Append(" ) \n");
+ sb.Append("},\n");
+ break;
+
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
+ sb.Append(instanceColumnName + ": ({ row }: any) => { \n");
+ sb.Append(" return ( \n");
+ sb.Append(" <div> \n");
+ sb.Append(" {row." + instanceColumnName + " != null ? (row." + instanceColumnName + " ? '鏄�' : '鍚�') : '-'} \n");
+ sb.Append(" </div> \n");
+ sb.Append(" ) \n");
+ sb.Append("},\n");
+ break;
+ }
+
+ }
+
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
/// <summary>
/// 鑾峰彇VUE 瀵煎嚭鏁扮粍瀛楃涓�-姹夊瓧+灞炴��
/// </summary>
--
Gitblit v1.9.3