修改补片审核

廖井涛

2024-03-07 012a7061f18eaa5524747dc60faae131831793fe

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

@@ -25,10 +25,9 @@
    public Map<String, Object> defaultDateWork(Date selectTime1, Date selectTime2, Integer state, OrderGlassDetail orderGlassDetail) {
        Map<String, Object> map = new HashMap<>();
        // System.out.println(workOrderMapper.selectWordOrder( selectTime1,selectTime2,state, orderGlassDetail));
        if (state==1){
        if (state == 1) {
            map.put("data", workOrderMapper.selectWordOrder(selectTime1, selectTime2, orderGlassDetail));
        }
        else {
        } else {
            map.put("data", workOrderMapper.selectWordOrderNo(selectTime1, selectTime2, orderGlassDetail));
        }

@@ -37,6 +36,7 @@

    public Map<String, Object> AddDateWork(String orderId, OrderDetail orderDetail) {
        Map<String, Object> map = new HashMap<>();

        map.put("data", workOrderMapper.addWordOrder(orderId, orderDetail));
        return map;
    }
@@ -58,19 +58,34 @@

        if (!orderDetaillist.isEmpty()) {
            for (OrderDetail orderDetail : orderDetaillist) {
                //生成生产订单号

                for (int i = 0; i < count; i++) {
                    letters = lettr++;
                    productIdVl = orderID + letters;
                    //查询生成的生产订单号是否存在

                    Integer workCount = workOrderMapper.SelectOrderNumber(productIdVl);
                    if (workCount <1)
                    {
                    if (workCount < 1 ) {
                        break;
                    }

                }
                System.out.println(productIdVl);
                workOrderMapper.AddOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(),userName);

                //添加生产订单
                workOrderMapper.AddOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName);
                Integer State = 2;
                Integer States = 1;
                //查询该订单未转生产订单的条数
                Integer NoWorkCount = workOrderMapper.SelectWorkCount(orderDetail.getOrderId());
                if (NoWorkCount == 0) {
                    //条数为0修改转生产订单状态为2，否则为1
                    workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), State);
                } else {
                    workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), States);
                }
            }

            return true;
        } else {
            return false;
@@ -79,11 +94,19 @@
    }

    public Boolean DeleteOrderWorkSv(String orderId, String productName) {
        if (!orderId.isEmpty()&&!productName.isEmpty()){
        if (!orderId.isEmpty() && !productName.isEmpty()) {
            workOrderMapper.DeleteOrderWorkMp(orderId, productName);
            Integer State = 0;
            Integer States = 1;
            Integer NoWorkCount = workOrderMapper.SelectWorkCount(orderId);
            Integer YesWorkCount = workOrderMapper.SelectYesWorkCount(orderId);
            if (NoWorkCount ==YesWorkCount) {
                workOrderMapper.UpdateWorkType(orderId, State);
            } else {
                workOrderMapper.UpdateWorkType(orderId, States);
            }
            return true;
        }
        else {
        } else {
            return false;
        }
    }