工单管理模块修改

chenlu

2024-02-22 c6b112564e0a97fc20db23e67dae0adee03f941c

 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));
        }

@@ -62,15 +61,24 @@
                    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());
                System.out.println(NoWorkCount);
                if (NoWorkCount == 0) {
                    workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), State);
                } else {
                    workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), States);
                }
            }

            return true;
        } else {
            return false;
@@ -79,11 +87,20 @@
    }

    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);
            System.out.println(NoWorkCount);
            if (NoWorkCount ==YesWorkCount) {
                workOrderMapper.UpdateWorkType(orderId, State);
            } else {
                workOrderMapper.UpdateWorkType(orderId, States);
            }
            return true;
        }
        else {
        } else {
            return false;
        }
    }