rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -11,6 +11,7 @@ import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.service.AsnOrderService; import com.vincent.rsf.server.system.constant.SerialRuleCode; @@ -173,4 +174,17 @@ } return asnOrderService.updateOrderItem(params, getLoginUserId()); } public R batchUpdate(@RequestBody BatchUpdateParam params) { if (Objects.isNull(params)) { return R.error("参数不能为空！！"); } if (Objects.isNull(params.getOrder())) { return R.error("修改参数不能为空！！"); } if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) { return R.error("修改ID不能为空！！"); } return R.ok(asnOrderService.batchUpdate(params, getLoginUserId())); } } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -11,6 +11,7 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate; @@ -74,8 +75,8 @@ return R.error("Save Fail"); } return R.ok("Save Success"); } @PreAuthorize("hasAuthority('manager:asnOrderItem:update')") @OperationLog("Update ASN单据") @@ -144,13 +145,15 @@ @PreAuthorize("hasAuthority('manager:asnOrderItem:update')") public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception { if (Objects.isNull(file)) { throw new CoolException("文件不能为空！！"); R.error("文件不能为空！！"); } HashMap<String, Object> hashMap = new HashMap<>(); if (!Objects.isNull(asnId)) { hashMap.put("asnId", asnId); } return asnOrderItemService.excelImport(file, hashMap); } } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/BatchUpdateParam.java
New file @@ -0,0 +1,24 @@ package com.vincent.rsf.server.manager.controller.params; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; import java.util.List; @Data @Accessors(chain = true) @ApiModel(value = "BatchUpdateParam", description = "批量修改参数") public class BatchUpdateParam implements Serializable { @ApiModelProperty("修改参数") private AsnOrder order; @ApiModelProperty("ids") private List<Long> ids; } rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -110,11 +110,9 @@ @ApiModelProperty(value= "释放状态 0: 正常 1: 已释放 ") private Short rleStatus; /** * 名称 */ @ApiModelProperty(value= "名称") private String name; @ApiModelProperty("执行状态") private Short exceStatus; /** * 状态 1: 正常 0: 冻结 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
@@ -6,6 +6,7 @@ import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import org.springframework.web.multipart.MultipartFile; @@ -24,4 +25,5 @@ R generateBarcode(List<Long> orders); IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import java.util.List; @@ -17,4 +18,7 @@ R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId); R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId); boolean batchUpdate(BatchUpdateParam params, Long loginUserId); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; @@ -13,6 +14,7 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate; import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper; @@ -130,4 +132,5 @@ return hsahMap; } } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -2,12 +2,14 @@ import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.api.entity.dto.PoItemsDto; import com.vincent.rsf.server.api.service.ReceiveMsgService; import com.vincent.rsf.server.api.service.ReportMsgService; import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.mapper.AsnOrderMapper; import com.vincent.rsf.server.manager.entity.AsnOrder; @@ -145,4 +147,28 @@ } return R.ok("修改完成！！"); } /** * @author Ryan * @description 批量修改 * @param * @return * @time 2025/4/1 07:58 */ @Override public boolean batchUpdate(BatchUpdateParam params, Long userId) { AsnOrder order = params.getOrder(); if (Objects.isNull(order)) { throw new CoolException("修改参数不能为空！！"); } return this.update(new LambdaUpdateWrapper<AsnOrder>() .in(AsnOrder::getId, params.getIds()) .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus()) .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus()) .set(!Objects.isNull(order.getStatus()), AsnOrder::getStatus, order.getStatus()) .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType()) .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus()) .set(AsnOrder::getUpdateBy, userId)); } }
