#

pang.jiabao

5 天以前 52b21b24130c75197c039ae0fd761e2ef5b43cb3

 src/main/java/com/zy/asrs/controller/WaitPakinController.java

@@ -10,17 +10,21 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.OrderDetlPakinService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -35,6 +39,9 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private WrkMastService wrkMastService;

    @Resource
    private OrderDetlPakinService orderDetlPakinService;

    @RequestMapping(value = "/waitPakin/{id}/auth")
    @ManagerAuth
@@ -105,8 +112,18 @@
            waitPakinService.delete(new EntityWrapper<>(entity));
            //订单关联，修改订单作业数量
            if (!Cools.isEmpty(entity.getOrderNo())) {
                if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
                    return R.error("订单数据回滚失败");
//                if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
//                    return R.error("订单数据回滚失败");
//                }
                OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand()
                        ,entity.getStandby1(),entity.getStandby2(),entity.getStandby3()
                        ,entity.getBoxType1(),entity.getBoxType2(),entity.getBoxType3()
                        , entity.getAnfme());
                // 恢复到待处理状态
                List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectByOrderId(entity.getOrderId());
                long count = orderDetlPakins.stream().filter(orderDetlPakin -> orderDetlPakin.getWorkQty() != 0).count();
                if (count == 0) {
                    OrderInAndOutUtil.updateOrder(Boolean.TRUE, entity.getOrderId(), 1L, getUserId());
                }
            }
        }