guoyuji
2025-02-19 f50b70fce51257349608837adfdd79e1337858a1
提交智能优化方法测试版
4个文件已修改
174 ■■■■■ 已修改文件
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -440,4 +440,10 @@
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.updateProcessCardRack(object));
    }
    @ApiOperation("智能分架")
    @PostMapping("/processCardAutoRack")
    public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.processCardAutoRack(object));
    }
}
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -226,4 +227,8 @@
    int flowCardToOptimizeCount(String orderId);
    List<Map<String, Object>> getFlowCardDetail(String processId);
    Map<String,Object> getGlassThicknessByProdutionId(String orderId,String productionId);
    List<OrderDetail>  getOrderDetailByProductionId(String orderId, String productionId);
}
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.entity.userInfo.Log;
@@ -1063,6 +1064,145 @@
        map.put("data", list);
        return map;
    }
    public Object processCardAutoRack(Map<String, Object> object) {
        String orderId = "NG25000004";
        String productionId = "NG25000004B";
        /*String orderId = object.get("orderId").toString();
        String productionId = object.get("productionId").toString();
        Integer inMaxQuantity = Integer.parseInt(object.get("inMaxQuantity").toString());
        Float inWeight =  Float.parseFloat(object.get("inWeight").toString());
        Float shelfThickness =  Float.parseFloat(object.get("shelfThickness").toString())*1000;
        Float spacerThickness =  Float.parseFloat(object.get("spacerThickness").toString());
        */
        Integer inMaxQuantity = 30;
        Float inWeight =  100.0f;
        Float shelfThickness =  2000.0f;
        /*垫片厚度*/
        Float spacerThickness =  0.0f;
        Map<String,Object> thickness = flowCardMapper.getGlassThicknessByProdutionId(orderId,productionId);
        Float glassTotalThickness = Float.parseFloat(thickness.get("totalThickness").toString()) ;
        Float glassThickness = Float.parseFloat(thickness.get("thickness").toString());
        //获取此工程号订单明细信息
        List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId,productionId);
        //根据玻璃厚度和垫片厚度当前架子最大可放数量
        Integer shelfMaxQuantityByThickness = (int) (shelfThickness / (glassTotalThickness+spacerThickness));
        //用于接收最终生成的流程卡
        List<FlowCard> flowCardList = new ArrayList<>();
        //流程卡自增符号
        int flowCardNo = 1;
        // 当前架子剩余可放数量
        Integer shelfQuantity = 0;
        for(OrderDetail orderDetail : orderDetails){
            //架子根据尺寸重量最大能放多少
            int shelfQuantityByWeight = (int) (inWeight/
                    (orderDetail.getHeight()
                            *orderDetail.getWidth()
                            *glassThickness
                            *2.5/1000000)
            );
            System.out.println(shelfQuantityByWeight);
            //当前订单明细剩余数量
            if(shelfQuantity==0){
                shelfQuantity = shelfQuantityByWeight;
            }
            //取最小值
            Integer maxQuantity = 0;
            while (orderDetail.getQuantity() > 0 ) {
                FlowCard flowCard = new FlowCard();
                //当死循环中,当前架子剩余数量为0时,重新计算架子剩余数量
                if(shelfQuantity==0){
                    shelfQuantity = shelfQuantityByWeight;
                    System.out.println("flowCardNo:"+flowCardNo);
                }
                String processId = productionId+String.format("%05d",flowCardNo);
                //取最小值
                 maxQuantity = Math.min(shelfQuantity, Math.min(inMaxQuantity, shelfMaxQuantityByThickness));
                System.out.println(shelfQuantity+","+inMaxQuantity+","+shelfMaxQuantityByThickness);
                System.out.println(flowCardNo+","+maxQuantity);
                System.out.println("------");
                if (orderDetail.getQuantity() > maxQuantity){
                    flowCard.setProcessId(processId);
                    flowCard.setQuantity(maxQuantity);
                    flowCardList.add(flowCard);
                    orderDetail.setQuantity(orderDetail.getQuantity()-maxQuantity);
                    flowCardNo+=1;
                }else{
                    flowCard.setProcessId(processId);
                    flowCard.setQuantity(Math.toIntExact(orderDetail.getQuantity()));
                    flowCardList.add(flowCard);
                    //当前架子剩余数量
                    shelfQuantity= shelfQuantity-Math.toIntExact(orderDetail.getQuantity());
                    if(shelfQuantity==0){
                        flowCardNo+=1;
                    }
                    orderDetail.setQuantity(0L);
                }
            }
        }
        return  flowCardList;
    }
    public Object processCardAutoRack1(Map<String, Object> object) {
        String orderId = "NG25000004";
        String productionId = "NG25000004B";
        /*String orderId = object.get("orderId").toString();
        String productionId = object.get("productionId").toString();
        Integer inMaxQuantity = Integer.parseInt(object.get("inMaxQuantity").toString());
        Float inWeight =  Float.parseFloat(object.get("inWeight").toString());
        Float shelfThickness =  Float.parseFloat(object.get("shelfThickness").toString())*1000;
        Float spacerThickness =  Float.parseFloat(object.get("spacerThickness").toString());
        */
        Integer inMaxQuantity = 30;
        Float inWeight =  100.0f;
        Float shelfThickness =  2000.0f;
        /*垫片厚度*/
        Float spacerThickness =  0.0f;
        Map<String,Object> thickness = flowCardMapper.getGlassThicknessByProdutionId(orderId,productionId);
        Float glassTotalThickness = Float.parseFloat(thickness.get("totalThickness").toString()) ;
        Float glassThickness = Float.parseFloat(thickness.get("thickness").toString());
        //获取此工程号订单明细信息
        List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId,productionId);
        Integer flowCardQuantity = 0;
        for(OrderDetail orderDetail:orderDetails){
            flowCardQuantity+=Math.toIntExact(orderDetail.getQuantity());
        }
        //根据玻璃厚度和垫片厚度当前架子最大可放数量
        Integer shelfMaxQuantityByThickness = (int) (shelfThickness / (glassTotalThickness+spacerThickness));
        //用于接收最终生成的流程卡
        List<FlowCard> flowCardList = new ArrayList<>();
        //流程卡自增符号
        int flowCardNo = 1;
        // 当前架子剩余可放数量
        Integer shelfQuantity = 0;
        while(flowCardQuantity>0){
        }
        return  flowCardList;
    }
}
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2874,4 +2874,27 @@
        group by a.process_id,a.technology_number
    </select>
    <select id="getGlassThicknessByProdutionId">
        select total_thickness as 'totalThickness',thickness as 'thickness' from sd.product
        where id = (
            select distinct b.product_id from sd.order_glass_detail as a
                    left join sd.order_detail as b
                    on a.order_id = b.order_id and a.order_number = b.order_number
                    where a.order_id = #{orderId}
                    and a.production_id = #{productionId}
            )
    </select>
    <select id="getOrderDetailByProductionId">
        select * from (select a.*,
        IF(a.height >= a.width, a.height, a.width) as 'long',
        IF(a.height &lt; a.width, a.height, a.width) as 'short'
        from sd.order_detail as a
        left join sd.order_glass_detail as b
        on a.order_id = b.order_id and a.order_number = b.order_number
        where a.order_id = #{orderId} and b.production_id = #{productionId}
        group by a.order_number) as c
        order by c.`long` desc
    </select>
</mapper>