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

wuyouming666

2025-03-05 400d9cf0e5cd5e40b1676cab1c9857931d46849a

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

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java

@@ -73,5 +73,7 @@
    private String baiscQuantity;
    @TableField(exist= false,select = false)
    private Integer landingSequence;
    @TableField(exist= false,select = false)
    private Integer thickness;

}

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

@@ -230,7 +230,7 @@

    Map<String,Object> getGlassThicknessByProdutionId(String orderId,String productionId);

    List<OrderDetail>  getOrderDetailByProductionId(String orderId, String productionId,String type,Float inLenMax,Float inLenMin,Float inShortMax,Float inShortMin);
    List<OrderDetail>  getOrderDetailByProductionId(String orderId, String productionId, String type, Float inLenMax, Float inLenMin, Float inShortMax, Float inShortMin, Float glassThickness);

    Boolean revokeComposing(String processId);


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

@@ -1095,8 +1095,8 @@
        Float glassThickness = Float.parseFloat(thickness.get("thickness").toString());

        //获取此工程号订单明细信息
        List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"scope",inLenMax,inLenMin,inShortMax,inShortMin);
        List<OrderDetail> orderDetailsNotScope = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"notScope",inLenMax,inLenMin,inShortMax,inShortMin);
        List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"scope",inLenMax,inLenMin,inShortMax,inShortMin,glassThickness);
        List<OrderDetail> orderDetailsNotScope = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"notScope",inLenMax,inLenMin,inShortMax,inShortMin,glassThickness);

        //根据玻璃厚度和垫片厚度当前架子最大可放数量
        Integer shelfMaxQuantityByThickness = (int) (shelfThickness / (glassTotalThickness + spacerThickness));

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

@@ -2900,6 +2900,7 @@
    <select id="getOrderDetailByProductionId">
        select * from (select a.*,
                              a.quantity as 'baiscQuantity',
                              #{glassThickness} as 'thickness',
        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