diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java index 5ffdb3901..f9d3977a7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java @@ -529,4 +529,8 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO { @ApiModelProperty("抄码总重量") @Excel(name = "抄码总重量") private BigDecimal copyTotalWeight; + + @ApiModelProperty("抄码id数组 逗号分隔") + @Excel(name = "抄码id数组") + private String copyCodeReferenceIds; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java index cebc873e4..1c28c3d46 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java @@ -291,4 +291,8 @@ public class PickingMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("贴标费") @Excel(name = "贴标费") private BigDecimal stickerFee; + + @ApiModelProperty("抄码id数组 逗号分隔") + @Excel(name = "抄码id数组") + private String copyCodeReferenceIds; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index f5b45e931..28afef45d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -658,6 +658,7 @@ public class StockOutOrderDomainService { //判断是否是抄码商品净重 if (outMaterialDetailPO.getCopyTotalWeight() != null){ pickingMaterialDetailDO.setTotalNetWeight(outMaterialDetailPO.getCopyTotalWeight()); + pickingMaterialDetailDO.setCopyCodeReferenceIds(outMaterialDetailPO.getCopyCodeReferenceIds()); }else { pickingMaterialDetailDO.setTotalNetWeight(outMaterialDetailPO.getTotalNetWeight()); } diff --git a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml index 08061dfaf..69d11fe73 100644 --- a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml @@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -147,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.EXT_ATTR_3, a.EXT_ATTR_4, a.COPY_TOTAL_WEIGHT, + a.COPY_CODE_REFERENCE_IDS, a.INVENTORY_QUANTITY