对复合工序添加的类型，进行重新的逻辑处理

chenlu

2025-05-23 ec976e88774d138236c09273705cb948a6e7a25f

对复合工序添加的类型，进行重新的逻辑处理

 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue

@@ -174,33 +174,33 @@
    produceList.value[j].detail[0].weight = sumWeight
  }
  //处理合并打印
  if (printMerge !== null && printMerge !== undefined && printMerge !== "") {

    produceList.value.forEach(item => {
      item.detail[0].technologyNumber = printMerge;
    });

    //合并打印工艺流程处理
    if (like == null) {
      let process = produceList.value[0].detail[0].process
      let indexOfJiaJiao = process.indexOf('夹胶');
      if (indexOfJiaJiao !== -1) {
        // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
        let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
        produceList.value.forEach(item => {
          item.detail[0].process = afterJiaJiao
        })
      }

      let indexOfProceList = produceList.value[0].processList
      let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');

      if (getProceList !== -1) {
        // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
        produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
      }
    }
  }
  // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
  //
  //   produceList.value.forEach(item => {
  //     item.detail[0].technologyNumber = printMerge;
  //   });
  //
  //   //合并打印工艺流程处理
  //   if (like == null) {
  //     let process = produceList.value[0].detail[0].process
  //     let indexOfJiaJiao = process.indexOf('夹胶');
  //     if (indexOfJiaJiao !== -1) {
  //       // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
  //       let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
  //       produceList.value.forEach(item => {
  //         item.detail[0].process = afterJiaJiao
  //       })
  //     }
  //
  //     let indexOfProceList = produceList.value[0].processList
  //     let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');
  //
  //     if (getProceList !== -1) {
  //       // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
  //       produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
  //     }
  //   }
  // }


  // produceList.value.forEach(item => {

 north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue

@@ -21,7 +21,8 @@


const data = ref({
  printList: []
  printList: [],
  processName:[]
})

