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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java

@@ -73,4 +73,8 @@ public class MesPackageTravel extends BaseBean implements Serializable {
     @Column(name = "FN_LOCATION_NO")
     @ApiParam("炉内位置代码")
     private String fnLocationNo;
+
+    @Column(name = "QR_CODE")
+    @ApiParam("包装二维码")
+    private String qrCode;
 }

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

@@ -263,6 +263,10 @@ public class WmsMoveDetails extends BaseBean {
     public Integer lockVersion;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+    @Transient
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 

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

@@ -94,6 +94,10 @@ public class WmsMoveMaster extends BaseBean {
     private String partNo;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+    @Transient
     @ApiParam("明细状态")
     @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class)
     private String itemStatus;

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

@@ -209,6 +209,11 @@ public class WmsMoveSn extends BaseBean {
     private String ZoneNo;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+
+    @Transient
     @ApiParam("交易类型名称")
     private String transTypeName;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -3218,6 +3218,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
+        if (details.getIsRequire() != null) {
+            DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
+        }
         getStringBuilderPack(details, result);
         return result;
     }