1

zhang

2 天以前 e58e9ba5347a681cd535115c1f83e4788f39a224

1

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

@@ -489,6 +489,19 @@
        return R.ok(param);
    }

    /**
     * 退库单（出库）
     */
    @PostMapping("/returnOrder/auth/v1")
    @AppAuth(memo = "退库单单据下发")
    public synchronized R returnOrder(@RequestHeader(required = false) String appkey,
                                            @RequestBody GroupOrderConfirmParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.returnOrder(param);
        return R.ok(param);
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/

}

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -156,5 +156,7 @@

    R groupOrderConfirm(GroupOrderConfirmParam param);

    R returnOrder(GroupOrderConfirmParam param);


}

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

@@ -2342,7 +2342,60 @@
    }


    @Override
    @Transactional
    public R returnOrder(GroupOrderConfirmParam param) {
        // 1. 查询单据是否存在
        Order order = orderMapper.selectOrderByOrderNo(param.getGroupOrderNumber());
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        if (order == null) {
            // 1.1 不存在，新建单据
            order = new Order();
            order.setOrderNo(param.getGroupOrderNumber());
            order.setStatus(Integer.valueOf(param.getGroupStatus()));
            order.setOrderTime(sdf.format(new Date()));
            order.setCreateTime(new Date());
            order.setSettle(1L);
            order.setDocType(26L);
            orderMapper.insert(order);
        } else {
            // 1.2 存在，更新单据状态
            order.setStatus(Integer.valueOf(param.getGroupStatus()));
            orderMapper.updateById(order);
        }
        orderDetlMapper.delete(
                new EntityWrapper<OrderDetl>().eq("order_no", param.getGroupOrderNumber())
        );

        // 2. 一一对应遍历
        List<GroupOrderConfirmParam.PackageGroupNo> pkgList = param.getPackageGroupNos();
        List<GroupOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();

        int size = Math.min(pkgList.size(), volList.size()); // 防止越界
        for (int i = 0; i < size; i++) {
            GroupOrderConfirmParam.PackageGroupNo pg = pkgList.get(i);
            GroupOrderConfirmParam.VolumeNumber vn = volList.get(i);

            // 查询是否已存在该 detl
            OrderDetl detl = orderDetlMapper.selectByOrderNoAndPkgGroupNoAndVolumeNo(
                    param.getGroupOrderNumber(), pg.getPackageGroupNo(), vn.getVolumeNumber()
            );

            if (detl == null) {
                detl = new OrderDetl();
                detl.setOrderId(order.getId());
                detl.setOrderNo(param.getGroupOrderNumber());
                detl.setCreateTime(new Date());
                detl.setAnfme(1.0);
                detl.setBrand(pg.getPackageGroupNo());   // 包装组号
                detl.setModel(vn.getVolumeNumber());     // 卷号
                orderDetlMapper.insert(detl);
            }
        }

        return R.ok("组货确认成功");
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/
}