合架修改

廖井涛

2025-02-19 b132bd57570b6baba0799ac70575f4d625ee3674

合架修改

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

@@ -145,7 +145,7 @@
    buttons: [
      {code: 'update', name: t('合架'), status: 'primary'},
      {code: 'save', name: t('保存'), status: 'primary'},
      {code: 'clear', name: t('删除'), status: 'primary'},
      {code: 'clear', name: t('清空'), status: 'primary'},
    ],

  },

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

@@ -90,7 +90,7 @@

    Boolean updateComposing(String processId);

    Boolean updateProcessCardRack(String processId,String technologyNumber,Integer orderNumber,String rack);
    Boolean updateProcessCardRack(String processId,String technologyNumber,String rack);

    List<Map<String, String>> getPrintLabel(String projectNo);


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

@@ -488,7 +488,7 @@
        List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
        if (!flowCardList.isEmpty()) {
            for (FlowCard flowCard : flowCardList) {
                flowCardMapper.updateProcessCardRack(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getOrderNumber(),flowCard.getRack());
                flowCardMapper.updateProcessCardRack(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getRack());
            }
            return true;
        }

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

@@ -831,7 +831,7 @@
    <update id="updateProcessCardRack">
        update flow_card as fc
        set fc.rack=#{rack}
        where fc.process_id = #{processId} and fc.technology_number=#{technologyNumber} and order_number=#{orderNumber}
        where fc.process_id = #{processId} and fc.technology_number=#{technologyNumber}
    </update>

    <select id="getPrintLabel">