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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -2917,7 +2917,8 @@ public class MesEnumUtil {
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
         BH_ORDER(40, "B&H工单"),
-        JIT_ORDER(50, "JIT工单");
+        JIT_ORDER(50, "JIT工单"),
+        STOCK_ORDER(60, "库存工单");
 
         private int value;
         private String description;
@@ -4142,7 +4143,9 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_JIS_STATUS {
-        CREATE(10, "创建");
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        SHIPMENT(30, "已发运");
 
         private int value;
         private String description;
@@ -4211,7 +4214,8 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_JIS_DETAIL_STATUS {
-        CREATE(10, "创建");
+        CREATE(10, "创建"),
+        SHIPMENT(20, "已发运");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java

@@ -351,12 +351,12 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TAG_LIGHT_COLOR_CMD {
-        TAG_LIGHT_COLOR_RED("00", 0, "红"),
+        TAG_LIGHT_COLOR_RED("00", 1, "红"),
-        TAG_LIGHT_COLOR_GREEN("01", 1, "绿"),
+        TAG_LIGHT_COLOR_GREEN("01", 2, "绿"),
-        TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"),
+        TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"),
-        TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"),
+        TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"),
-        TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"),
+        TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"),
-        TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿");
+        TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿");
 
         private String code;
         private Integer value;
@@ -441,18 +441,18 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FINISH_TAG_LIGHT_MUSIC_CMD {
-        FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"),
+        FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"),
-        FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"),
+        FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"),
-        FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"),
+        FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"),
-        FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"),
+        FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"),
-        FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"),
+        FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"),
-        FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"),
+        FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"),
-        FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"),
+        FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"),
-        FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"),
+        FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"),
-        FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"),
+        FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"),
-        FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"),
+        FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"),
-        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"),
+        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"),
-        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss");
+        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss");
 
         private String code;
         private Integer value;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -1551,13 +1551,20 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
+        LOGGER.info("ptl_pcn数据清除查询");
         StringBuffer queryString = new StringBuffer();
-        queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " ");
+        queryString.append("select model from " + persistentClass.getSimpleName()
+                + " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " ");
 
         if (packBean != null) {
             queryString.append(packBean.getWhereAppend());
         }
 
-        return entityManager.createQuery(queryString.toString()).getResultList();
+        Query query = entityManager.createQuery(queryString.toString());
+        for (String key : packBean.getHqlPreparedMap().keySet()) {
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
+        }
+
+        return query.getResultList();
     }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean {
     }
 
     @Transient
+    @ApiParam(value ="是否为数据有效字段")
+    private transient Integer isValidProperty;
+
+    @Transient
+    @ApiParam(value ="是否为弱删除字段")
+    private transient Integer isDeleteWeaklyProperty;
+
+    @Transient
     @ApiParam(value ="元素值")
     private transient Object propertyFormValue;
 

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -79,6 +78,22 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_DEL_WEAK")
+    @ApiParam(value = "是否弱删除")
+    private Integer isObjectDelWeak;
+
+    @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
+    @ApiParam(value = "元素弱删除属性id")
+    private Long elementDelWeakAttrId;
+
+    @Column(name = "IS_OBJECT_VALID")
+    @ApiParam(value = "是否有效")
+    private Integer isObjectValid;
+
+    @Column(name = "ELEMENT_VALID_ATTR_ID")
+    @ApiParam(value = "元素有效属性id")
+    private Long elementValidAttrId;
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/11 8:59 上午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_DETAIL")
+@Api("MES_散件产品配置关系")
+public class MesProdScatterDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3602480079910597288L;
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("散件产品名称")
+    private String partName;
+}

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

@@ -72,19 +72,17 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
-    @Column(name = "PPT_CODE")
+@Column(name = "产品生产类型")
-    @ApiParam("产品生产类型")
+    @ApiParam("产品类型名称")
     private String pptCode;
 
-    @Column(name = "QUEUE_GROUP_NO")
+   @Column(name = "QUEUE_GROUP_NO")
     @ApiParam("分组队列编号")
     private String queueGroupNo;
 
     @Column(name = "GROUP_NO")
     @ApiParam("组内编号")
-    private Integer groupNo;
+    private Integer groupNo;    @Transient
-
-    @Transient
     @ApiParam("队列序号")
     private Double queueSeq;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java

@@ -26,6 +26,9 @@ public class MesButtonFlagModel implements Serializable {
     @ApiParam("按配置修改按钮")
     private boolean updateButtonConfig;
 
+    @ApiParam("按散件修改按钮")
+    private boolean updateButtonScatter;
+
     @ApiParam("下达按钮")
     private boolean transmitButton;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -79,6 +80,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @ApiParam("生产主队列编号")
+    private String orderNo;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterDetail;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/11 9:16 上午
+ * @Modify:
+ */
+public interface MesProdScatterDetailRepository extends BaseRepository<MesProdScatterDetail, Long> {
+}

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

@@ -226,15 +226,28 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean);
         }
 
+        if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+        }
+        if (mesQueueOrder.getQueueType() != null) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean);
+        }
+
         // 只查询创建状态的队列
         DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
 
-        // 时间段查询
+        if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) {
-        DdlPreparedPack.timeBuilder(
+            DdlPreparedPack.timeBuilder(
-                mesQueueOrder.getCreateDateTimeStart(),
+                    mesQueueOrder.getCreateDateTimeStart(),
-                mesQueueOrder.getCreateDateTimeEnd(),
+                    mesQueueOrder.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
+                    "createDatetime", packBean, true);
-
+        }
         // DdlPreparedPack.getOrderDefault(mesQueueOrder);
         return packBean;
     }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -235,6 +235,7 @@ public class PtlHqlPack {
             DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd()
                     , "createDatetime", result, true);
         }
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getAreaNo(), "areaNo", result);
         DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result);
         DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result);
         DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result);

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

@@ -92,10 +92,18 @@ public class WmsCSOrderMaster extends BaseBean {
     public String[] wmsCSParts;
 
     @Transient
+    @ApiParam(value = "盘点物料清单")
+    public String wmsCSPartsStr;
+
+    @Transient
     @ApiParam(value = "盘点存储区清单")
     public String[] wmsCSZones;
 
     @Transient
+    @ApiParam(value = "盘点存储区清单")
+    public String wmsCSZonesStr;
+
+    @Transient
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 

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

@@ -127,6 +127,11 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam("父层级packcode对应的可回用零件号")
     private String parentReturnPart;
 
+
+    @Transient
+    @ApiParam("打印模板")
+    private String templateNo;
+
     @Transient
     @ApiParam("剩余箱数量")
     private Long countBox;

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

@@ -310,6 +310,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "预计完成时间")
     private String planCompleteTime;
 
+    @Transient
+    @ApiParam(value = "集装箱号")
+    private String containerNo;
+
     public WmsStockSn() {
     }