skyouc
2025-03-27 d6b13df30e16678f03505f2f0a3b1136b6a5068b
#新增
1. 新增收货通知单主表,明细表修改接口
4个文件已修改
48 ■■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -147,7 +147,7 @@
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    public R getListByMatnr(@RequestBody Map<String, String> params){
        if (Objects.isNull(params)) {
            throw new CoolException("查询条件不能为空!!");
            return R.error("查询条件不能为空!!");
        }
        return R.ok(asnOrderService.getListByMatnr(params));
    }
@@ -158,8 +158,18 @@
    @PreAuthorize("hasAuthority('manager:asnOrder:save')")
    public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) {
        if (Objects.isNull(params)) {
            throw new CoolException("参数不能为空!!");
           return R.error("参数不能为空!!");
        }
        return asnOrderService.saveOrderAndItems(params);
    }
    @ApiOperation("单据信息修改")
    @PostMapping("/asnOrder/items/update")
    @PreAuthorize("hasAuthority('manager:asnOrder:update')")
    public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空!!");
        }
        return asnOrderService.updateOrderItem(params);
    }
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -15,4 +15,6 @@
    List<AsnOrder> getListByMatnr(Map<String, String> params);
    R saveOrderAndItems(AsnOrderAndItemsParams params);
    R updateOrderItem(AsnOrderAndItemsParams params);
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -21,6 +22,7 @@
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -114,4 +116,32 @@
        });
        return R.ok("保存成功!!");
    }
    /**
     * 表单明细修改
     * @param params
     * @return
     */
    @Override
    @Transactional
    public R updateOrderItem(AsnOrderAndItemsParams params) {
        if (Objects.isNull(params.getOrders())) {
            throw new CoolException("主单信息不能为空!!");
        }
        if (Objects.isNull(params.getOrders().getId())) {
            throw new CoolException("数据错误:单据ID不能为空!!");
        }
        if (this.updateById(params.getOrders())) {
            throw new CoolException("主单修改失败!!");
        }
        if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
            return R.ok("修改完成!!");
        }
        List<Map<String, Object>> items = params.getItems();
        List<AsnOrderItem> asnOrderItems = JSONArray.parseArray(JSONArray.toJSONString(items), AsnOrderItem.class);
        if (asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
            throw new CoolException("明细修改失败!!");
        }
        return R.ok("修改完成!!");
    }
}
rsf-server/src/main/resources/application.yml
@@ -23,7 +23,7 @@
  #  global-config:
  #    field-strategy: 0
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    map-underscore-to-camel-case: true
    cache-enabled: true
    call-setters-on-nulls: true