PC上架异常修改

This commit is contained in:
秦鸿展
2026-04-01 16:54:24 +08:00
parent 9378e2cd5b
commit e0e418f74c
@@ -150,7 +150,11 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
List<InOrderAbnormal> inOrderAbnormalList = new ArrayList<>();
for (ShelfMaterialDetail shelfMaterialDetail : shelfMaterialDetailList){
//上架
if (shelfMaterialDetail.getShelvesQuantity().compareTo(shelfMaterialDetail.getQuantity()) != 0&&shelfMaterialDetail.getLevel() == 1){
BigDecimal actualShelvesQty = shelfMaterialDetail.getAlreadyShelvesQuantity() != null
? shelfMaterialDetail.getAlreadyShelvesQuantity()
: (shelfMaterialDetail.getShelvesQuantity() != null ? shelfMaterialDetail.getShelvesQuantity() : BigDecimal.ZERO);
BigDecimal planQty = shelfMaterialDetail.getQuantity() != null ? shelfMaterialDetail.getQuantity() : BigDecimal.ZERO;
if (actualShelvesQty.compareTo(planQty) != 0){
//判断是否存在异常 根据设置的是否允许超收 取值动态赋值 先默认写死 收货异常
InOrderAbnormal inOrderAbnormal = new InOrderAbnormal();
//赋值基础数据
@@ -158,19 +162,19 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
//赋值物料信息
BeanUtils.copyProperties(shelfMaterialDetail, inOrderAbnormal, IgnoreNullUtil.getNullPropertyNames(shelfMaterialDetail));
inOrderAbnormal.setAbnormalNumber(OrderSequence.getOrderCode("SHYC"));
if (shelfMaterialDetail.getAlreadyShelvesQuantity().compareTo(shelfMaterialDetail.getQuantity()) > 0){
if (actualShelvesQty.compareTo(planQty) > 0){
//上架数量大于收货数量
inOrderAbnormal.setAbnormalType(1);
inOrderAbnormal.setActualQuantity(shelfMaterialDetail.getShelvesQuantity());
inOrderAbnormal.setActualQuantity(actualShelvesQty);
inOrderAbnormal.setAbnormalReason("上架数量大于收货数量");
}else if (shelfMaterialDetail.getAlreadyShelvesQuantity().compareTo(shelfMaterialDetail.getQuantity()) < 0){
}else if (actualShelvesQty.compareTo(planQty) < 0){
//上架数量小于收货数量
inOrderAbnormal.setAbnormalType(1);
inOrderAbnormal.setActualQuantity(shelfMaterialDetail.getShelvesQuantity());
inOrderAbnormal.setActualQuantity(actualShelvesQty);
inOrderAbnormal.setAbnormalReason("上架数量小于收货数量");
}
inOrderAbnormal.setAllowActualQuantity(shelfMaterialDetail.getQuantity());
inOrderAbnormal.setAbnormalActualQuantity(shelfMaterialDetail.getShelvesQuantity().subtract(shelfMaterialDetail.getQuantity()));
inOrderAbnormal.setAllowActualQuantity(planQty);
inOrderAbnormal.setAbnormalActualQuantity(actualShelvesQty.subtract(planQty));
inOrderAbnormal.setCreateBy(loginUser.getUserid());
inOrderAbnormal.setCreateByName(userRealName);
inOrderAbnormal.setCreateTime(new Date());