抄码商品生成拣货单存入抄码重量
This commit is contained in:
+4
@@ -525,4 +525,8 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
|
|||||||
@ApiModelProperty("出库异常明细:作业数量(复核异常场景=实际复核数量)")
|
@ApiModelProperty("出库异常明细:作业数量(复核异常场景=实际复核数量)")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private BigDecimal abnormalWorkQuantity;
|
private BigDecimal abnormalWorkQuantity;
|
||||||
|
|
||||||
|
@ApiModelProperty("抄码总重量")
|
||||||
|
@Excel(name = "抄码总重量")
|
||||||
|
private BigDecimal copyTotalWeight;
|
||||||
}
|
}
|
||||||
+6
-1
@@ -655,7 +655,12 @@ public class StockOutOrderDomainService {
|
|||||||
pickingMaterialDetailDO.setExtAttr4(outMaterialDetailPO.getExtAttr4());
|
pickingMaterialDetailDO.setExtAttr4(outMaterialDetailPO.getExtAttr4());
|
||||||
// 毛重、净重、面积、体积从出库单明细自动带出
|
// 毛重、净重、面积、体积从出库单明细自动带出
|
||||||
pickingMaterialDetailDO.setTotalGrossWeight(outMaterialDetailPO.getTotalGrossWeight());
|
pickingMaterialDetailDO.setTotalGrossWeight(outMaterialDetailPO.getTotalGrossWeight());
|
||||||
pickingMaterialDetailDO.setTotalNetWeight(outMaterialDetailPO.getTotalNetWeight());
|
//判断是否是抄码商品净重
|
||||||
|
if (outMaterialDetailPO.getCopyTotalWeight() != null){
|
||||||
|
pickingMaterialDetailDO.setTotalNetWeight(outMaterialDetailPO.getCopyTotalWeight());
|
||||||
|
}else {
|
||||||
|
pickingMaterialDetailDO.setTotalNetWeight(outMaterialDetailPO.getTotalNetWeight());
|
||||||
|
}
|
||||||
pickingMaterialDetailDO.setTotalArea(outMaterialDetailPO.getTotalArea());
|
pickingMaterialDetailDO.setTotalArea(outMaterialDetailPO.getTotalArea());
|
||||||
pickingMaterialDetailDO.setTotalVolume(outMaterialDetailPO.getTotalVolume());
|
pickingMaterialDetailDO.setTotalVolume(outMaterialDetailPO.getTotalVolume());
|
||||||
pickingMaterialDetailList.add(pickingMaterialDetailDO);
|
pickingMaterialDetailList.add(pickingMaterialDetailDO);
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="inOrderNumber" column="in_order_number" />
|
<result property="inOrderNumber" column="in_order_number" />
|
||||||
<result property="stockUnit" column="stock_unit" />
|
<result property="stockUnit" column="stock_unit" />
|
||||||
<result property="stockQuantity" column="stock_quantity" />
|
<result property="stockQuantity" column="stock_quantity" />
|
||||||
|
<result property="copyTotalWeight" column="COPY_TOTAL_WEIGHT" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
|
|
||||||
@@ -145,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
a.INVENTORY_DATE,
|
a.INVENTORY_DATE,
|
||||||
a.EXT_ATTR_3,
|
a.EXT_ATTR_3,
|
||||||
a.EXT_ATTR_4,
|
a.EXT_ATTR_4,
|
||||||
|
a.COPY_TOTAL_WEIGHT,
|
||||||
a.INVENTORY_QUANTITY
|
a.INVENTORY_QUANTITY
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user