Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-04-27 6dbea727a1fcaa0de63578ac90183bfd0a1417b3

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -167,11 +167,15 @@
<!--钢化版图序号，钢化版图里的顺序-->
<!--        <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
        <span>{{ item.customer_name }}</span>&nbsp;
        <span>{{ item.order_id }}</span>&nbsp;
        <span v-if="item.process.includes('夹胶')||item.process.includes('夹层')">胶片</span>
        <span v-else-if="item.process.includes('中空')">中空</span>
        <span v-else-if="item.process.includes('百叶')">百叶</span>
        <span v-else></span>
        <span v-if="company.showDeliveryCreator">{{ item.order_id }}</span>&nbsp;
        <span v-if="!company.showDeliveryCreator">{{ item.process_id }}</span>&nbsp;
        <template v-if="company.showDeliveryCreator">
          <span v-if="item.process.includes('夹胶')||item.process.includes('夹层')">胶片</span>
          <span v-else-if="item.process.includes('中空')">中空</span>
          <span v-else-if="item.process.includes('百叶')">百叶</span>
          <span v-else></span>
        </template>

<!--stock_id 版图-->
<!--        <div class="cell1" v-if="item.stock_id!=undefined">{{ item.stock_id+'/'+item.polys_id }}</div>-->

@@ -203,7 +207,7 @@
      <div v-if="item.customer_name!==undefined" class="row6">
        <span>{{item.glass_child}}</span>&nbsp;
        <span v-if="company.showDeliveryCreator" style="font-size: 10pt" >{{item.processing_note}}</span>
        <span v-else style="font-size: 6pt">{{item.processing_note}}</span>
        <span v-else style="font-size: 6pt"></span>

        <br v-if="!company.showDeliveryCreator" />
        <span v-if="!company.showDeliveryCreator" style="font-size: 6pt;margin-top: -10px">{{item.product_name}}</span>

 north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java

@@ -281,6 +281,12 @@
        return Result.seccess(glassOptimizeService.saveConfiguration(object,type));
    }

    @ApiOperation("模拟排版")
    @PostMapping("/simulatedTypesetting")
    public Result simulatedTypesetting(@RequestBody Map<String, Object> object) {
        return Result.seccess(glassOptimizeService.simulatedTypesetting1(object));
    }



}

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

@@ -22,6 +22,8 @@

    List<Map<String, Object>> analogComputationOptimization(String projectNo);

    List<Map<String, Object>> simulatedTypesettingUsingOpt(List<String> processId,List<Integer> technologyNumber);

    //工程信息流程卡
    List<Map<String, Object>> getProcessCardMp(String projectNo);


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

@@ -24,6 +24,7 @@
import java.text.DecimalFormat;
import java.util.*;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;

