From 9eaf758e97367dbc2eca2bdbdc92ab39e08be9d0 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 15 5月 2025 13:12:17 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 32 ++++-
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs | 5
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs | 10
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj | 2
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/TestStudent/TestStudent.cs | 128 +++++++++++++++++++++
PipeLineLems.PDA/pages/home/index.vue | 6
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs | 10
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj | 4
PipeLineLems.PDA/pages/bind/index.vue | 2
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs | 10
PipeLineLems.PDA/pages/pick/index.vue | 39 +++--
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs | 75 +++++++++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS - Backup.Plugin.HIAWms.Domain.csproj | 31 +++++
14 files changed, 292 insertions(+), 64 deletions(-)
diff --git a/PipeLineLems.PDA/pages/bind/index.vue b/PipeLineLems.PDA/pages/bind/index.vue
index b737d55..8e8d0de 100644
--- a/PipeLineLems.PDA/pages/bind/index.vue
+++ b/PipeLineLems.PDA/pages/bind/index.vue
@@ -16,7 +16,7 @@
<EasyPicker :visible.sync="ctVisible" :list="ContainerType" labelField="value" valueField="code"
@select="getTypeVal" />
- <scan-input-form-item v-show="Boolean(containerInfo.containerNo)" class="forma-item" label="鐗╂枡浜岀淮鐮�" v-model="form.materialNo" :msg="msg.material"
+ <scan-input-form-item class="forma-item" label="鐗╂枡浜岀淮鐮�" v-model="form.materialNo" :msg="msg.material"
:msg-type="msgType.material" @search="onSearchMaterial" @clear="onClearMaterial" />
<!-- <scan-input-form-item v-show="Boolean(containerInfo.containerNo)" placeholder="璇烽�夋嫨" :clearable="false" :hasScan="false" :hasSearch="false"
diff --git a/PipeLineLems.PDA/pages/home/index.vue b/PipeLineLems.PDA/pages/home/index.vue
index f4a6c52..ed0b5d7 100644
--- a/PipeLineLems.PDA/pages/home/index.vue
+++ b/PipeLineLems.PDA/pages/home/index.vue
@@ -111,10 +111,10 @@
this.blocks = [{
workShopName: '鍒嗘嫞',
wmsPdaPowerOutput:[
- // {icon:'icon-worker',code:'bind',name:'缁勭洏',color:'#1e90ff'},
+ {icon:'icon-worker',code:'bind',name:'缁勭洏',color:'#1e90ff'},
{icon:'icon-worker',code:'pick',name:'鍒嗘嫞',color:'#1e90ff'},
- // {icon:'icon-worker',code:'bindInForLocation',name:'鍒嗘嫞',color:'#1e90ff'},
- // {icon:'icon-worker',code:'bindWXJ',name:'鍒嗘嫞',color:'#1e90ff'},
+ {icon:'icon-worker',code:'bindInForLocation',name:'缁勭洏2',color:'#1e90ff'},
+ {icon:'icon-worker',code:'bindWXJ',name:'缁勭洏3',color:'#1e90ff'},
]
},
{
diff --git a/PipeLineLems.PDA/pages/pick/index.vue b/PipeLineLems.PDA/pages/pick/index.vue
index 2b890a1..94f90d9 100644
--- a/PipeLineLems.PDA/pages/pick/index.vue
+++ b/PipeLineLems.PDA/pages/pick/index.vue
@@ -20,17 +20,6 @@
:msg-type="msgType.material"
@search="onSearchMaterial"
@clear="onClearMaterial"
-
- />
- <scan-input-form-item
- placeholder="璇烽�夋嫨"
- :clearable="false"
- :hasScan="false"
- :hasSearch="false"
- @click.native="visible = true"
- class="forma-item"
- label="閫夋嫨搴撳彛"
- v-model="form.site"
/>
<EasyPicker :visible.sync="visible" :list="placeList.filter(item=>item.placeNo!='ZDCR')" labelField="placeNo" valueField="placeNo" @select="getSiteVal"/>
<!-- <EasyPicker :visible.sync="visible" :list="placeList" labelField="placeNo" valueField="placeNo" @select="getSiteVal" /> -->
@@ -197,13 +186,29 @@
return false;
}
this.msg.material = '';
+ debugger
+ // 瑙ｆ瀽绠℃缂栫爜銆佺娈靛悕绉板拰鑸瑰彿
+ const parts = this.form.pipeSpecCode.split(',');
+ if (parts.length < 2) {
+ this.msg.material = '鐮佹牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ緭鍏�';
+ return false;
+ }
+ const pipeCode = parts[0];
+ const pipeName = parts.length > 1? parts[1] : '';
+ const shipNo = parts.length > 2? parts[2] : '';
+
try {
- let { result } = await getContainerInfo({ ContainerNo: this.form.pipeSpecCode });
- if (result.containerNo == this.form.containterCode) {
- return this.$modal('褰撳墠绌烘墭涓庢墭鐩橀噸澶�');
- }
- var isExit = this.contaninerData.some((item) => item.containerNo == result.containerNo);
- isExit ? '' : this.contaninerData.push(result);
+ // let { result } = await getContainerInfo({ ContainerNo: this.form.pipeSpecCode });
+ // if (result.containerNo == this.form.containterCode) {
+ // return this.$modal('褰撳墠绌烘墭涓庢墭鐩橀噸澶�');
+ // }
+ // var isExit = this.materialList.some((item) => item.materialNo == pipeCode);
+ // if(isExit){
+ // return this.$modal('褰撳墠绠℃缂栫爜'+pipeCode+'宸茬粡鍦ㄦ墭鐩�'+this.form.containerNo+'涓�');
+ // }
+ // 鏇存柊鎻愮ず淇℃伅
+ this.msg.material = `绠℃缂栫爜:${pipeCode},绠℃鍚嶇О:${pipeName},鑸瑰彿:${shipNo}`;
+ this.form.pipeSpecCode=pipeCode;
} catch (e) {
//TODO handle the exception
console.log(e);
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
index 49f8699..092fd0e 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
@@ -18,6 +18,11 @@
/// </summary>
public string PipeSpecCode { get; set; }
+ /// <summary>
+ /// 鍒嗘嫞鎵樼洏鍙�
+ /// </summary>
+ public string ContinerNo { get; set; }
+
}
}
\ No newline at end of file
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
index c3dc2d5..9e1d4b1 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -34,12 +34,20 @@
public class SharedService : CMSPluginAppService
{
-
+ /// <summary>
+ /// 鍒嗘嫞鍔熻兘
+ /// </summary>
+ /// <param name="_serviceProvider"></param>
+ /// <param name="input"></param>
+ /// <param name="myCurrentUser"></param>
+ /// <returns></returns>
public async Task<MesOrderResponse> CommonPick(IServiceProvider _serviceProvider, PickInput input, MyCurrentUser myCurrentUser)
{
//1銆佽褰曞垎鎷ｈ褰曡〃
//2銆佹洿鏂颁綔涓氳鍒掕〃鐨勭姸鎬� =宸插垎鎷�
//3銆佸啓鍏� 鍒嗘嫞鍙橀噺
+ //4銆佸啓鍏ヨ拷婧姤琛�
+ //5銆佺墿鏂欑粍鐩�
VariableService _variableService = _serviceProvider.GetRequiredService<VariableService>();
var _workSectionManager = _serviceProvider.GetRequiredService<IWorkSectionManager>();
@@ -48,13 +56,13 @@
var materialProvider = _serviceProvider.GetRequiredService<IMaterialProvider>();
var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
- Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
- {
- { "鍒嗘嫞鎵樼洏鍙�","鎵樼洏1"},
- { "鍒嗘嫞鏂瑰悜", "鐭瑁呴厤"},
- { "鍒嗘嫞浜�", myCurrentUser.UserAccount }
- };
- _variableService.WriteValueAsync(keyValuePairs);
+ //Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
+ // {
+ // { "鍒嗘嫞鎵樼洏鍙�","鎵樼洏1"},
+ // { "鍒嗘嫞鏂瑰悜", "鐭瑁呴厤"},
+ // { "鍒嗘嫞浜�", myCurrentUser.UserAccount }
+ // };
+ //_variableService.WriteValueAsync(keyValuePairs);
//鏍规嵁宸ュ簭鍚嶈幏鍙栧伐搴忓璞�
var workSection = await _workSectionManager.GetByNameAsync("鍒嗘嫞宸ュ簭");
@@ -129,6 +137,14 @@
{
_value = "鐭瑁呴厤";
}
+ if (item.Name == "鍒嗘嫞鎵樼洏鍙�")
+ {
+ _value = input.ContinerNo;
+ }
+ if (item.Name == "鍒嗘嫞浜�")
+ {
+ _value = myCurrentUser.UserAccount;
+ }
//item.Key
TraceParamModel traceParamModel = new TraceParamModel()
{
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
index afdd362..68c31db 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
@@ -70,7 +70,7 @@
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<CallMaterialOrderDto> CreateAsync(CallMaterialOrderCreateDto input)
{
@@ -83,7 +83,7 @@
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<CallMaterialOrderDto> UpdateAsync(Guid id, CallMaterialOrderUpdateDto input)
@@ -96,7 +96,7 @@
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<CallMaterialOrderDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
@@ -109,7 +109,7 @@
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
@@ -122,7 +122,7 @@
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs
index 84d8020..123e408 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs
@@ -63,7 +63,7 @@
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<CallMaterialOrderRecordDto> CreateAsync(CallMaterialOrderRecordCreateDto input)
{
@@ -76,7 +76,7 @@
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<CallMaterialOrderRecordDto> UpdateAsync(Guid id, CallMaterialOrderRecordUpdateDto input)
@@ -89,7 +89,7 @@
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<CallMaterialOrderRecordDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
@@ -102,7 +102,7 @@
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
@@ -115,7 +115,7 @@
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
index bc77738..1ebb01c 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
@@ -67,7 +67,7 @@
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<WorkPlanDto> CreateAsync(WorkPlanCreateDto input)
{
@@ -80,7 +80,7 @@
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<WorkPlanDto> UpdateAsync(Guid id, WorkPlanUpdateDto input)
@@ -93,7 +93,7 @@
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<WorkPlanDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
@@ -106,7 +106,7 @@
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
@@ -119,7 +119,7 @@
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
index e8c4fd2..b027c3f 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
@@ -3,6 +3,7 @@
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
using CmsQueryExtensions.Entitys;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Reflection;
@@ -54,6 +55,7 @@
/// </summary>
/// <param name="input">鏍囪瘑绗�.</param>
/// <returns></returns>
+ [Authorize]
[HttpPost]
[Route("Pick")]
public virtual async Task<MesOrderResponse> Pick([FromBody] PickInput input)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
index ed7599c..9755550 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
@@ -21,6 +21,7 @@
using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder;
using System.Collections.Generic;
using CMS.Framework.AspNetCore.Users;
+using NPOI.SS.Formula.Functions;
namespace CMS.Plugin.PipeLineLems.ProjectService
{
@@ -146,7 +147,7 @@
_logger.LogInformation($"{changed.Name} 鍙橀噺鍊煎彂鐢熷彉鍖栵紝鏃у�納oldValue}=鏂板�納newValue}锛孴raceId={traceId}");
- if (changed.Name == "璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙�" && changed.New?.Value.SafeString().ToBool() == true)
+ if (changed.Name == "璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙�")
{
// TODO: 澶勭悊鍙橀噺鍊煎彉鍖�
@@ -159,15 +160,21 @@
锛�4锛夊苟鍙戠鐞嗭細 濡傛灉涓氬姟灞傚苟鍙戦噺澶э紝蹇呴』浼樺寲浠ｇ爜璁捐鍜屽疄鏂斤紝浠ュ噺灏戝湪楂樺苟鍙戞儏鍐典笅鐨勭郴缁熻祫婧愭秷鑰楋紝闃叉绯荤粺鎬ц兘闂銆�
锛�5锛変唬鐮佸畨鍏細 瀹夎骞朵娇鐢� CMS.CodeAnalysis 鍒嗘瀽鍣ㄦ潵鍒嗘瀽 IVariableDataCache.TagChanged 鐨勪娇鐢ㄦ儏鍐点�傝宸ュ叿鑳藉湪浣跨敤涓嶅綋鏃舵彁渚涚紪璇戦敊璇紝甯姪鎮ㄦ彁楂樹唬鐮佽川閲忋��*/
- _ = Task.Run(async () =>
+ if (changed.New?.Value.SafeString().ToBool() == true)
{
- await HanlderForPringBarCodeByCreateProductAsync();
- // 渚�1锛氬悓姝ュ鐞�
- //await ProcessAsync();
+ _ = Task.Run(async () =>
+ {
+ await HanlderForPringBarCodeByCreateProductAsync();
+ });
+ }
+ else
+ {
- // 渚�2锛氳皟鐢ㄥ閮ˋPI
- //await ExecuteExternalApiAsync();
- });
+ _ = Task.Run(async () =>
+ {
+ await HanlderForPringBarCodeByCreateProductWhenFalseAsync();
+ });
+ }
}
if (changed.Name == "鎵撶爜杩涚珯淇″彿" && changed.New?.Value.SafeString().ToBool() == true)
@@ -221,7 +228,7 @@
}
- if (changed.Name == "璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙�" && changed.New?.Value.SafeString().ToBool() == true)
+ if (changed.Name == "璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙�")
{
// TODO: 澶勭悊鍙橀噺鍊煎彉鍖�
@@ -234,15 +241,20 @@
锛�4锛夊苟鍙戠鐞嗭細 濡傛灉涓氬姟灞傚苟鍙戦噺澶э紝蹇呴』浼樺寲浠ｇ爜璁捐鍜屽疄鏂斤紝浠ュ噺灏戝湪楂樺苟鍙戞儏鍐典笅鐨勭郴缁熻祫婧愭秷鑰楋紝闃叉绯荤粺鎬ц兘闂銆�
锛�5锛変唬鐮佸畨鍏細 瀹夎骞朵娇鐢� CMS.CodeAnalysis 鍒嗘瀽鍣ㄦ潵鍒嗘瀽 IVariableDataCache.TagChanged 鐨勪娇鐢ㄦ儏鍐点�傝宸ュ叿鑳藉湪浣跨敤涓嶅綋鏃舵彁渚涚紪璇戦敊璇紝甯姪鎮ㄦ彁楂樹唬鐮佽川閲忋��*/
- _ = Task.Run(async () =>
+ if (changed.New?.Value.SafeString().ToBool() == true)
{
- await HanlderForCutByCreateProductAsync();
- // 渚�1锛氬悓姝ュ鐞�
- //await ProcessAsync();
-
- // 渚�2锛氳皟鐢ㄥ閮ˋPI
- //await ExecuteExternalApiAsync();
- });
+ _ = Task.Run(async () =>
+ {
+ await HanlderForCutByCreateProductAsync();
+ });
+ }
+ else
+ {
+ _ = Task.Run(async () =>
+ {
+ await HanlderForCutByCreateProductWhenFlaseAsync();
+ });
+ }
}
}
}
@@ -447,6 +459,7 @@
Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
{
{ "鎵撶爜_ProductID", productID},
+ { "CMS鍙嶉璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙风粨鏋�", true},
};
var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
@@ -468,6 +481,19 @@
throw;
}
}
+ }
+
+ /// <summary>
+ /// 璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙�(鍊间负false鐨勬椂鍊�)
+ /// </summary>
+ /// <returns></returns>
+ private async Task HanlderForPringBarCodeByCreateProductWhenFalseAsync()
+ {
+ Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
+ {
+ { "CMS鍙嶉璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙风粨鏋�", false},
+ };
+ var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
}
@@ -704,6 +730,7 @@
Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
{
{ "鍒囧壊_ProductID", productID},
+ { "CMS鍙嶉璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙风粨鏋�", true},
};
var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
@@ -734,5 +761,19 @@
}
}
}
+
+ /// <summary>
+ /// 璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙凤紙鍊间负false鐨勬椂鍊欙級
+ /// </summary>
+ /// <returns></returns>
+ private async Task HanlderForCutByCreateProductWhenFlaseAsync()
+ {
+
+ Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
+ {
+ { "CMS鍙嶉璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙风粨鏋�", false},
+ };
+ var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
+ }
}
}
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS - Backup.Plugin.HIAWms.Domain.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS - Backup.Plugin.HIAWms.Domain.csproj"
new file mode 100644
index 0000000..5ed57e4
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS - Backup.Plugin.HIAWms.Domain.csproj"
@@ -0,0 +1,31 @@
+锘�<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.Settings" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.Caching" Version="$(ABPPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.HIAWms.Abstractions\CMS.Plugin.HIAWms.Abstractions.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain.Shared\CMS.Plugin.HIAWms.Domain.Shared.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Reference Include="CmsQueryExtensions">
+ <HintPath>..\..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="TestStudent\" />
+ </ItemGroup>
+
+</Project>
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj"
index c04520e..caef156 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj"
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+锘�<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../common.props" />
<Import Project="../../configureawait.props" />
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/TestStudent/TestStudent.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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/TestStudent/TestStudent.cs"
new file mode 100644
index 0000000..e093839
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/TestStudent/TestStudent.cs"
@@ -0,0 +1,128 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CMS.Plugin.HIAWms.Domain.Shared.TestStudent;
+using CMS.Plugin.MyExtension.Domain;
+using CmsQueryExtensions.Extension;
+using MathNet.Numerics;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CMS.Plugin.HIAWms.Domain.TestStudent
+{
+ /// <summary>
+ /// TestStudent
+ /// </summary>
+ public class TestStudent : MyFullAuditedAggregateRoot<Guid>
+ {
+ /// <summary>
+ /// 閲嶅鎬ф牎楠屾柟寮�
+ /// </summary>
+ ///
+ [Comment("閲嶅鎬ф牎楠屾柟寮�")]
+ [Column("WorkingHours",)]
+ [SugarColumn(ColumnName = "RepCheckType", ColumnDescription = "閲嶅鎬ф牎楠屾柟寮�")]
+ public string? RepCheckType { get; set; }
+
+
+ /// <summary>
+ /// 鑰佸笀ID(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "TeacherId", ColumnDescription = "鑰佸笀ID(鍙┖)")]
+ public long? TeacherId { get; set; }
+
+ /// <summary>
+ /// 鑰佸笀鍚嶅瓧(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "TeacherName", ColumnDescription = "鑰佸笀鍚嶅瓧(鍙┖)")]
+ public string? TeacherName { get; set; }
+
+ /// <summary>
+ /// 瀛︾敓濮撳悕
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "Name", ColumnDescription = "瀛︾敓濮撳悕", Length = 2000)]
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍒悕(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "AliName", ColumnDescription = "鍒悕(鍙┖)", Length = 2000)]
+ public string? AliName { get; set; }
+
+ /// <summary>
+ /// 瀛︾敓骞撮緞
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "Age", ColumnDescription = "瀛︾敓骞撮緞")]
+ public int Age { get; set; }
+
+ /// <summary>
+ /// 骞寸邯(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "NianJi", ColumnDescription = "骞寸邯(鍙┖)")]
+ public int? NianJi { get; set; }
+
+
+
+ /// <summary>
+ /// 鏍￠暱ID(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "RectorId", ColumnDescription = "鏍￠暱ID(鍙┖)")]
+ public long? RectorId { get; set; }
+
+ /// <summary>
+ /// 闆惰姳閽�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "HasMoney", ColumnDescription = "闆惰姳閽�", Length = 10, DecimalDigits = 3)]
+ public decimal HasMoney { get; set; }
+
+ /// <summary>
+ /// 韬环(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "ShenJia", ColumnDescription = "韬环(鍙┖)", Length = 10, DecimalDigits = 3)]
+ public decimal? ShenJia { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍦ㄦ牎
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "IsInSchool", ColumnDescription = "鏄惁鍦ㄦ牎")]
+ public bool IsInSchool { get; set; }
+
+ /// <summary>
+ /// 鏄惁澶栧湴浜�(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "IsWDR", ColumnDescription = "鏄惁澶栧湴浜�(鍙┖)")]
+ public bool? IsWDR { get; set; }
+
+ /// <summary>
+ /// 鎬у埆
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "Gender", ColumnDescription = "鎬у埆")]
+ public GenderEnum Gender { get; set; }
+
+ /// <summary>
+ /// 鍏朵粬鎬у埆(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "OtherGender", ColumnDescription = "鍏朵粬鎬у埆(鍙┖)")]
+ public GenderEnum? OtherGender { get; set; }
+
+ /// <summary>
+ /// 鍑虹敓鏃ユ湡
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "BrithDate", ColumnDescription = "鍑虹敓鏃ユ湡")]
+ public DateTime BrithDate { get; set; }
+
+ /// <summary>
+ /// 鍏ュ鏃ユ湡(鍙┖)
+ /// </summary>
+ [SugarColumn(ColumnName = "InSchoolDate", ColumnDescription = "鍏ュ鏃ユ湡(鍙┖)")]
+ public DateTime? InSchoolDate { get; set; }
+
+ }
+}
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj"
index 4d69527..813ab76 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj"
@@ -12,12 +12,12 @@
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
<CMSRootPath>D:\Program Files\CMS Editor</CMSRootPath>
- <OutputPath>$(CMSRootPath)\plugins\cms.plugin.hiawms</OutputPath>
+ <OutputPath>$(CMSRootPath)\plugins\cms.plugin.hiawms_test</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
<CMSRootPath>/Volumes/SSD/CMS Editor</CMSRootPath>
- <OutputPath>$(CMSRootPath)\plugins\cms.plugin.hiawms</OutputPath>
+ <OutputPath>$(CMSRootPath)\plugins\cms.plugin.hiawms_test</OutputPath>
</PropertyGroup>
<ItemGroup>
--
Gitblit v1.9.3