Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-20 1772504da433bec2f1695d47e5946c1192e876fb

Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

 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;


 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/Ïé×ӵġ¾×÷ÒµÈÎÎñ±í¡¿ÅäÖÃÎı¾(Ä£ºý²éѯ×Ô¶¯°æ).txt

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
[表名]:scms_worktasks
[实体类名]:WorkTask
[实体类对象名]:workTask
[页面菜单名]:作业任务
[页面菜单对象缩写]:workTask
[表的中文注解]:作业任务表
[重复性校验字段]:Son_TaskCode
[删除提示字段]:Son_TaskCode
[模糊查询字段]:
[模糊查询字段名]:
[项目命名空间]:PipeLineLems
[枚举类型字段集合]:WorkPlanStatus,WorkPlanStatusEnum&CallMaterialStatus,CallMaterialStatusEnum
[前端根文件夹名称]:pipelinelems_web
[排序]:CreationTime

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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);

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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>

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Controllers/EntityModeQueryDrawerÄ£°å.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 = {