@Service
@Transactional(rollbackFor = Exception.class)
@@ -459,4 +460,154 @@
        return true;

    }



    public String simulatedTypesetting(Map<String, Object> object) {

        String optionVal = "";
        Integer quantity = 0;
        Double area = 0.0;
        if (object.get("optionVal") != null) {
            optionVal = object.get("optionVal").toString();
        }
        if (object.get("quantity") != null) {
            quantity = Integer.valueOf(object.get("quantity").toString());
        }
        if (object.get("area") != null) {
            area = Double.valueOf(object.get("area").toString());
        }
        List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListNormal(optionVal);


        int currentQuantity = 0;
        double currentArea = 0;
        List<List<Map<String, Object>>> result = new ArrayList<>();
        List<Map<String, Object>> currentGroup = new ArrayList<>();

        if(area==0 && quantity>0){
            for(Map<String, Object> flowCardNormal: flowCardListNormal){
                if (Integer.valueOf(flowCardNormal.get("quantity").toString()) > quantity ) {
                    continue;
                }
                int newQuantity = currentQuantity + Integer.valueOf(flowCardNormal.get("quantity").toString());
                double newArea = currentArea + Double.valueOf(flowCardNormal.get("area").toString());
                if(newQuantity>quantity){
                    result.add(currentGroup);
                    currentGroup = new ArrayList<>();
                    currentQuantity = 0;
                    currentArea = 0;
                    newQuantity = Integer.valueOf(flowCardNormal.get("quantity").toString());
                    newArea = Double.valueOf(flowCardNormal.get("area").toString());

                }
                currentGroup.add(flowCardNormal);
                currentQuantity = newQuantity;
                currentArea = newArea;

            }

            if (!currentGroup.isEmpty()) {
                result.add(currentGroup);
            }
        }
            System.out.println(result);

        return "";

    }

    public String simulatedTypesetting1(Map<String, Object> object) {

        String optionVal = "";
        int quantity;
        Double area;
        if (object.get("optionVal") != null) {
            optionVal = object.get("optionVal").toString();
        }
        if (object.get("quantity") != null) {
            quantity = Integer.valueOf(object.get("quantity").toString());
        } else {
            quantity = 0;
        }
        if (object.get("area") != null) {
            area = Double.valueOf(object.get("area").toString());
        } else {
            area = 0.0;
        }
        List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListNormal(optionVal);


        Queue<Map<String, Object>> queue = flowCardListNormal.stream()
                .filter(item -> {
                    if ((quantity>0 ? (Integer.valueOf(item.get("quantity").toString()) > quantity):false) || (area>0 ? (Double.valueOf(item.get("area").toString()) > area):false)) {
                        return false;
                    }
                    return true;
                })
                .collect(Collectors.toCollection(LinkedList::new));

        List<Map<String, Object>> result = new ArrayList<>();

        while (!queue.isEmpty()) {
            List<Map<String, Object>> currentGroup = new ArrayList<>();
            Map<String, Object> currentGroupMap = new HashMap<>();
            int currentCount = 0;
            double currentArea = 0;

            // 处理当前轮次队列中的所有元素
            int queueSize = queue.size();
            boolean addedAny = false;

            String processId="";
            for (int i = 0; i < queueSize; i++) {
                Map<String, Object> item = queue.poll();
                if ((quantity>0?currentCount + Integer.valueOf(item.get("quantity").toString()) <= quantity:true)
                && (area>0?currentArea + Double.valueOf(item.get("area").toString()) <= area:true)) {
                    if(i+1==queueSize){
                        processId=processId+item.get("process_id").toString()+"/"+item.get("technology_number").toString();
                    }else{
                        processId=processId+item.get("process_id").toString()+"/"+item.get("technology_number").toString()+";";
                    }
                    currentGroup.add(item);
                    currentCount += Integer.valueOf(item.get("quantity").toString());
                    currentArea += Double.valueOf(item.get("area").toString());
                    addedAny = true;
                } else {
                    queue.offer(item); // 放回队列等待下次处理
                }
            }

            if (currentGroup.isEmpty()) {
                throw new RuntimeException("无法继续分组，剩余数据无法放入任何分组");
            }
            currentGroupMap.put("processId",processId);
            currentGroupMap.put("count",currentCount);
            currentGroupMap.put("area",Math.round(currentArea * 100) / 100.0);
            result.add(currentGroupMap);
            //System.out.println("流程卡:"+processId+"数量:"+currentCount+"面积:"+Math.round(currentArea * 100) / 100.0);
        }

        for (Map<String, Object> objectMap:result){
            Map<String,Object> map = new HashMap<>();
            String[] substrings = objectMap.get("processId").toString().split(";");
            List<Map<String, Object>> flowCardMap = new ArrayList<>();
            List<String> processIdList=new ArrayList<>();
            List<Integer> technologyNumberList=new ArrayList<>();
            for(String substring : substrings) {
                String processId = substring.substring(0, 14);
                Integer technologyNumber = Integer.valueOf(substring.substring(15));
                processIdList.add(processId);
                technologyNumberList.add(technologyNumber);
            }
            map.put("data",glassOptimizeMapper.simulatedTypesettingUsingOpt(processIdList,technologyNumberList));
            objectMap.put("cuttingRate",90);
        }
        System.out.println(result);

        return "";

    }


}

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

@@ -865,7 +865,8 @@
               od.bend_radius,
               ifnull(od.order_number,0) as heat_layout_id,
               ifnull(a.id,0) as heat_layout_sort,
               od.product_name
               od.product_name,
               opd.process_id
        from pp.optimize_detail opd
                 left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
                 left join sd.order_detail od
@@ -901,7 +902,8 @@
               od.bend_radius,
               opd.heat_layout_id,
               opd.heat_layout_sort,
               od.product_name
               od.product_name,
               opd.process_id
        from pp.optimize_detail opd
                 left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
                 left join sd.order_detail od

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

@@ -994,4 +994,45 @@
        UPDATE pp.optimize_config set config_detail=#{json},create_time=now()
        where config_type=#{type}
    </update>

    <select id="simulatedTypesettingUsingOpt">
        SELECT
              c.project_no,
              d.child_width as 'width',
              d.child_height as 'height',
              c.quantity,
              o.shape,
              concat( c.process_id, '-', c.technology_number ) AS 'process_id',
              c.technology_number,
              d.glass_child,
              o.product_name,
              o.price,
              o.remarks,
              o.building_number,
              round( d.area * c.quantity, 4 ) as 'area',
              c.order_number,
              d.icon,
              op.project_name
          FROM
              pp.flow_card c
                  LEFT JOIN sd.order_detail o ON c.order_id = o.order_id
                  AND c.order_number = o.order_number
                  LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
                  AND c.order_number = d.order_number
                  AND c.technology_number = d.technology_number
                  INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
          WHERE
              c.project_no IS NOT NULL
            and c.process_id IN
            <foreach item="item" index="index" collection="processId" open="(" separator="," close=")">
                #{item}
            </foreach>
            and c.technology_number IN
            <foreach item="item" index="index" collection="technologyNumber" open="(" separator="," close=")">
                #{item}
            </foreach>
          ORDER BY
              c.process_id,
              c.order_number
    </select>
</mapper>