1

zhang

昨天 ac5aafccc214e7de489c01d48c494fdaf3be484f

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -1227,7 +1227,7 @@

    @Override
    @Transactional
    public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
    public synchronized R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {

        if (Cools.isEmpty(param)) {
            throw new CoolException("请求参数有误：" + param);
@@ -1246,6 +1246,10 @@
                HashMap<String, Object> xx = new HashMap<>();
                List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
                for (GwmsGenerateInventoryDto.MatList obj : matList) {
                    int barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("brand", obj.getPackageGroupNo()));
                    if (barcodeCount2 > 0) {
                        throw new CoolException("包装组号已存在工作档（输送线）：" + obj.getPackageGroupNo());
                    }
                    int zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("brand", obj.getPackageGroupNo()));
                    if (zpalletCount2 > 0) {
                        throw new CoolException("包装组号已存在：" + obj.getPackageGroupNo());
@@ -2364,7 +2368,9 @@
            orderMapper.insert(order);
        } else {
            // 1.2 存在，更新单据状态
            order.setStatus(2);
            if (order.getStatus() == 4) {
                order.setStatus(2);
            }
            orderMapper.updateById(order);
        }

@@ -2389,6 +2395,8 @@
                detl.setBrand(param.getPackageGroupNo());   // 包装组号
                detl.setModel(vn.getVolumeNumber());     // 卷号
                orderDetlMapper.insert(detl);
            } else {
                throw new RuntimeException("该单据的卷号已存在," + vn.getVolumeNumber());
            }
        }

@@ -2397,7 +2405,7 @@

    @Override
    @Transactional
    public R unqualifiedOrder(ReturnOrderConfirmParam param) {
    public R unQualifiedOrder(ReturnOrderConfirmParam param) {
        if (Cools.isEmpty(param.getOrderNumber())) {
            param.setOrderNumber("UQCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
        }
@@ -2417,7 +2425,9 @@
            orderMapper.insert(order);
        } else {
            // 1.2 存在，更新单据状态
            order.setStatus(2);
            if (order.getStatus() == 4) {
                order.setStatus(2);
            }
            orderMapper.updateById(order);
        }

@@ -2442,6 +2452,8 @@
                detl.setBrand(param.getPackageGroupNo());   // 包装组号
                detl.setModel(vn.getVolumeNumber());     // 卷号
                orderDetlMapper.insert(detl);
            } else {
                throw new RuntimeException("该单据的卷号已存在," + vn.getVolumeNumber());
            }
        }