Merge remote-tracking branch 'origin/test' into test

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

@@ -869,7 +869,8 @@ public class WmsEnumUtil {
         WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
         OTHER_IN(730, "OTHER_IN", "其它入库"),
         OTHER_OUT(740, "OTHER_OUT", "其它出库"),
-        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账");
+        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
+        SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
 
         private int value;
         private String code;

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

@@ -185,6 +185,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("客户名称")
     private String custName;
 
+    @Transient
+    @ApiParam("汇总数量")
+    private Integer gatherQty = 0;
+
     public MesPackage() {
     }
 

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

@@ -91,6 +91,9 @@ public class GenSerialNoModel {
     @ApiParam("客户工厂代码")
     private String custProdLineCode;
 
+    @ApiParam("工序代码")
+    private String processCode;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\10\24 22:04
+ * @Modify:
+ **/
+@Data
+public class MesShiftRestModel extends MesShiftRest {
+
+    @ApiParam("开始时间")
+    private String startDate;
+
+    @ApiParam("结束时间")
+    private String endDate;
+
+    @ApiParam("实际时间差(毫秒)")
+    private Long subTimes;
+
+}

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

@@ -38,6 +38,9 @@ public class MgnBoardListModel {
     @ApiParam("计划完成率")
     private String planCompleteRate;
 
+    @ApiParam("当前数据标识")
+    private boolean currentInfo;
+
     @ApiParam("呼叫异常数量")
     private Integer exceptQty;
 

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

@@ -45,10 +45,14 @@ public class MgnPackageSnTraceReportModel {
     @ApiParam(value = "修改日期查询用，查询结束日期")
     public String createDateTimeEnd;
 
+
+    @ApiParam(value = "工单号")
+    public String workOrderNo;
+
     public MgnPackageSnTraceReportModel() {
     }
 
-    public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) {
+    public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName, String workOrderNo) {
         this.packageNo = packageNo;
         this.packageNo2 = packageNo2;
         this.serialNumber = serialNumber;
@@ -58,5 +62,7 @@ public class MgnPackageSnTraceReportModel {
         this.createDatetime = createDatetime;
         this.workCenterCode = workCenterCode;
         this.workCenterName = workCenterName;
+        this.workOrderNo = workOrderNo;
+
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -67,6 +67,18 @@ public class MgnBjBoardModel implements Serializable {
     @ApiParam("时段")
     private String timeInterval;
 
+    @ApiParam("温度")
+    private String temperature;
+
+    @ApiParam("湿度")
+    private String humidity;
+
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @ApiParam("工位名称")
+    private String workCellName;
+
     @ApiParam("x坐标内容")
     private List<String> xAxisList;
 

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

@@ -2491,7 +2491,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) {
-            DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "replaceVinCode", packBean);
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "relationVinCode", packBean);
         }
         if (queueJitActual.getStatus() != null) {
             DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java

@@ -49,6 +49,9 @@ public class WmsStockFifoModel {
     @ApiParam("FIFO查询获取方式")
     private Integer fifoSnByLood;
 
+    @ApiParam("过滤FIFO锁定条码")
+    private Integer filterFifoLockSn;
+
     @ApiParam("物料条码信息")
     Map<String, List<WmsStockSn>> snMap = new HashMap<>();
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.sweb.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -122,4 +123,8 @@ public class SwebPurchaseOrder extends BaseBean {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "预计到货时间 结束时间")
     private String expectedTimeEnd;
+
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    public Integer isSync = CommonEnumUtil.FALSE;
 }

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

@@ -268,8 +268,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
         this.z = z;
     }
 
-    public WmsLocate(Integer boxQty ,  Double partQty,String locateNo){
+    public WmsLocate(Long boxQty ,  Double partQty,String locateNo){
-        this.boxQty=boxQty;
+        this.boxQty=boxQty.intValue();
         this.partQty=partQty;
         this.locateNo=locateNo;
     }

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

@@ -215,6 +215,23 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "原因", example = "1")
     public String reason;
 
+    @Column(name = "RECEIVE_DATE")
+    @ApiParam(value = "收货日期")
+    public String receiveDate;
+
+    @Column(name = "RECEIVE_TIME")
+    @ApiParam(value = "收货时间")
+    public String receiveTime;
+
+    @Column(name = "WINDOW_START_TIME")
+    @ApiParam(value = "窗口开始时间")
+    public String windowStartTime;
+
+    @Column(name = "WINDOW_END_TIME")
+    @ApiParam(value = "窗口结束时间")
+    public String windowEndTime;
+
+
     @Transient
     @ApiParam("周总数")
     private Integer weekRcCount;
@@ -227,6 +244,21 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("当前状态")
     private String nowStatus;
 
+    @ApiParam(value = "延迟次数")
+    private Long delayCount;
+
+    @ApiParam(value = "延迟次数")
+    private Long sumDelayCount;
+
+    @ApiParam(value = "延迟到货百分比")
+    private String delayPercent;
+
+    @ApiParam("计划交货时间")
+    private String planPlanDateTime;
+
+
+
+
 
     public WmsPOMaster() {
 
@@ -264,6 +296,23 @@ public class WmsPOMaster extends BaseBean {
         this.delayHour = delayHour;
     }
 
+    public WmsPOMaster(String vendorNo, Long delayCount) {
+        this.vendorNo = vendorNo;
+        this.delayCount = delayCount;
+    }
+
+    public WmsPOMaster(String orderNo, String reason, String planDate, String planTime,
+                       String receiveTime, String vendorNo, String vendorName, String organizeCode) {
+        this.orderNo = orderNo;
+        this.reason = reason;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.receiveTime = receiveTime;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.organizeCode = organizeCode;
+    }
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -103,6 +105,11 @@ public class WmsPoSn extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+//    @Column(name = "DATE_CODE", nullable = false)
+//    @ApiParam(value = "供应商生产批次")
+//    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+//    public String dateCode = "";
+
     @ApiParam(value = "供应商名称")
     @Transient
     public String vendorNameRdd;
@@ -119,8 +126,9 @@ public class WmsPoSn extends BaseBean {
     @Transient
     public String lotNo;
 
-    @Transient
+    @Column(name = "DATE_CODE", nullable = false)
-    @ApiParam(value = "生产日期")
+    @ApiParam(value = "供应商生产日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String dateCode;
 
     @Transient

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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;
+/**
+ * @Description 供应商道口信息
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/11/25 13:43
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_VENDOR_DOCK")
+@Api("供应商道口信息")
+public class WmsVendorDock extends BaseBean {
+    private static final long serialVersionUID = 662346332597842770L;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorNo;
+
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String dockCode;
+
+    @Column(name="DOCK_ADDRESS")
+    @ApiParam("道口发运地址")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String dockAddress;
+}

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

@@ -124,6 +124,17 @@ public class WmsInterfaceDataMapper extends BaseBean {
     public Integer syncFrequency;
 
     /**
+     * 同步时间 CRON 表达式
+     */
+    @Column(name = "SYNC_CRON")
+    public String syncCron;
+    /**
+     * 下次同步时间，与 syncCron 属性同时使用
+     */
+    @Column(name = "NEXT_SYNC_TIME")
+    public String nextSyncTime;
+
+    /**
      * 上次同步时间
      */
     @Column(name = "LAST_SYNC_TIME")

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

@@ -11,6 +11,7 @@ public class WmsInterfaceEnumUtil {
         MES2WMS(30, "MES2WMS", "MES --> WMS"),
         WMS2MES(40, "WMS2MES", "WMS --> MES"),
         SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"),
+        SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"),
         WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"),
         SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB");
 
@@ -61,6 +62,7 @@ public class WmsInterfaceEnumUtil {
 
         /**
          * -1 不在范围内
+         *
          * @param desc
          * @return
          */

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java

@@ -36,7 +36,7 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     private Long sumDelayCount;
 
     @ApiParam(value = "延迟到货百分比")
-    private Double delayPercent;
+    private String delayPercent;
 
     @ApiParam(value = "查询开始时间")
     private String startDateTime;
@@ -85,4 +85,5 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     public WmsVendorDelayMasterModel() {
 
     }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsVendorDock;
+import cn.estsh.i3plus.pojo.wms.bean.WmsVendorWindow;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description 供应商道口DAO层
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/11/25 14:43
+ * @Modify
+ */
+@Repository
+public interface WmsVendorDockRepository extends BaseRepository<WmsVendorDock, Long> {
+}

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

@@ -2030,6 +2030,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getSrcLocateNo(), "srcLocateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getDestLocateNo(), "destLocateNo", result);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result);
 
         getStringBuilderPack(wmsDocMovementSn, result);
@@ -3551,4 +3553,10 @@ public class WmsHqlPack {
 
         return result;
     }
+    public static DdlPackBean packHqlWmsDock(WmsDock wmsDock) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringRightLikerPack(wmsDock.getDockCode(), "dockCode", result);
+        getStringBuilderPack(wmsDock, result);
+        return result;
+    }
 }