From 304d77a8db4288f41efea471c5cf10613e590179 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 10:10:04 +0800
Subject: [PATCH] 优化
---
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx | 57 ++++++-------
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick.ts | 84 --------------------
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/CMSPluginEntry.cs | 13 --
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Models/PipeAccessoryPick.ts | 31 -------
4 files changed, 33 insertions(+), 152 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;
--
Gitblit v1.9.3