let props = defineProps({
@@ -71,6 +72,7 @@
  request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
        if (res.code == 200) {
          produceList.value = deepClone(res.data.data)
          data.processName   = res.data.data[0].processNameList
          //处理单片厚度

          for (let j = 0; j < produceList.value.length; j++) {
@@ -93,33 +95,34 @@
            produceList.value[j].detail[0].weight = sumWeight
          }
          //处理合并打印
          if (printMerge !== null && printMerge !== undefined && printMerge !== "") {

            produceList.value.forEach(item => {
              item.detail[0].technologyNumber = printMerge;
            });

            //合并打印工艺流程处理
            if (like == null) {
              let process = produceList.value[0].detail[0].process
              let indexOfJiaJiao = process.indexOf('夹胶');
              if (indexOfJiaJiao !== -1) {
                // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
                let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
                produceList.value.forEach(item => {
                  item.detail[0].process = afterJiaJiao
                })
              }

              let indexOfProceList = produceList.value[0].processList
              let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');

              if (getProceList !== -1) {
                // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
                produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
              }
            }
          }
          // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
          //
          //   produceList.value.forEach(item => {
          //     item.detail[0].technologyNumber = printMerge;
          //   });
          //
          //   //合并打印工艺流程处理
          //   if (like == null) {
          //     let process = produceList.value[0].detail[0].process
          //     console.log(process)
          //     let indexOfJiaJiao = process.indexOf('夹胶');
          //     if (indexOfJiaJiao !== -1) {
          //       // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
          //       let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
          //       produceList.value.forEach(item => {
          //         item.detail[0].process = afterJiaJiao
          //       })
          //     }
          //
          //     let indexOfProceList = produceList.value[0].processList
          //     let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');
          //
          //     if (getProceList !== -1) {
          //       // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
          //       produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
          //     }
          //   }
          // }


          produceList.value.forEach(item => {

 north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue

@@ -173,33 +173,33 @@
    produceList.value[j].detail[0].weight = sumWeight
  }
  //处理合并打印
  if (printMerge !== null && printMerge !== undefined && printMerge !== "") {

    produceList.value.forEach(item => {
      item.detail[0].technologyNumber = printMerge;
    });

    //合并打印工艺流程处理
    if (like == null) {
      let process = produceList.value[0].detail[0].process
      let indexOfJiaJiao = process.indexOf('夹胶');
      if (indexOfJiaJiao !== -1) {
        // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
        let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
        produceList.value.forEach(item => {
          item.detail[0].process = afterJiaJiao
        })
      }

      let indexOfProceList = produceList.value[0].processList
      let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');

      if (getProceList !== -1) {
        // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
        produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
      }
    }
  }
  // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
  //
  //   produceList.value.forEach(item => {
  //     item.detail[0].technologyNumber = printMerge;
  //   });
  //
  //   //合并打印工艺流程处理
  //   if (like == null) {
  //     let process = produceList.value[0].detail[0].process
  //     let indexOfJiaJiao = process.indexOf('夹胶');
  //     if (indexOfJiaJiao !== -1) {
  //       // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
  //       let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
  //       produceList.value.forEach(item => {
  //         item.detail[0].process = afterJiaJiao
  //       })
  //     }
  //
  //     let indexOfProceList = produceList.value[0].processList
  //     let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');
  //
  //     if (getProceList !== -1) {
  //       // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
  //       produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
  //     }
  //   }
  // }


  // produceList.value.forEach(item => {

 north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue

@@ -70,33 +70,33 @@
            produceList.value[j].detail[0].weight = sumWeight
          }
          //处理合并打印
          if (printMerge !== null && printMerge !== undefined && printMerge !== "") {

            produceList.value.forEach(item => {
              item.detail[0].technologyNumber = printMerge;
            });

            //合并打印工艺流程处理
            if (like == null) {
              let process = produceList.value[0].detail[0].process
              let indexOfJiaJiao = process.indexOf('夹胶');
              if (indexOfJiaJiao !== -1) {
                // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
                let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
                produceList.value.forEach(item => {
                  item.detail[0].process = afterJiaJiao
                })
              }

              let indexOfProceList = produceList.value[0].processList
              let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');

              if (getProceList !== -1) {
                // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
                produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
              }
            }
          }
          // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
          //
          //   produceList.value.forEach(item => {
          //     item.detail[0].technologyNumber = printMerge;
          //   });
          //
          //   //合并打印工艺流程处理
          //   if (like == null) {
          //     let process = produceList.value[0].detail[0].process
          //     let indexOfJiaJiao = process.indexOf('夹胶');
          //     if (indexOfJiaJiao !== -1) {
          //       // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
          //       let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
          //       produceList.value.forEach(item => {
          //         item.detail[0].process = afterJiaJiao
          //       })
          //     }
          //
          //     let indexOfProceList = produceList.value[0].processList
          //     let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');
          //
          //     if (getProceList !== -1) {
          //       // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
          //       produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
          //     }
          //   }
          // }


          produceList.value.forEach(item => {

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -73,6 +73,7 @@
let detail = ref([])
let layer=''
let technologicalProcess=''
let processName = ref([])

//定义接收加载表头下拉数据
const titleSelectJson = ref({
@@ -818,6 +819,7 @@
  await request.post(`/reportingWork/selectProcess/${user.user.userId}`).then((res) => {
    if (res.code == 200) {
      titleSelectJson.value.processType = res.data.process
      processName  = res.data.processNameList
      if(user.user.address!==null && user.user.address!==''){
        titleUploadData.value.thisProcess = user.user.address
        titleUploadData.value.teamsGroupsName = user.user.userName
@@ -896,10 +898,12 @@
  let process = titleUploadData.value.thisProcess
  //暂时取消
  for(let item of uniqueByOrderNum){
    if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框')){
    const result = processName.find(item => item.basic_name === process);
    const nickname = result ? result.nickname : null;
    if(!checkSameNumForId(notFinishList,item.order_number ) &&  nickname &&  nickname.includes('step')){
      ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}:
      ${item.order_number}
       ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
       ${t('reportingWorks.pleaseCheckTheOrderNumber2')}`)
      return false
    }
  }

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -247,4 +247,8 @@
    Boolean updateFlowCardIsMerge(String processId);

    Integer flowCardDetailMergeMp(String processId);

    String getProcessName(String processSub);

    List<Map<String, Object>> getProcessNameList();
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -313,7 +313,9 @@
                    //是否包含切割
                    //boolean containsCutting = flowCard.getProcess().contains("切割");
                    String processSub = flowCard.getProcess().substring(0, 2);
                    if (processSub.equals("夹胶") || processSub.equals("中空")) {//工艺是否包含夹胶中空
                    //获取工序对应的别称
                    String processName = flowCardMapper.getProcessName(processSub);
                    if (processName.equals("stepC") || processName.equals("stepD")) {//工艺是否包含夹胶中空
                        itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));

                        List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess());
@@ -406,7 +408,9 @@
                //是否包含切割
                //boolean containsCutting = flowCard.getProcess().contains("切割");
                String processSub = flowCard.getProcess().substring(0, 2);
                if (processSub.equals("夹胶") || processSub.equals("中空")) {
                //获取工序对应的别称
                String processName = flowCardMapper.getProcessName(processSub);
                if (processName.equals("stepC") || processName.equals("stepD")) {//工艺是否包含夹胶中空
                    itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
                    if (flowCard.getPatchState().equals(0)) {
                        List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess());
@@ -723,8 +727,10 @@

                //工艺流程
                List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());

                //工序列表
                List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
                itemmap.put("processList", processList);
                itemmap.put("processNameList", processNameList);
                //  itemmap.put("numberList", numberList);
                list.add(itemmap);


 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -218,6 +218,8 @@
    public Map<String, Object> SelectProcessSv(String userId) {
        Map<String, Object> map = new HashMap<>();
        String process = reportingWorkMapper.selectUserProcess(userId);
        //工序列表
        List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
        if (process==null) {
            map.put("process", reportingWorkMapper.SelectProcessMp());
        }
@@ -230,7 +232,7 @@
                map.put("process",reportingWorkMapper.getSelectProcessDuoqu() );
            }
        }

        map.put("processNameList", processNameList);
        return map;
    }

@@ -404,7 +406,7 @@
        //获取报工工序是否为复合工程
        String laminating = reportingWorkMapper.getProcessLaminating(thisProcess);
//合片工序
if (laminating.equals("stepA") || laminating.equals("stepB")){
if (laminating.indexOf("step")!=-1){
    LambdaUpdateWrapper
                <ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -3072,4 +3072,12 @@
        update  pp.flow_card fc set fc.merge=0
        where fc.process_id = #{processId}
    </update>

    <select id="getProcessName">
        select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{processSub}
    </select>

    <select id="getProcessNameList">
        SELECT id,basic_name,IFNULL(nickname,"") as nickname FROM sd.`basic_data` where basic_category='process'
    </select>
</mapper>

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -215,7 +215,7 @@
        LEFT JOIN sd.order_glass_detail AS ogd
        ON od.order_id = ogd.order_id
        AND od.order_number = ogd.order_number
        <if test="laminating == 'stepA'" >
        <if test="laminating == 'stepA' || laminating == 'stepC'" >
            AND ogd.`group` = (select `group`
            from sd.order_glass_detail
            where order_id = ogd.order_id
@@ -952,7 +952,7 @@
        LEFT JOIN sd.order_glass_detail AS ogd
        ON od.order_id = ogd.order_id
        AND od.order_number = ogd.order_number
        <if test="laminating == 'stepA'" >
        <if test="laminating == 'stepA' || laminating == 'stepC'" >
            AND ogd.`group` = (select `group`
            from sd.order_glass_detail
            where order_id = ogd.order_id