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

Merge branch 'develop' into feature/NoScanning

This commit is contained in:
曹鹏飞 2026-06-02 10:29:10 +08:00
parent 9213b663d0 b237e333c8
commit f9eff98da3
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
View File

@ -428,7 +428,7 @@ public class InProduceOrderSurplusController extends BaseController {
.stream()
.map(list -> new InventoryInDTO()
.setMaterialNo(list.get(0).getMaterialNo())
.setOrder(100)
.setOrder(1000000)
.setBatchNo(list.get(0).getBatchNo())
.setSerialNo(list.get(0).getSerialNo())
.setFactoryNo(list.get(0).getFactoryNo())

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
View File

@ -114,6 +114,7 @@ public class MaterialControllerService {
WmsMaterial old = materialService.getById(request.getId());
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在！");
WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request);
wmsMaterial.setId(IdUtil.getSnowflakeNextId());
wmsMaterial.setVersion(old.getVersion());
wmsMaterial.setCreateBy(UserUtil.getUserName());
wmsMaterial.setCreateTime(LocalDateTime.now());

10
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.common.pojo.dto;
import cn.hutool.core.util.StrUtil;
import lombok.Data;
import lombok.experimental.Accessors;
@ -62,10 +63,17 @@ public class InventoryInDTO {
*/
private Integer order;
public Integer getOrder() {
if (Objects.isNull(order) && StrUtil.isNotBlank(getBatchNo())) {
return Integer.parseInt(getBatchNo().substring(4));
}
return order;
}
private String key;
public String getKey() {
return getMaterialNo() + "|" + getFactoryNo() + "|" + getWarehouseNo() + "|" + getBatchNo() + "|"
+ getSerialNo() + "|" + order + "|" + getBinLocation();
+ getSerialNo() + "|" + getOrder() + "|" + getBinLocation();
}
}