Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2025-11-07 2abec00842a87162186406af7c2014aae948af49

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

@@ -1485,6 +1485,9 @@

                if (orderDetail.getQuantity() > shelfQuantity) {
                    newOrderDetail.setProcessId(processId);
                    newOrderDetail.setLongSide(orderDetail.getLongSide());
                    newOrderDetail.setShortSide(orderDetail.getShortSide());
                    newOrderDetail.setBuildingNumber(orderDetail.getBuildingNumber());
                    newOrderDetail.setQuantity(Long.valueOf(shelfQuantity));
                    newOrderDetail.setHeight(orderDetail.getHeight());
                    newOrderDetail.setWidth(orderDetail.getWidth());
@@ -1498,6 +1501,10 @@
                    shelfQuantity = shelfQuantity - shelfQuantity;
                } else {
                    newOrderDetail.setProcessId(processId);
                    newOrderDetail.setLongSide(orderDetail.getLongSide());
                    newOrderDetail.setShortSide(orderDetail.getShortSide());
                    newOrderDetail.setBuildingNumber(orderDetail.getBuildingNumber());

                    newOrderDetail.setQuantity(orderDetail.getQuantity());
                    newOrderDetail.setHeight(orderDetail.getHeight());
                    newOrderDetail.setWidth(orderDetail.getWidth());
@@ -1560,7 +1567,15 @@

    public Boolean updateTerminationSv(String processId, Integer orderNumber, Integer value) {
        if (processId!=""){

            flowCardMapper.updateTerminationMp(processId,orderNumber,value);
            //获取终止数量与流程卡数量比较
            Map<String, Object> data = flowCardMapper.getTerminationQuantity(processId,orderNumber);
            Integer terminationNum = (Integer) data.get("termination_quantity");
            Integer totalNum = (Integer) data.get("quantity");
            if (terminationNum==totalNum){
                flowCardMapper.updateTerminationStatus(processId,orderNumber);
            }
            return true;
        }else {
            return false;
@@ -1568,6 +1583,16 @@

    }

    public Boolean updateTerminationNoSv(String processId, Integer orderNumber) {
        if (processId!=""){
            flowCardMapper.updateTerminationNoMp(processId,orderNumber);

            return true;
        }else {
            return false;
        }
    }

    public Map<String, Object> selectCompletedSv(String processId, Integer orderNumber, String process) {
        Map<String, Object> map = new HashMap<>();
        String[] processList = process.split("->");