Merge remote-tracking branch 'origin/test' into ext-dev

3 years ago · 7a6e22b771
parent fb1f9cc68c 4be6f3104f
commit 7a6e22b771
1 changed files with 5 additions and 0 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java
@ -117,6 +117,11 @@ public class MesPpMaster extends BaseBean{
    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
    private String type;

+    @Column(name = "PART_NO")
+    @ApiParam("总成物料号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String partNo;
+
    @Transient
    @ApiParam("是否要从拉动计算中扣除")
    private boolean needMinutPullQty = false;