From 1772504da433bec2f1695d47e5946c1192e876fb Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 11:53:40 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs | 22 ++--
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx | 57 +++++------
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的【作业任务表】配置文本(模糊查询自动版).txt | 14 ++
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick.ts | 84 ----------------
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/CMSPluginEntry.cs | 13 --
Weben_CMS专用代码生成器/Code/GenerateCode_WeiBen_CMS.csproj | 3
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/PipeAccessoryPick.ts | 31 ------
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeQueryDrawer模板.txt | 73 +++++++++++---
8 files changed, 117 insertions(+), 180 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/PipeAccessoryPick.ts b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/PipeAccessoryPick.ts
index 33fee96..9e732e5 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/PipeAccessoryPick.ts
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/PipeAccessoryPick.ts
@@ -1,9 +1,4 @@
import { Base } from '@/libs/Base/Base'
-import {
- deleteWmsMaterialContainers,
- addWmsMaterialContainer,
- cloneData,
-} from './Service/PipeAccessoryPick'
export class WmsMaterialContainer extends Base<{ [key: string]: any }> {
constructor() {
@@ -12,30 +7,4 @@
})
}
onMounted() {}
- /**
- * 鍒犻櫎
- * @param id
- * @returns
- */
- async deleteWmsMaterialContainers(ids: string[]) {
- return deleteWmsMaterialContainers(ids)
- }
-
- /**
- * 娣诲姞鏁版嵁
- * @param data
- * @returns
- */
- addWmsMaterialContainer(data: Record<string, any>) {
- return addWmsMaterialContainer(data)
- }
-
- /**
- * 鍏嬮殕
- * @param ids
- * @returns
- */
- cloneData(ids: string[]) {
- return cloneData(ids)
- }
}
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick.ts b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick.ts
index 99615d6..604b829 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick.ts
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick.ts
@@ -2,92 +2,14 @@
const request = Base.request
/**
- * 娣诲姞
+ * 鏍规嵁 绠℃缂栫爜銆佸伐搴� 鏌ヨ 鍒嗘嫞鍐呭
* @returns
*/
-export const addWmsMaterialContainer = (data: any) => {
- return request.post('/api/v1/HIAWms/wmsMaterialContainer', data)
-}
-
-/**
- * 鎵归噺鍒犻櫎
- * @returns
- */
-export const deleteWmsMaterialContainers = (ids: string[]) => {
- return request({
- data: ids,
- url: '/api/v1/HIAWms/wmsMaterialContainer',
- method: 'delete',
- })
-}
-
-/**
- * 鍏嬮殕
- * @returns
- */
-export const cloneData = (data: any) => {
- return request.post('/api/v1/HIAWms/wmsMaterialContainer/clone', data)
-}
-
-/**
- * 鐗╂枡鍨嬪彿鍒楄〃
- * @returns
- */
-export const getMaterialModelList = () => {
- return request.get(`/api/v1/hiawms/wmsenum/ModelList`)
-}
-
-/**
- * 搴撲綅鍙峰垪琛�
- * @returns
- */
-export const getPlaceNoForStockList = (data: any) => {
- return request.get(`/api/v1/hiawms/wmsenum/placelist?placeType=${data}`)
-}
-
-/**
- * 鍏ュ簱
- * @returns
- */
-export const instock = (data: any) => {
- return request.post('/api/v1/HIAWms/wmsinsstock/bindinstock', data)
-}
-
-
-/**
- * 鏍规嵁 绠℃缂栫爜銆佸伐搴� 鏌ヨ 浣滀笟璁″垝
- * @returns
- */
-export const findSingleWorkPlanByFilter = (data: any) => {
- return request.post('/api/v1/PipeLineLems/WorkPlan/FindSingleByFilter', data)
-}
-
-/**
- * 鏍规嵁 绠℃缂栫爜銆佸伐搴� 鏌ヨ 浣滀笟璁″垝
- * @returns
- */
-export const getPickRet = (data: any) => {
+export const getPickRet1 = (data: any) => {
return request.post('/api/v1/PipeLineLems/WorkPlanPublic/getPickRet', data)
}
-
/**
- * 鏍规嵁 浠诲姟缂栧彿杩涜寮�宸�
- * @returns
- */
-export const startProduction = (data: any) => {
- return request.post('/api/v1/PipeLineLems/WorkPlanPublic/startProduction', data)
-}
-
-/**
- * 鏍规嵁 浠诲姟缂栧彿杩涜瀹屽伐
- * @returns
- */
-export const finishProduction = (data: any) => {
- return request.post('/api/v1/PipeLineLems/WorkPlanPublic/finishProduction', data)
-}
-
-/**
- * 鏍规嵁 浠诲姟缂栧彿杩涜瀹屽伐
+ * 鏍规嵁 浠诲姟缂栧彿杩涜鍒嗘嫞
* @returns
*/
export const pick = (data: any) => {
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
index a7fd24b..c7bb98c 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
@@ -14,10 +14,7 @@
ElCol,
} from 'element-plus'
import {
- getPlaceNoForStockList,
- getMaterialModelList,
- instock,
- getPickRet,
+ getPickRet1,
pick
} from '@/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick'
import { Message } from '@element-plus/icons-vue/dist/types'
@@ -61,16 +58,16 @@
// 杩欓噷娣诲姞缁勭洏閫昏緫
}
- // 缁勭洏鍏ュ簱鎿嶄綔
- const handlePalletizeStorage = () => {
- console.log('缁勭洏鍏ュ簱鎿嶄綔', queryForm.value)
- instock(queryForm.value), resetQueryForm()
- ElMessage.success({
- message: '缁勭洏鍏ュ簱鎴愬姛',
- type: 'success',
- })
- // 杩欓噷娣诲姞缁勭洏鍏ュ簱閫昏緫
- }
+ // // 缁勭洏鍏ュ簱鎿嶄綔
+ // const handlePalletizeStorage = () => {
+ // console.log('缁勭洏鍏ュ簱鎿嶄綔', queryForm.value)
+ // instock(queryForm.value), resetQueryForm()
+ // ElMessage.success({
+ // message: '缁勭洏鍏ュ簱鎴愬姛',
+ // type: 'success',
+ // })
+ // // 杩欓噷娣诲姞缁勭洏鍏ュ簱閫昏緫
+ // }
const resetQueryForm = () => {
queryForm.value.materialModel = ''
@@ -79,22 +76,22 @@
queryForm.value.stockNumber = ''
}
- const getModelList = async () => {
- const models = await getMaterialModelList()
- modelOptions.value = models.map((item: string) => ({
- value: item.materialModel,
- label: item.materialModelDesc,
- }))
- }
+ // const getModelList = async () => {
+ // const models = await getMaterialModelList()
+ // modelOptions.value = models.map((item: string) => ({
+ // value: item.materialModel,
+ // label: item.materialModelDesc,
+ // }))
+ // }
- const getPlaceNoList = async () => {
- const placeNos = await getPlaceNoForStockList(2)
- console.log('搴撲綅鍙峰垪琛�:', placeNos)
- placeNoOptions.value = placeNos.map((item: string) => ({
- value: item.placeNo,
- label: item.placeNoDesc,
- }))
- }
+ // const getPlaceNoList = async () => {
+ // const placeNos = await getPlaceNoForStockList(2)
+ // console.log('搴撲綅鍙峰垪琛�:', placeNos)
+ // placeNoOptions.value = placeNos.map((item: string) => ({
+ // value: item.placeNo,
+ // label: item.placeNoDesc,
+ // }))
+ // }
const handleChange =async (value) => {
console.log('杈撳叆鍐呭纭:', value); // 澶卞幓鐒︾偣鎴栧洖杞︽椂瑙﹀彂
if(value==''){
@@ -108,7 +105,7 @@
processName:'鍒囧壊宸ュ簭',
processName_FilterMode:2,//绮惧噯鏌ヨ
}
- const workPlan = await getPickRet(param);
+ const workPlan = await getPickRet1(param);
console.log('杩斿洖:'+workPlan);
if(workPlan.code!="200"){
ElMessage.error('娌℃湁鎵惧埌鏁版嵁');
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/CMSPluginEntry.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/CMSPluginEntry.cs
index 73807a4..f9efcec 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/CMSPluginEntry.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/CMSPluginEntry.cs
@@ -1,4 +1,3 @@
-using System.Collections;
using Autofac;
using CMS.Data.Stressing;
using CMS.DataPersistence;
@@ -8,10 +7,11 @@
using CMS.Plugin.MesSuite.Abstractions.Consts;
using CMS.Plugin.PipeLineLems.Abstractions;
using CMS.Plugin.PipeLineLems.Apis;
+using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
+using CMS.Plugin.PipeLineLems.Application.Implements;
using CMS.Plugin.PipeLineLems.Domain;
using CMS.Plugin.PipeLineLems.ProjectService;
using CMS.Plugin.PipeLineLems.Workers;
-using CMS.Plugin.PipeLineLems.Apis;
using CMS.Project.Abstractions;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
@@ -19,17 +19,10 @@
using Structing.Core;
using Structing.Web;
using SYC.Plugin;
+using System.Collections;
using Volo.Abp.BackgroundWorkers;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Modularity.PlugIns;
-using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-using CMS.Plugin.PipeLineLems.Application.Implements;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Application.Implements;
-using CMS.Plugin.HIAWms.Domain.WmsTask;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
-using CMS.Plugin.HIAWms.Domain.WmsMaterials;
-using CMS.Plugin.HIAWms.Abstractions;
namespace CMS.Plugin.PipeLineLems;
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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\343\200\220\344\275\234\344\270\232\344\273\273\345\212\241\350\241\250\343\200\221\351\205\215\347\275\256\346\226\207\346\234\254\050\346\250\241\347\263\212\346\237\245\350\257\242\350\207\252\345\212\250\347\211\210\051.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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\343\200\220\344\275\234\344\270\232\344\273\273\345\212\241\350\241\250\343\200\221\351\205\215\347\275\256\346\226\207\346\234\254\050\346\250\241\347\263\212\346\237\245\350\257\242\350\207\252\345\212\250\347\211\210\051.txt"
new file mode 100644
index 0000000..b10184b
--- /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/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\343\200\220\344\275\234\344\270\232\344\273\273\345\212\241\350\241\250\343\200\221\351\205\215\347\275\256\346\226\207\346\234\254\050\346\250\241\347\263\212\346\237\245\350\257\242\350\207\252\345\212\250\347\211\210\051.txt"
@@ -0,0 +1,14 @@
+锘縖琛ㄥ悕]:scms_worktasks
+[瀹炰綋绫诲悕]:WorkTask
+[瀹炰綋绫诲璞″悕]:workTask
+[椤甸潰鑿滃崟鍚峕:浣滀笟浠诲姟
+[椤甸潰鑿滃崟瀵硅薄缂╁啓]:workTask
+[琛ㄧ殑涓枃娉ㄨВ]:浣滀笟浠诲姟琛�
+[閲嶅鎬ф牎楠屽瓧娈礭:Son_TaskCode
+[鍒犻櫎鎻愮ず瀛楁]:Son_TaskCode
+[妯＄硦鏌ヨ瀛楁]:
+[妯＄硦鏌ヨ瀛楁鍚峕:
+[椤圭洰鍛藉悕绌洪棿]:PipeLineLems
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:WorkPlanStatus,WorkPlanStatusEnum&CallMaterialStatus,CallMaterialStatusEnum
+[鍓嶇鏍规枃浠跺す鍚嶇О]:pipelinelems_web
+[鎺掑簭]:CreationTime
\ No newline at end of file
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/Controllers/EntityModeQueryDrawer_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/Controllers/EntityModeQueryDrawer_Generate.cs"
index a408304..25b023b 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/Controllers/EntityModeQueryDrawer_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/Controllers/EntityModeQueryDrawer_Generate.cs"
@@ -26,18 +26,20 @@
attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query(newColumnNameList, param);
str = str.Replace("$PageAddFormAttributes_Query$", attrString);
- attrString = "";
- attrString += StructStrHelper.GetVueFormOptionsStrForSave_PageAddFormAttributes_Query(newColumnNameList, param);
- str = str.Replace("$Save_PageAddFormAttributes_Query$", attrString);
+ //楂樼骇鏌ヨ杩囨护浼樺寲浜嗭紝涓嶅啀鐢ㄨ繖绉嶆柟寮忎簡
+ //attrString = "";
+ //attrString += StructStrHelper.GetVueFormOptionsStrForSave_PageAddFormAttributes_Query(newColumnNameList, param);
+ //str = str.Replace("$Save_PageAddFormAttributes_Query$", attrString);
+ //楂樼骇鏌ヨ杩囨护浼樺寲浜嗭紝涓嶅啀鐢ㄨ繖绉嶆柟寮忎簡
+ //attrString = "";
+ //attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear(newColumnNameList, param);
+ //str = str.Replace("$Save_PageAddFormAttributes_Query_Clear$", attrString);
- attrString = "";
- attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear(newColumnNameList, param);
- str = str.Replace("$Save_PageAddFormAttributes_Query_Clear$", attrString);
-
- attrString = "";
- attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear_HighSelect(newColumnNameList, param);
- str = str.Replace("$Save_PageAddFormAttributes_Query_Clear_HighSelect$", attrString);
+ //楂樼骇鏌ヨ杩囨护浼樺寲浜嗭紝涓嶅啀鐢ㄨ繖绉嶆柟寮忎簡
+ //attrString = "";
+ //attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear_HighSelect(newColumnNameList, param);
+ //str = str.Replace("$Save_PageAddFormAttributes_Query_Clear_HighSelect$", attrString);
attrString = "";
attrString += StructStrHelper.GetVueFormOptionsStrForCommonQueryEnumForFrom(param.ColumnNameList, param);
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/GenerateCode_WeiBen_CMS.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/Code/GenerateCode_WeiBen_CMS.csproj"
index 695e495..d6f916e 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/GenerateCode_WeiBen_CMS.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/Code/GenerateCode_WeiBen_CMS.csproj"
@@ -327,6 +327,9 @@
<Content Include="File\GenerateCodeConfigParamFiles\绁ュ瓙鐨勩�愬彨鏂欏崟琛ㄣ�戦厤缃枃鏈�%28妯＄硦鏌ヨ鑷姩鐗�%29.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="File\GenerateCodeConfigParamFiles\绁ュ瓙鐨勩�愪綔涓氫换鍔¤〃銆戦厤缃枃鏈�%28妯＄硦鏌ヨ鑷姩鐗�%29.txt">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="File\GenerateCodeConfigParamFiles\绁ュ瓙鐨勪綔涓氳鍒掕〃閰嶇疆鏂囨湰%28妯＄硦鏌ヨ鑷姩鐗�%29.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
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/Controllers/EntityModeQueryDrawer\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/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
index 942ba5f..d00e438 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/Controllers/EntityModeQueryDrawer\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/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
@@ -99,12 +99,26 @@
const check = isEqual(initiateData.value, data)
return check
}
- const commonGetFormData=()=>{
- const data = {
- $Save_PageAddFormAttributes_Query$
+ /**
+ * 获取表单数据 - 优化版
+ */
+const commonGetFormData = () => {
+ const data = {};
+
+ // 遍历表单配置收集数据
+ formItems.forEach(item => {
+ // 收集基础字段
+ data[item.prop] = formData.value[item.prop] || '';
+
+ // 收集过滤模式字段
+ if (item.highSelectAttrs && item.highSelectAttrs.prop) {
+ const filterModeProp = item.highSelectAttrs.prop;
+ data[filterModeProp] = formData.value[filterModeProp] || '';
}
- return data;
- }
+ });
+
+ return data;
+}
const onClose = (done: () => void) => {
if (visible.value) {
visible.value = false
@@ -122,19 +136,42 @@
/**
* 重置公共select查询
*/
- const onResetForHighSelect = async () => {
- $Save_PageAddFormAttributes_Query_Clear_HighSelect$
- }
- /**
- * 重置查询
- */
- const onReset = async () => {
- formData.value = {}
- onResetForHighSelect();//重置公共select查询
- $Save_PageAddFormAttributes_Query_Clear$
- //向父组件发送自定义事件
- ctx.emit('restQuery');
- }
+ const onResetForHighSelect = () => {
+ // 遍历所有表单字段
+ formItems.forEach(item => {
+ // 检查字段是否有高级查询的过滤模式配置
+ if (item.highSelectAttrs && item.highSelectAttrs.prop) {
+ const filterModeProp = item.highSelectAttrs.prop;
+ const options = item.highSelectAttrs.options || [];
+
+ // 如果存在选项，则设置为第一个选项的值
+ if (options.length > 0) {
+ // 假设选项格式为 { value, label } 或类似结构
+ const firstValue = options[0].value !== undefined ? options[0].value : options[0];
+ formData.value[filterModeProp] = firstValue;
+ }
+ }
+ });
+ }
+ /**
+ * 重置查询 - 优化版
+ */
+ const onReset = async () => {
+ // 1. 清空所有基础字段（不包含过滤模式字段）
+ const baseFields = formItems.reduce((acc, item) => {
+ acc[item.prop] = '';
+ return acc;
+ }, {});
+
+ // 2. 应用基础字段初始值
+ formData.value = { ...baseFields };
+
+ // 3. 使用原有方法重置过滤模式字段
+ onResetForHighSelect(); // 保留原有方法调用
+
+ // 4. 向父组件发送自定义事件
+ ctx.emit('restQuery');
+ }
const updateCheckData = () => {
initiateData.value = {
--
Gitblit v1.9.3