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) } } 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) => { 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('没有找到数据'); 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;
