bug调整

ZY

2024-09-18 2718a5f2b9a4b65d257adaa61f436d7ecaed9656

 src/main/java/com/zy/common/web/WcsController.java

@@ -53,6 +53,12 @@
    @Autowired
    private StaDescService staDescService;

    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderDetlService orderDetlService;


    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -78,9 +84,12 @@
                return R.parse(CodeRes.NO_COMB_700);
            }
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
            if (countLoc > 0) {
                return R.error("库存条码数据已存在");
            }
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
            if (countLoc > 0 || countWrk > 0) {
                return R.error(CodeRes.EXIST_500);
            if (countWrk > 0) {
                return R.error("工作档已存在");
            }
        }
        if (Cools.isEmpty(param.getLocType1())) {
@@ -112,6 +121,7 @@
    @ResponseBody
    @Transactional
    public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
        log.info("收到WCS入库接口请求2====>>入参:{}", param);
        if (Cools.isEmpty(param.getIoType())) {
            return R.error("入出库类型不能为空");
        }
@@ -353,6 +363,22 @@
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!Cools.isEmpty(waitPakin.getOrderNo())) {
                Order order = orderService.selectByNo(waitPakin.getOrderNo());
                if (order != null) {
                    OrderDetl orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), waitPakin.getBatch(), waitPakin.getAnfme());
                    if (orderDetl == null) {
                        orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null,waitPakin.getAnfme());
                    }
                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                    wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    wrkDetl.setPacking(orderDetl.getPacking());
                    wrkDetl.setColor(orderDetl.getColor());
                    wrkDetl.setWareId(orderDetl.getWareId());
                    wrkDetl.setWareName(orderDetl.getWareName());
                }
            }
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }