weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消分配;

Browse Source
This commit is contained in:
王奎兴
2026-01-28 15:41:03 +08:00
parent 04ed2148a7
commit 0652ccecf4
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java
+4
View File
@@ -1,6 +1,7 @@
package com.mhd.wms.domain.outMaterialDetail.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -384,4 +385,7 @@ public class OutMaterialDetail extends BaseVOEntity {
@ApiModelProperty("单位")
@Excel(name = "单位")
private String unit;
@TableField(exist = false)
private BigDecimal actualQuantity;
}
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+4 -2
View File
@@ -398,6 +398,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
throw new ServiceException("物料信息不存在");
}
OutMaterialDetail outMaterialDetail = new OutMaterialDetail();
outMaterialDetail.setActualQuantity(outMaterialDetailDO.getActualQuantity());
outMaterialDetail.setMaterialInventoryId(outMaterialDetailDO.getMaterialInventoryId());
outMaterialDetail.setMaterialBaseInfoId(outMaterialDetailDO.getMaterialBaseInfoId());
outMaterialDetail.setMaterialDetailId(outMaterialDetailDO.getMaterialDetailId());
outMaterialDetail.setUpdateBy(loginUser.getUserid());
outMaterialDetail.setUpdateByName(loginUser.getUsername());
@@ -457,7 +460,6 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
}
//保存物料明细信息
updateBatchById(outMaterialDetailList);
//取消分配
qxfp(outMaterialDetailList,outOrderNumber,loginUser);
return stockOutOrderPO;
@@ -467,7 +469,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber));
for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity();
BigDecimal allocationQuantity = outMaterialDetail.getActualQuantity();
MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
if (materialInventoryPO != null) {
//更新库存数量
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java
+2 -2
View File
@@ -84,8 +84,8 @@ public class OutMaterialDetailDTO extends BaseVOEntity {
@Excel(name = "复核数量")
private BigDecimal checkQuantity;
@ApiModelProperty("作业数量（例如：分配数量 拣货数量 复核数量）")
@Excel(name = "作业数量（例如：分配数量 拣货数量 复核数量）")
@ApiModelProperty("作业数量（例如：分配数量 拣货数量 复核数量 取消数量）")
@Excel(name = "作业数量（例如：分配数量 拣货数量 复核数量 取消数量）")
private BigDecimal actualQuantity;
@ApiModelProperty("净重 单位：千克")