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/MesESOP.java

@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_ESOP")
+@Api("作业指导书信息表(ODS)")
+public class MesESOP extends BaseBean {
+
+    @Column(name="PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    @Column(name = "STEP_SEQ")
+    @ApiParam("工步序号")
+    private Integer stepSeq;
+
+    @Column(name="SOP_NAME")
+    @ApiParam("SOP名称")
+    private String sopName;
+
+    @Column(name="SOP_URL")
+    @ApiParam("SOP_URL")
+      private String sopUrl;
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesESOP;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesESOPRepository extends BaseRepository<MesESOP, Long> {
+}

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

@@ -0,0 +1,65 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_ESOP")
+@Api("作业指导书信息表(ODS)")
+public class MesESOP extends BaseBean {
+
+    @Column(name="PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    @Column(name = "STEP_SEQ")
+    @ApiParam("工步序号")
+    private Integer stepSeq;
+
+    @Column(name="SOP_NAME")
+    @ApiParam("SOP名称")
+    private String sopName;
+
+    @Column(name="SOP_URL")
+    @ApiParam("SOP_URL")
+      private String sopUrl;
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod;
+import cn.estsh.i3plus.pojo.mes.bean.MesESOP;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesESOPRepository extends BaseRepository<MesESOP, Long> {
+}

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

@@ -111,6 +111,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("前端表格编辑使用")
     public Boolean isSet = false;
 
+    @Transient
+    @ApiParam("源单位")
+    public String srcUnit;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }

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

@@ -40,7 +40,7 @@ public class WmsUnit extends BaseBean {
     @ApiParam(value = "单位精度")
     private Integer unitPrecision;
 
-    public int getUnitPrecisionValue(){
+    public Integer getUnitPrecisionValue(){
         return this.unitPrecision == null?0:this.unitPrecision.intValue();
     }
 

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

@@ -108,7 +108,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
      * 同步频率
      */
     @Column(name = "SYNC_FREQUENCY")
-    public int syncFrequency;
+    public Integer syncFrequency;
 
     /**
      * 上次同步时间

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

@@ -60,8 +60,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixMac(), "fixMac", result);
         DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixName(), "fixName", result);
 
-        getStringBuilderPack(wmsFix, result);
+        if (StringUtils.isNotBlank(wmsFix.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(wmsFix.getOrganizeCode(), "organizeCode", result);
+        }
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
+        DdlPreparedPack.getNumEqualPack(wmsFix.getIsValid(), "isValid", result);
         return result;
     }
 
@@ -1024,6 +1028,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result);
         DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
         DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);