skyouc
2025-03-31 38323f2c29e019fa0394456c24fc4356fa71f7f8
no message
4个文件已修改
25 ■■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -160,7 +160,8 @@
        if (Objects.isNull(params)) {
           return R.error("参数不能为空!!");
        }
        return asnOrderService.saveOrderAndItems(params);
        return asnOrderService.saveOrderAndItems(params, getLoginUserId());
    }
    @ApiOperation("单据信息修改")
@@ -170,6 +171,6 @@
        if (Objects.isNull(params)) {
            return R.error("参数不能为空!!");
        }
        return asnOrderService.updateOrderItem(params);
        return asnOrderService.updateOrderItem(params, getLoginUserId());
    }
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -103,9 +103,7 @@
    @PostMapping("/qlyInspect/save")
    public R save(@RequestBody QlyInspect qlyInspect) {
        qlyInspect.setCreateBy(getLoginUserId());
        qlyInspect.setCreateTime(new Date());
        qlyInspect.setUpdateBy(getLoginUserId());
        qlyInspect.setUpdateTime(new Date());
        if (!qlyInspectService.save(qlyInspect)) {
            return R.error("Save Fail");
        }
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -14,7 +14,7 @@
    List<AsnOrder> getListByMatnr(Map<String, String> params);
    R saveOrderAndItems(AsnOrderAndItemsParams params);
    R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId);
    R updateOrderItem(AsnOrderAndItemsParams params);
    R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId);
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -9,7 +9,6 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
@@ -17,7 +16,6 @@
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.SerialRule;
import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -84,7 +82,7 @@
    }
    @Override
    public R saveOrderAndItems(AsnOrderAndItemsParams params) {
    public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) {
        if (Objects.isNull(params.getOrders())) {
            throw new CoolException("主单信息不能为空");
        }
@@ -96,7 +94,9 @@
        if (Objects.isNull(ruleCode)) {
            throw new CoolException("收货通知单编码生成失败!!");
        }
        orders.setCode(ruleCode);
        orders.setCode(ruleCode)
                .setUpdateBy(loginUserId)
                .setCreateBy(loginUserId);
        if (!this.save(orders)) {
            throw new CoolException("主单保存失败!!");
        }
@@ -107,6 +107,8 @@
            item.put("asnId", orders.getId());
            item.put("asnCode", orders.getCode());
            item.put("poCode", orders.getPoCode());
            item.put("createBy", loginUserId);
            item.put("updateBy", loginUserId);
            if (!asnOrderItemService.fieldsSave(item)) {
                throw new CoolException("明细保存失败!!");
            }
@@ -116,12 +118,14 @@
    /**
     * 表单明细修改
     *
     * @param params
     * @param loginUserId
     * @return
     */
    @Override
    @Transactional
    public R updateOrderItem(AsnOrderAndItemsParams params) {
    public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
        if (Objects.isNull(params.getOrders())) {
            throw new CoolException("主单信息不能为空!!");
        }