diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java index 3c3a98179..7346d0c26 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java @@ -493,4 +493,8 @@ public class OutMaterialDetail extends BaseVOEntity { @ApiModelProperty("库存数量") @Excel(name = "库存数量") private BigDecimal stockQuantity; + + @ApiModelProperty("抄码总重量") + @Excel(name = "抄码总重量") + private BigDecimal copyTotalWeight; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index e091736a5..66d3970be 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -13,6 +13,8 @@ import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.core.utils.uuid.IdGenerator; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.domain.copyCodeReference.entity.CopyCodeReference; +import com.mhd.wms.domain.copyCodeReference.repository.facade.ICopyCodeReferenceService; import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord; import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.mapper.InventoryAdjustmentRecordMapper; import com.mhd.wms.domain.materialBarCode.repository.facade.IMaterialBarCodeService; @@ -294,6 +296,8 @@ public class OutMaterialDetailImpl extends ServiceImpl materialDetailDOChildList = outMaterialDetailDO.getChildren(); @@ -333,6 +337,10 @@ public class OutMaterialDetailImpl extends ServiceImpl copyCodeReferenceIds; + + @ApiModelProperty("抄码总重量") + @Excel(name = "抄码总重量") + private BigDecimal copyTotalWeight; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index b648be8fa..26ad43765 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -1140,7 +1140,7 @@ public class StockShelfOrderDomainService { copyCodeReference.setMaterialDetailId(shelfMaterialDetail.getMaterialDetailId()); copyCodeReference.setMaterialInventoryId(materialInventoryId.getMaterialInventoryId()); copyCodeReference.setInOrderNumber(materialInventoryId.getInOrderNumber()); - copyCodeReference.setInventoryQuantity(new BigDecimal(shelfMaterialDetail.getCopyQuantity())); + copyCodeReference.setInventoryQuantity(new BigDecimal(1)); copyCodeReference.setNetWeight(shelfMaterialDetail.getTotalNetWeight()); copyCodeReference.setGrossWeight(shelfMaterialDetail.getTotalGrossWeight()); copyCodeReference.setShipperName(materialBaseInfo.getShipperName()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java index e428de001..5d283ccea 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java @@ -462,4 +462,13 @@ public class OutMaterialDetailDTO extends BaseVOEntity { @ApiModelProperty("库存数量") @Excel(name = "库存数量") private BigDecimal stockQuantity; + + @ApiModelProperty("抄码id数组") + @Excel(name = "抄码id数组") + private List copyCodeReferenceIds; + + @ApiModelProperty("抄码总重量") + @Excel(name = "抄码总重量") + private BigDecimal copyTotalWeight; + } \ No newline at end of file