Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java

@@ -51,10 +51,12 @@ public class AndonCellEventCause extends BaseBean implements Serializable {
     @ApiParam(value = "事件原因代码")
     private String ecCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "安灯类型名称")
     private String alarmCodeName;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "事件原因描述")
     private String ecName;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java

@@ -51,10 +51,12 @@ public class AndonCellEventMethod extends BaseBean implements Serializable {
     @ApiParam(value = "处理方法代码")
     private String emCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "安灯类型名称")
     private String alarmCodeName;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "处理方法描述")
     private String emName;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java

@@ -62,10 +62,12 @@ public class AndonCellGroupCfg extends BaseBean implements Serializable {
     @ApiParam(value = "纵坐标")
     private Float verticalAxis;
 
+    @AnnoOutputColumn(hidden = true)
     @Column(name = "ABNORMAL_SRC")
     @ApiParam(value = "异常图片")
     private String abnormalSrc;
 
+    @AnnoOutputColumn(hidden = true)
     @Column(name = "NORMAL_SRC")
     @ApiParam(value = "正常图片")
     private String normalSrc;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2246,6 +2246,9 @@ public class MesHqlPack {
         if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesProduceSnTravel.getCreateDateTimeStart(),

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -55,4 +55,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
 
     @ApiParam(value = "拆分条码")
     public Integer splitSn;
+
+    @ApiParam("关联单据行号")
+    public String refItem;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java

@@ -75,6 +75,10 @@ public class WmsASNMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
+    @Column(name = "REASON")
+    @ApiParam(value = "原因", example = "1")
+    public String reason;
+
     @ApiParam("ASN详情列表")
     @Transient
     public List<WmsASNMasterDetails> asnMasterDetailsList;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -199,6 +199,10 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "部门名称", example = "1")
     public Integer departName;
 
+    @Column(name = "REASON")
+    @ApiParam(value = "原因", example = "1")
+    public String reason;
+
     @Transient
     @ApiParam("周总数")
     private Integer weekRcCount;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -145,6 +147,11 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam("交易类型")
     public String transTypeCodeRdd;
 
+    @Column(name = "REF_ITEM")
+    @ApiParam("关联单据行号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String refItem;
+
     @Transient
     @ApiParam("工厂代码集合")
     private List<String> organizeCodeList;