*

lsh

13 小时以前 8d702fa2c62b3617f71c5e91293e338d1ccd1549

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

@@ -140,8 +140,21 @@
    public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
        StockOutParam param = new StockOutParam();
        ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
        int staNoOrder = 0;
        for (LocDto locDto:locDtos){
            Order order = orderService.selectByNo(locDto.getOrderNo());

            DocType docType = docTypeService.selectById(order.getDocType());
            if (docType.getDocName().equals("不合格品出库")){
                staNoOrder = 212;
            }
            if (docType.getDocName().equals("拆包装检出库")){
                staNoOrder = 212;
            }
            if (docType.getDocName().equals("退货至二楼")){
                staNoOrder = 212;
            }

            OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId());

            StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
@@ -168,7 +181,7 @@
        }
        param.setLocDetls(locDetls);

        List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
        List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassificationOrder(param,staNoOrder);
        Date now = new Date();
        for (StockOutParam stockOutParam : stockOutParams){
            stockOutParam.setNowTime(now);