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

廖井涛

2024-03-12 a97c0e84c8d1f50aa65935643a580527f30b7ece

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

@@ -34,13 +34,14 @@
        return map;
    }

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

        map.put("data", workOrderMapper.addWordOrder(orderId, orderDetail));
        return map;
    }

    public Boolean AddOrderWorkSv(Map<String, Object> object) {
    public Boolean addOrderWorkSv(Map<String, Object> object) {
        String userName = "";
        if (object.get("userName") != null) {
            userName = object.get("userName").toString();
@@ -57,25 +58,31 @@

        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) {
                    //查询生成的生产订单号是否存在

                    Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
                    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);
                //查询该订单未转生产订单的条数
                Integer NoWorkCount = workOrderMapper.selectWorkCount(orderDetail.getOrderId());
                if (NoWorkCount == 0) {
                    workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), State);
                    //条数为0修改转生产订单状态为2，否则为1
                    workOrderMapper.updateWorkType(orderDetail.getOrderId(), State);
                } else {
                    workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), States);
                    workOrderMapper.updateWorkType(orderDetail.getOrderId(), States);
                }
            }

@@ -86,18 +93,17 @@

    }

    public Boolean DeleteOrderWorkSv(String orderId, String productName) {
    public Boolean deleteOrderWorkSv(String orderId, String productName) {
        if (!orderId.isEmpty() && !productName.isEmpty()) {
            workOrderMapper.DeleteOrderWorkMp(orderId, productName);
            workOrderMapper.deleteOrderWorkMp(orderId, productName);
            Integer State = 0;
            Integer States = 1;
            Integer NoWorkCount = workOrderMapper.SelectWorkCount(orderId);
            Integer YesWorkCount = workOrderMapper.SelectYesWorkCount(orderId);
            System.out.println(NoWorkCount);
            Integer NoWorkCount = workOrderMapper.selectWorkCount(orderId);
            Integer YesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
            if (NoWorkCount ==YesWorkCount) {
                workOrderMapper.UpdateWorkType(orderId, State);
                workOrderMapper.updateWorkType(orderId, State);
            } else {
                workOrderMapper.UpdateWorkType(orderId, States);
                workOrderMapper.updateWorkType(orderId, States);
            }
            return true;
        } else {