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

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

@@ -870,7 +870,7 @@ public class WmsEnumUtil {
         OTHER_IN(730, "OTHER_IN", "其它入库"),
         OTHER_OUT(740, "OTHER_OUT", "其它出库"),
         COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
-        SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
+        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/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/repository/IfPackageRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfPackage;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface IfPackageRepository extends BaseRepository<IfPackage, Long> {
+}

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

@@ -78,7 +78,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
 
     @Column(name = "SNP_QTY")
     @ColumnDefault("0")
-    @ApiParam(value = "默认包装规格", example = "0")
+    @ApiParam(value = "包装数量", example = "0")
     private Double snpQty;
 
     @Column(name = "PRINT_QTY")

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

@@ -250,6 +250,9 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "延迟次数")
     private Long sumDelayCount;
 
+    @ApiParam(value = "延迟到货百分比")
+    private String delayPercent;
+
     @ApiParam("计划交货时间")
     private String planPlanDateTime;
 

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

@@ -62,6 +62,14 @@ public class WmsPickingWindowTime extends BaseBean {
     private String shiftEndTime;
 
     @Transient
+    @ApiParam("今日结束时间")
+    private String todayEndTime;
+
+    @Transient
+    @ApiParam("次日开始时间")
+    private String nextDayStartTime;
+
+    @Transient
     @ApiParam("源存储区代码")
     public String srcZoneNo;
 

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

@@ -62,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;
+    }
 }