#修改 1.标准收货信息修改 2. ASN单据保存抛异常问题修复

skyouc

2025-03-28 061cff4dd6cba45d2ad6dba82e415d5d3ef53478

#修改
1.标准收货信息修改
2. ASN单据保存抛异常问题修复

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java

@@ -56,17 +56,17 @@

    /**
     * 标准扫码收货信息
     * @param barcode
     * @param trackCode
     * @return
     */
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @GetMapping("/orders/{barcode}")
    @GetMapping("/orders/{trackCode}")
    @ApiOperation("标准扫码收货")
    public R  getOrderBybarcode(@PathVariable String barcode) {
        if (StringUtils.isEmpty(barcode)) {
    public R  getOrderBybarcode(@PathVariable String trackCode) {
        if (StringUtils.isEmpty(trackCode)) {
            throw new CoolException("条码不能为空！！");
        }
        return mobileService.getOrderByCode(barcode);
        return mobileService.getOrderByCode(trackCode);
    }

    /**

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java

@@ -61,6 +61,9 @@
    @ApiModelProperty("采购数量")
    private Double purQty;

    @ApiModelProperty("实际送货数量")
    private Double anfme;

    @ApiModelProperty("收货数量")
    private Double receiptQty;


 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -142,7 +142,7 @@
        if (StringUtils.isEmpty(barcode)) {
            return R.error("标签码不能为空！！");
        }
        List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getBarcode, barcode));
        List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, barcode));
        if (Objects.isNull(asnOrderItem)) {
            throw new CoolException("单据明细不存在！！");
        }
@@ -166,7 +166,6 @@
        if (Objects.isNull(params.getWhAreaId())) {
            throw new CoolException("库区标识不能为空！！");
        }


        WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));
        if (Objects.isNull(areasItem)) {
@@ -200,7 +199,7 @@
            if (Objects.isNull(dto.getReceiptQty())) {
                throw new CoolException("收货数据不能为空！！");
            }
            if (dto.getReceiptQty() < dto.getPurQty()) {
            if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
                throw new CoolException("收货数量不能大于采购数量！！");
            }

@@ -389,7 +388,8 @@
                    .setMaktx(asnOrderItem.getMaktx())
                    .setBarcode(asnOrderItem.getBarcode())
                    .setPoCode(asnOrderItem.getPoCode())
                    .setPurQty(asnOrderItem.getAnfme())
                    .setAnfme(asnOrderItem.getAnfme())
                    .setPurQty(asnOrderItem.getPurQty())
                    .setSplrBatch(asnOrderItem.getSplrBatch());

            Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());

 rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java

@@ -22,7 +22,7 @@
//        generator.username="sa";
//        generator.password="Zoneyung@zy56$";

        generator.table="man_wait_pakin_item";
        generator.table="man_asn_order_log";
        generator.tableDesc="组拖档明细";
        generator.packagePath="com.vincent.rsf.server.manager";


 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java

@@ -130,7 +130,7 @@
        if (Objects.isNull(params.getOrders().getId())) {
            throw new CoolException("数据错误：单据ID不能为空！！");
        }
        if (this.updateById(params.getOrders())) {
        if (!this.updateById(params.getOrders())) {
            throw new CoolException("主单修改失败！！");
        }
        if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
@@ -138,7 +138,7 @@
        }
        List<Map<String, Object>> items = params.getItems();
        List<AsnOrderItem> asnOrderItems = JSONArray.parseArray(JSONArray.toJSONString(items), AsnOrderItem.class);
        if (asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
        if (!asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
            throw new CoolException("明细修改失败！！");
        }
        return R.ok("修改完成！！");