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

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -46,9 +47,9 @@ public class MesPackage extends BaseBean {
     @ApiParam("包装规格数量")
     private Double packSpecQty;
 
-    @Column(name = "NUIT")
+    @Column(name = "UNIT")
     @ApiParam("包装规格数量")
-    private String nuit;
+    private String unit;
 
     @Column(name = "LOT_NO")
     @ApiParam("批号")
@@ -62,6 +63,10 @@ public class MesPackage extends BaseBean {
     @ApiParam("是否封箱")
     private Integer isSealed;
 
+    @Transient
+    @ApiParam("封箱状态")
+    private String sealStatus;
+
     @Column(name = "PRINT_STATUS")
     @ApiParam("打印状态10：未打印 20：已打印")
     private Integer printStatus;

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

@@ -112,10 +112,6 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("客户代码")
     private String custCode;
 
-    @Column(name = "PACKAGE_SN")
-    @ApiParam("包装条码")
-    private String packageSn;
-
     @Column(name = "SN_TYPE")
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
@@ -178,7 +174,6 @@ public class MesProduceSn extends BaseBean implements Serializable {
                 ", workOrderNo='" + workOrderNo + '\'' +
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
-                ", packageSn='" + packageSn + '\'' +
                 ", snType='" + snType + '\'' +
                 ", tray='" + tray + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -46,9 +47,9 @@ public class MesPackage extends BaseBean {
     @ApiParam("包装规格数量")
     private Double packSpecQty;
 
-    @Column(name = "NUIT")
+    @Column(name = "UNIT")
-    @ApiParam("包装规格数量")
+    @ApiParam("单位")
-    private String nuit;
+    private String unit;
 
     @Column(name = "LOT_NO")
     @ApiParam("批号")
@@ -62,6 +63,10 @@ public class MesPackage extends BaseBean {
     @ApiParam("是否封箱")
     private Integer isSealed;
 
+    @Transient
+    @ApiParam("封箱状态")
+    private String sealStatus;
+
     @Column(name = "PRINT_STATUS")
     @ApiParam("打印状态10：未打印 20：已打印")
     private Integer printStatus;

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

@@ -83,7 +83,7 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否投料配置")
     private Integer isFeed;
 
-    @Column(name = "is_BIND_KEY")
+    @Column(name = "IS_BIND_KEY")
     @ApiParam(value = "是否绑定关键件")
     private Integer isBindKey;
 

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

@@ -109,10 +109,6 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("客户代码")
     private String custCode;
 
-    @Column(name = "PACKAGE_SN")
-    @ApiParam("包装条码")
-    private String packageSn;
-
     @Column(name = "SN_TYPE")
     @ApiParam("条码类型")
     private Integer snType;
@@ -175,7 +171,6 @@ public class MesProduceSn extends BaseBean {
                 ", workOrderNo='" + workOrderNo + '\'' +
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
-                ", packageSn='" + packageSn + '\'' +
                 ", snType='" + snType + '\'' +
                 ", tray='" + tray + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +

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

@@ -880,7 +880,6 @@ public class MesHqlPack {
     public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean);
         return packBean;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -76,12 +76,12 @@ public class WmsInterfaceDataMapper extends BaseBean {
     /**
      * 目标实体对象的名字，多个字段用半角逗号分隔
      */
-    @Column(name = "DEST_BEAN_NAME", length = 50)
+    @Column(name = "DEST_BEAN_NAME", length = 500)
     public String destBeanName;
     /**
      * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔
      */
-    @Column(name = "DEST_PK_PROPERTIES", length = 50)
+    @Column(name = "DEST_PK_PROPERTIES", length = 500)
     public String destPkProperties;
     /**
      * 源表字段与目标对象属性的映射关系，List<MappingItem> 对象，JSON 格式存储