chenlu
2025-03-25 8d204e1d5a59550707c0cf9c2f049613a625d429
Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
1个文件已修改
19 ■■■■ 已修改文件
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -912,6 +912,13 @@
        List<OrderNumberTransferDTO> orderNumberTransferList = new ArrayList<>();
        oldOrderProcessDetailForReport.forEach(oldOrderProcessDetail -> {
            //修改报工状态为3
            reportingWorkMapper.update(null,new UpdateWrapper<ReportingWork>()
                    .set("reviewed_state",3)
                    .eq("process_id",oldOrderProcessDetail.getProcessId())
            );
            int maxNum = 0;
            for(OrderProcessDetail newOrderProcessDetail : newOrderProcessDetailList){
                if(oldOrderProcessDetail.getReportingWorkNum() == 0){
@@ -927,10 +934,13 @@
                                .eq("order_number", newOrderProcessDetail.getOrderNumber())
                                .eq("technology_number",newOrderProcessDetail.getTechnologyNumber())
                        );
                        maxNum = thisFlowCard.getQuantity();
                        maxNum = thisFlowCard.getQuantity()+thisFlowCard.getExportNumber()
                                -thisFlowCard.getImportNumber();
                    }else{
                        //当不是第一道工序则,拿上一道工序作为最大值
                        maxNum = orderProcessDetailMapper.selectById(newOrderProcessDetail.getId()-1).getReportingWorkNum();
                        //当不是第一道工序则,拿上一道工序减去当前工序作为最大值
                        maxNum = orderProcessDetailMapper.selectById(newOrderProcessDetail.getId()-1).getReportingWorkNum()
                        -orderProcessDetailMapper.selectById(newOrderProcessDetail.getId()).getReportingWorkNum()
                        ;
                    }
                    //判断被转移的数量是否大于可转移的数量最大值
                    int transferNum = 0;
@@ -1020,7 +1030,8 @@
        if(response.getStatusCode() == HttpStatus.OK){
            return true;
        }else{
            return "mes响应超时";
            return "连接mes响应超时";
        }
    }
}