冲突

modules/i3plus-pojo-base/pom.xml

@@ -31,10 +31,6 @@
             <artifactId>fastjson</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
         </dependency>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0.0.1</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -4,17 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+
+import javax.persistence.*;
+
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -30,7 +27,12 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "IF_PACKAGE_DETAIL")
+@Table(name = "IF_PACKAGE_DETAIL", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"})
+})
 @Api("包装明细表")
 public class IfPackageDetail extends BaseBean  implements Serializable {
 

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

@@ -63,6 +63,11 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam(value = "是否物理删除", example = "0")
     private Integer isPhysicalDelete;
 
+    //枚举：CommonEnumUtil.DATA_SOURCE_TYPE
+    @Column(name = "DATASOURCE_TYPE")
+    @ApiParam(value = "数据源类型")
+    private Integer dataSourceType;
+
     @Column(name = "LAST_EXECUTION_TIME")
     @ApiParam("末次迁移时间")
     private String lastExecutionTime;

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

@@ -129,6 +129,10 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("物料名称")
     private String partName;
 
+    @Transient
+    @ApiParam("数据范围")
+    private String torqueValRange;
+
 
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;

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

@@ -73,4 +73,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
     @Transient
     @ApiParam("物料名称")
     private String partName;
+
+    @Transient
+    @ApiParam("收货日期")
+    private String receiptDate;
 }

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

@@ -3,11 +3,13 @@ package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesPackageTravel;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Author: Wynne.Lu
  * @CreateDate: 2019/10/19 2:57 下午
  * @Description:
  **/
+@Repository
 public interface MesPackageTravelRepository extends BaseRepository<MesPackageTravel, Long> {
 }

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

@@ -2695,6 +2695,7 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
         }
+        DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean);
         DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
 

modules/i3plus-pojo-model/pom.xml

@@ -29,10 +29,6 @@
             <artifactId>i3plus-pojo-report</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-form</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>i3plus.pojo</groupId>

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

@@ -259,6 +259,10 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("计划交货时间")
     private String planPlanDateTime;
 
+    @Transient
+    @ApiParam(value = "收货日期时间")
+    public String receiveDateTime;
+
 
 
 
@@ -305,12 +309,13 @@ public class WmsPOMaster extends BaseBean {
     }
 
     public WmsPOMaster(String orderNo, String reason, String planDate, String planTime,
-                       String receiveTime, String vendorNo, String vendorName, String organizeCode) {
+                       String receiveTime,String receiveDate, String vendorNo, String vendorName, String organizeCode) {
         this.orderNo = orderNo;
         this.reason = reason;
         this.planDate = planDate;
         this.planTime = planTime;
         this.receiveTime = receiveTime;
+        this.receiveDate= receiveDate;
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
         this.organizeCode = organizeCode;