完善

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;
@@ -53,6 +54,8 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private LocInPrintMatService locInPrintMatService;

    @RequestMapping(value = "/order/list/orderNo")
    public R orderListorderNo(@RequestParam String orderNo) {
@@ -199,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) {