标准版WMS
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
verou
2025-03-30 fa5b8238f31749cc4b0469df317b5849da08a419 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java


@@ -14,12 +14,10 @@


import com.vincent.rsf.server.common.security.JwtSubject;


import com.vincent.rsf.server.common.utils.CommonUtil;


import com.vincent.rsf.server.common.utils.JwtUtil;


import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;


import com.vincent.rsf.server.manager.entity.*;


import com.vincent.rsf.server.manager.mapper.*;


import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;


import com.vincent.rsf.server.manager.service.AsnOrderLogService;


import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;


import com.vincent.rsf.server.manager.service.WarehouseAreasService;


import com.vincent.rsf.server.manager.service.*;


import com.vincent.rsf.server.system.constant.CodeRes;


import com.vincent.rsf.server.system.constant.SerialRuleCode;


import com.vincent.rsf.server.system.controller.param.LoginParam;


@@ -43,6 +41,7 @@


import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.math.BigDecimal;


import java.text.SimpleDateFormat;


import java.util.*;




/**


@@ -86,6 +85,12 @@




    @Autowired


    private AsnOrderLogService asnOrderLogService;




    @Autowired


    private WaitPakinService waitPakinService;




    @Autowired


    private WaitPakinItemService waitPakinItemService;




    @Autowired


    private AsnOrderItemLogService asnOrderItemLogService;


@@ -166,12 +171,15 @@


            throw new CoolException("库区标识不能为空！！");


        }




        WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));


        WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()


                .eq(WarehouseAreas::getId, params.getWhAreaId()));


        if (Objects.isNull(areasItem)) {


            throw new CoolException("数据错误：当前库区不存在！！");


        }


        //获取已启用的动态扩展字


        List<Fields> fields = fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));


        List<Fields> fields = fieldsMapper.selectList(new LambdaQueryWrapper<Fields>()


                .eq(Fields::getFlagEnable, 1)


                .eq(Fields::getStatus, 1));




        List<ReceiptDetlsDto> receipts = params.getReceipts();


        List<WarehouseAreasItem> allOrders = new ArrayList<>();


@@ -180,7 +188,8 @@




        String asnCode = receipts.stream().findFirst().get().getAsnCode();




        AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));


        AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>()


                .eq(AsnOrder::getCode, asnCode));


        if (Objects.isNull(asnOrder)) {


            throw new CoolException("数据错误：主单不存在！！");


        }


@@ -208,16 +217,24 @@


            if (Objects.isNull(orderItem)) {


                throw new CoolException("通知单明细不存在！！");


            }


            orderItem.setQty(dto.getReceiptQty());


            orderItem.setQty(dto.getReceiptQty())


                    .setProdTime(dto.getProdTime());




            if (asnOrderItemMapper.updateById(orderItem) < 1) {


                throw new CoolException("通知单明细数量修改失败！！");


            }




            WarehouseAreasItem item = new WarehouseAreasItem();


//            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


//            String format = null;


//            if (Objects.isNull(dto.getProdTime())) {


//                 format = dateFormat.format(dto.getProdTime());


//            }


            item.setBarcode(dto.getBarcode())


                    .setAreaName(areasItem.getName())


                    .setAreaId(areasItem.getId())


                    .setProdTime(dto.getProdTime())


                    .setWeight(dto.getWeigth())


                    .setStockUnit(dto.getStockUnit())


                    .setBatch(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto))


                    .setAnfme(dto.getReceiptQty())


@@ -333,7 +350,7 @@


        }


        List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()


                .eq(AsnOrderItem::getAsnCode, params.getAsnCode())


                .eq(!Objects.isNull(params.getBarcode()) ,AsnOrderItem::getBarcode, params.getBarcode()));


                .eq(!Objects.isNull(params.getTrackCode()) ,AsnOrderItem::getTrackCode, params.getTrackCode()));




        if (Objects.isNull(asnOrderItem)) {


            throw new CoolException("单据明细不存在！！");


@@ -378,6 +395,28 @@


        return fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));


    }




    @Override


    public R getDeltByCode(String code) {


        return R.ok(asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, code)));


    }




    /**


     * @author Ryan


     * @description PDA组拖


     * @param


     * @return


     * @time 2025/3/29 14:26


     */


    @Override


    public WaitPakin mergeItems(WaitPakinParam waitPakin) {


        return waitPakinService.mergeItems(waitPakin);


    }




    @Override


    public WaitPakin unBind(WaitPakinParam param) {


        return waitPakinService.unBind(param);


    }




    /**


     * 获取ReceiptDetlsDtos


     */