完善

cp

2024-10-30 431f88fdade07a22b636714f1690cee3a55668d0

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java

@@ -10,6 +10,7 @@
import com.zy.asrs.common.domain.dto.WrkTraceVo;
import com.zy.asrs.common.domain.param.OrderDomainParam;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.mapper.OrderDetlMapper;
import com.zy.asrs.common.wms.service.*;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
@@ -19,6 +20,7 @@
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.framework.exception.CoolException;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -52,15 +54,20 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private LocInPrintMatService locInPrintMatService;

    @RequestMapping(value = "/order/list/orderNo")
    public R orderListorderNo(@RequestParam String orderNo) {
        //数量修改成为完成数量
        List<OrderDetl> orderDetl1=orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo,orderNo));
        List<OrderDetl> orderDetl1 = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo, orderNo));
        List<OrderDetl> orderDetls= new ArrayList<OrderDetl>();
        for (OrderDetl o: orderDetl1) {
            BigDecimal c1 = new BigDecimal(o.getEnableQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
            o.setAnfme(c1.doubleValue());
            if (o.getAnfme().equals(0.0)){
                continue;
            }
            orderDetls.add(o);
        }
        return R.ok(orderDetls);
@@ -72,10 +79,22 @@
        return R.ok(orderService.selectAllorderNo(getHostId()));
    }

    @RequestMapping(value = "/order/comb/list/all")
    @ManagerAuth
    public R orderListComb() {
        return R.ok(orderService.selectAllCombOrderNo(getHostId()));
    }

//    @RequestMapping(value = "/outOrder/list/all")
//    @ManagerAuth
//    public R orderOutList() {
//        return R.ok(orderService.selectAllOutOrderNo(getHostId()));
//    }

    @RequestMapping(value = "/outOrder/list/all")
    @ManagerAuth
    public R orderOutList() {
        return R.ok(orderService.selectAllOutOrderNo(getHostId()));
    public R orderOutListOrder(@RequestBody String orderNo) {
        return R.ok(orderService.selectAllOutOrderNo(orderNo,getHostId()));
    }

    @RequestMapping(value = "/order/{id}/auth")
@@ -142,6 +161,7 @@

        param.remove("order_no");
        allLike(Order.class, param.keySet(), wrapper, condition);
        wrapper.orderByDesc("create_time");
        return R.ok(orderService.page(new Page<>(curr, limit), wrapper));
    }

@@ -182,6 +202,27 @@
        return R.ok();
    }

    @RequestMapping(value = "/order/dy")
    @ManagerAuth(memo = "手动删除订单")
    @Transactional
    public R dy(@RequestParam Long orderId){
        List<OrderDetl> list = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, orderId));
        for (OrderDetl orderDetl : list) {
            LocInPrintMat locInPrintMat = new LocInPrintMat();
            locInPrintMat.setMatnr(orderDetl.getMatnr());
            locInPrintMat.setMaktx(orderDetl.getMaktx());
            locInPrintMat.setStatus(1);
            locInPrintMat.setOrderNo(orderDetl.getOrderNo());
            locInPrintMat.setBatch(orderDetl.getBatch());
            locInPrintMat.setCreateBy(getUserId());
            locInPrintMat.setCreateTime(new Date());
            locInPrintMat.setUpdateTime(new Date());
//            locInPrintMat.setDercees(orderDetl.getDercees);
            locInPrintMatService.save(locInPrintMat);
        }
        return R.ok();
    }

    @RequestMapping(value = "/orderQuery/auth")
    @ManagerAuth
    public R query(String condition) {