rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(wms): 添加订单项数量修改功能并优化相关实体类 

- 在ApplyReturnRequestItemVO中添加剩余数量和领料数量最小值字段
- 在OutAssistanceItemVO、OutCostcenterInfoItemVO中添加领料数量最小值计算逻辑
- 在OutProduceInfoItemVO中添加申请数量最小值计算逻辑
- 新增UpdateItemNumRequest请求类用于接收数量修改参数
- 在OutAssistanceController、OutCostCenterController、OutProduceController中添加updateItemNum接口
- 修复OutProduceController中解锁库存方法的注释问题
- 在测试类中添加数量计算验证逻辑
This commit is contained in:
曹鹏飞 2026-03-24 16:24:13 +08:00
parent 2135376540
commit 680269fea5
9 changed files with 153 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.nflg.wms.admin.pojo.dto.PdfPageDTO;
import com.nflg.wms.admin.pojo.request.UpdateItemNumRequest;
import com.nflg.wms.admin.repository.InventoryForOutRepository;
import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository;
import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@ -168,6 +169,22 @@ public class OutAssistanceController extends BaseController {
return ApiResult.success(vo);
}
/**
* 修改订单项数量
*/
@PostMapping("updateItemNum")
public ApiResult<Void> updateItemNum(@Valid @RequestBody UpdateItemNumRequest request) {
WmsOutAssistanceItem item = outAssistanceItemService.getById(request.getId());
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("订单项不存在");
BigDecimal min = item.getNum().subtract(item.getLeft());
VUtil.trueThrowBusinessError(request.getNum().compareTo(min) < 0).throwMessage("数量不能小于" + min);
BigDecimal difference = request.getNum().subtract(item.getNum());
item.setLeft(item.getLeft().add(difference));
item.setNum(request.getNum());
outAssistanceItemService.updateById(item);
return ApiResult.success();
}
/**
* 获取订单项（PDA使用）
*/
@ -433,7 +450,7 @@ public class OutAssistanceController extends BaseController {
);
Map<String, List<OutMaterialScanRecord>> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7));
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOperationType((short) 1);
optRecordDTO.setOrderId(order.getNo());
optRecordService.add(optRecordDTO);
SubcontractedOrderConfirmDTO dto = sapService.zwm3a04(new SubcontractedOrderConfirmQO()

17
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.nflg.wms.admin.pojo.dto.PdfPageDTO;
import com.nflg.wms.admin.pojo.request.UpdateItemNumRequest;
import com.nflg.wms.admin.repository.InventoryForOutRepository;
import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository;
import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@ -171,6 +172,22 @@ public class OutCostCenterController extends BaseController {
return ApiResult.success(vo);
}
/**
* 修改订单项数量
*/
@PostMapping("updateItemNum")
public ApiResult<Void> updateItemNum(@Valid @RequestBody UpdateItemNumRequest request) {
WmsOutCostcenterItem item = outCostcenterItemService.getById(request.getId());
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("订单项不存在");
BigDecimal min = item.getNum().subtract(item.getLeft());
VUtil.trueThrowBusinessError(request.getNum().compareTo(min) < 0).throwMessage("数量不能小于" + min);
BigDecimal difference = request.getNum().subtract(item.getNum());
item.setLeft(item.getLeft().add(difference));
item.setNum(request.getNum());
outCostcenterItemService.updateById(item);
return ApiResult.success();
}
/**
* 获取订单项（PDA使用）
*/

52
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.nflg.wms.admin.pojo.dto.PdfPageDTO;
import com.nflg.wms.admin.pojo.request.UpdateItemNumRequest;
import com.nflg.wms.admin.repository.InventoryForOutRepository;
import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository;
import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@ -267,23 +268,25 @@ public class OutProduceController extends BaseController {
return ApiResult.success(outProduceService.search(request));
}
/**
* 解锁库存（根据订单）
*/
@PostMapping("0/releaseNumByOrder")
public ApiResult<Void> releaseNumByOrder(@Valid @RequestBody @NotEmpty List<Long> ids) {
outProduceService.releaseNum(ids);
return ApiResult.success();
}
/**
* 解锁库存（根据明细）
*/
@PostMapping("0/releaseNumByItem")
public ApiResult<Void> releaseNumByItem(@Valid @RequestBody @NotEmpty List<Long> ids) {
outProduceItemService.releaseNum(ids);
return ApiResult.success();
}
// /**
// * 解锁库存（根据订单）
// * @deprecated 不需要这个方法了
// */
// @PostMapping("0/releaseNumByOrder")
// public ApiResult<Void> releaseNumByOrder(@Valid @RequestBody @NotEmpty List<Long> ids) {
// outProduceService.releaseNum(ids);
// return ApiResult.success();
// }
//
// /**
// * 解锁库存（根据明细）
// * @deprecated 不需要这个方法了
// */
// @PostMapping("0/releaseNumByItem")
// public ApiResult<Void> releaseNumByItem(@Valid @RequestBody @NotEmpty List<Long> ids) {
// outProduceItemService.releaseNum(ids);
// return ApiResult.success();
// }
/**
* 修改备注
@ -321,6 +324,21 @@ public class OutProduceController extends BaseController {
return ApiResult.success(vo);
}
/**
* 修改订单项数量
*/
@PostMapping("updateItemNum")
public ApiResult<Void> updateItemNum(@Valid @RequestBody UpdateItemNumRequest request) {
WmsOutProduceItem item = outProduceItemService.getById(request.getId());
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("订单项不存在");
VUtil.trueThrowBusinessError(request.getNum().compareTo(item.getNum()) < 0).throwMessage("数量不能小于" + item.getNum());
BigDecimal difference = request.getNum().subtract(item.getSqsl());
item.setLockNum(item.getLockNum().add(difference));
item.setSqsl(request.getNum());
outProduceItemService.updateById(item);
return ApiResult.success();
}
/**
* 获取订单项（PDA使用）
*/

21
nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/UpdateItemNumRequest.java Normal file
View File

@ -0,0 +1,21 @@
package com.nflg.wms.admin.pojo.request;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class UpdateItemNumRequest {
@NotNull
private Long id;
/**
* 新的数量
*/
@NotNull
@Min(value = 0)
private BigDecimal num;
}

28
nflg-wms-admin/src/test/java/com/nflg/wms/admin/ATest.java
View File

@ -3,26 +3,38 @@ package com.nflg.wms.admin;
import cn.hutool.core.util.StrUtil;
import com.nflg.wms.common.util.DateTimeUtil;
import org.junit.jupiter.api.Test;
import org.springframework.util.Assert;
import java.math.BigDecimal;
import java.time.LocalDateTime;
public class ATest {
@Test
public void test1(){
Long index=2L;
System.out.println("K"+ StrUtil.padPre(String.valueOf(index),6,"0"));
public void test1() {
Long index = 2L;
System.out.println("K" + StrUtil.padPre(String.valueOf(index), 6, "0"));
}
@Test
public void test2(){
String index="0000";
System.out.println(StrUtil.removeAllPrefix(index,"0"));
public void test2() {
String index = "0000";
System.out.println(StrUtil.removeAllPrefix(index, "0"));
}
@Test
public void test3(){
String date=DateTimeUtil.format(LocalDateTime.now(), "yyMMdd");
public void test3() {
String date = DateTimeUtil.format(LocalDateTime.now(), "yyMMdd");
System.out.println(date);
}
@Test
public void test4() {
BigDecimal num1 = new BigDecimal("5");
BigDecimal num2 = new BigDecimal("2");
BigDecimal left = new BigDecimal("3");
BigDecimal a = left.add(num2.subtract(num1));
System.out.println(a);
Assert.isTrue(a.compareTo(BigDecimal.ZERO) == 0, "数量错误");
}
}

15
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.common.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import lombok.experimental.Accessors;
@ -56,6 +57,20 @@ public class ApplyReturnRequestItemVO {
*/
private BigDecimal requestQuantity;
/**
* 剩余数量
*/
private BigDecimal left;
/**
* 领料数量最小值
*/
private BigDecimal requestQuantityLimit;
public BigDecimal getRequestQuantityLimit() {
return requestQuantity.subtract(left);
}
/**
* 出库状态
*/

9
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceItemVO.java
View File

@ -111,6 +111,15 @@ public class OutAssistanceItemVO {
*/
private BigDecimal left;
/**
* 领料数量最小值
*/
private BigDecimal numLimit;
public BigDecimal getNumLimit() {
return num.subtract(left);
}
/**
* 发货仓库
*/

9
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoItemVO.java
View File

@ -105,4 +105,13 @@ public class OutCostcenterInfoItemVO {
* 待领数量
*/
private BigDecimal left;
/**
* 领料数量最小值
*/
private BigDecimal numLimit;
public BigDecimal getNumLimit() {
return num.subtract(left);
}
}

9
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceInfoItemVO.java
View File

@ -126,6 +126,15 @@ public class OutProduceInfoItemVO {
*/
private BigDecimal lockNum;
/**
* 申请数量最小值
*/
private BigDecimal sqslLimit;
public BigDecimal getSqslLimit() {
return num;
}
/**
* 已领数量
*/