出库和拣货详情增加是否抄码标识
This commit is contained in:
+4
@@ -533,4 +533,8 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
|
|||||||
@ApiModelProperty("抄码id数组 逗号分隔")
|
@ApiModelProperty("抄码id数组 逗号分隔")
|
||||||
@Excel(name = "抄码id数组")
|
@Excel(name = "抄码id数组")
|
||||||
private String copyCodeReferenceIds;
|
private String copyCodeReferenceIds;
|
||||||
|
|
||||||
|
@ApiModelProperty("是否抄码: 1-是 2-否")
|
||||||
|
@Excel(name = "是否抄码: 1-是 2-否")
|
||||||
|
private Integer copyCode;
|
||||||
}
|
}
|
||||||
+9
@@ -304,4 +304,13 @@ public class PickingMaterialDetailPO extends BaseVOEntity {
|
|||||||
@ApiModelProperty("出库异常明细:作业数量(拣货异常场景=实际拣货数量)")
|
@ApiModelProperty("出库异常明细:作业数量(拣货异常场景=实际拣货数量)")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private BigDecimal abnormalWorkQuantity;
|
private BigDecimal abnormalWorkQuantity;
|
||||||
|
|
||||||
|
@ApiModelProperty("是否抄码: 1-是 2-否")
|
||||||
|
@Excel(name = "是否抄码: 1-是 2-否")
|
||||||
|
private Integer copyCode;
|
||||||
|
|
||||||
|
@ApiModelProperty("抄码id数组 逗号分隔")
|
||||||
|
@Excel(name = "抄码id数组")
|
||||||
|
private String copyCodeReferenceIds;
|
||||||
|
|
||||||
}
|
}
|
||||||
+1
@@ -236,6 +236,7 @@ public class PickingOrderDomainService {
|
|||||||
if(materialBaseInfo!=null){
|
if(materialBaseInfo!=null){
|
||||||
pickingMaterialDetailPO.setMaterialCode(materialBaseInfo.getMaterialCode());
|
pickingMaterialDetailPO.setMaterialCode(materialBaseInfo.getMaterialCode());
|
||||||
pickingMaterialDetailPO.setMaterialName(materialBaseInfo.getMaterialName());
|
pickingMaterialDetailPO.setMaterialName(materialBaseInfo.getMaterialName());
|
||||||
|
pickingMaterialDetailPO.setCopyCode(materialBaseInfo.getCopyCode());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pickingOrderPO.setMaterialDetailList(pickingMaterialDetailPOList);
|
pickingOrderPO.setMaterialDetailList(pickingMaterialDetailPOList);
|
||||||
|
|||||||
+1
@@ -512,6 +512,7 @@ public class StockOutOrderDomainService {
|
|||||||
outMaterialDetailPO.setCommodityName(materialBaseInfos.get(0).getMaterialName());
|
outMaterialDetailPO.setCommodityName(materialBaseInfos.get(0).getMaterialName());
|
||||||
outMaterialDetailPO.setMaterialCode(materialBaseInfos.get(0).getMaterialCode());
|
outMaterialDetailPO.setMaterialCode(materialBaseInfos.get(0).getMaterialCode());
|
||||||
outMaterialDetailPO.setMaterialName(materialBaseInfos.get(0).getMaterialName());
|
outMaterialDetailPO.setMaterialName(materialBaseInfos.get(0).getMaterialName());
|
||||||
|
outMaterialDetailPO.setCopyCode(materialBaseInfos.get(0).getCopyCode());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stockOutOrderPO.setMaterialDetailList(materialDetailPOList);
|
stockOutOrderPO.setMaterialDetailList(materialDetailPOList);
|
||||||
|
|||||||
+2
@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="totalNetWeight" column="total_net_weight" />
|
<result property="totalNetWeight" column="total_net_weight" />
|
||||||
<result property="totalVolume" column="total_volume" />
|
<result property="totalVolume" column="total_volume" />
|
||||||
<result property="outUniqueId" column="out_unique_id" />
|
<result property="outUniqueId" column="out_unique_id" />
|
||||||
|
<result property="copyCodeReferenceIds" column="COPY_CODE_REFERENCE_IDS" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
|
|
||||||
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_3, a.EXT_ATTR_4,
|
a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_3, a.EXT_ATTR_4,
|
||||||
a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag,
|
a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag,
|
||||||
a.total_area, a.total_gross_weight, a.total_net_weight, a.total_volume, a.out_unique_id,
|
a.total_area, a.total_gross_weight, a.total_net_weight, a.total_volume, a.out_unique_id,
|
||||||
|
a.COPY_CODE_REFERENCE_IDS,
|
||||||
omd.in_order_number, omd.lot_no as lot_number
|
omd.in_order_number, omd.lot_no as lot_number
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user