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

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

@@ -5619,6 +5619,7 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VALUE_TYPE {
+        
         MANUAL_ASSIGNMENT("10", "手工赋值"),
         SPEL_EXPRESSION("20", "spel表达式"),
         FUNCTION_ASSIGNMENT("30", "函数赋值"),

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

@@ -5097,6 +5097,7 @@ public class WmsEnumUtil {
     public enum WORK_ORDER_PLAN_STATUS {
         CREATE(10, "CREATE", "创建"),
         PLANNED(20, "PLANNED", "处理中"),
+        FINISH(25, "FINISH", "已完成"),
         CLOSE(30, "CLOSE", "已关闭");
 
         private int value;

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

@@ -144,4 +144,8 @@ public class MesOee extends BaseBean implements Serializable {
     @Transient
     @ApiParam("手工录入集合")
     private List<String> attributes;
+
+    @Transient
+    @ApiParam("自定义数据-非手工录入")
+    private String busiDataNoManual;
 }

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
         @Index(columnList = "WORK_ORDER_NO"),
         @Index(columnList = "WORK_CENTER_CODE"),
         @Index(columnList = "WORK_CELL_CODE"),
+        @Index(columnList = "CREATE_DATE_TIME"),
         @Index(columnList = "IS_SEALED")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})

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

@@ -29,6 +29,7 @@ import java.math.BigDecimal;
         @Index(columnList = "SERIAL_NUMBER"),
         @Index(columnList = "PRODUCT_SN"),
         @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "MODIFY_DATE_TIME"),
         @Index(columnList = "PART_NO"),
         @Index(columnList = "WORK_ORDER_NO")
 }, uniqueConstraints = {

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java

@@ -63,13 +63,13 @@ public class SysOrderNoRule extends BaseBean {
     private Long serialNoLength;
 
     @Column(name = "IS_CYCLE")
-    @ApiParam(value = "达到最大值后是否循环",example = "1")
+    @ApiParam(value = "是否按日期循环", example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isCycle;
 
     @Column(name = "IS_FIXED_LENGTH")
     @ColumnDefault("2")
-    @ApiParam(value = "是否固定序号长度长度",example = "1")
+    @ApiParam(value = "是否固定序号长度",example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isFixedLength;
 

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

@@ -41,12 +41,12 @@ public class SwebProcurementPlanOrder extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String orderNo;
 
-    @Column(name = "VENDOR_NO")
+    @Column(name = "VENDOR_CODE")
     @ApiParam(value = "供应商代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
             dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
             searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
-    private String vendorNo;
+    private String vendorCode;
 
     @Column(name = "VENDOR_NAME")
     @ApiParam(value = "供应商名称")

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

@@ -478,6 +478,8 @@ public class WmsDocMovementDetails extends BaseBean {
     String prodCfgTypeName;
 
 
+
+
     public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) {
         this.custNo = custNo;
         this.orderNo = orderNo;
@@ -719,6 +721,19 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.custNo = custNo;
     }
 
+    public WmsDocMovementDetails(String orderNo,String custPartNo,String srcZoneNo, String destZoneNo,String destLocateNo,Double qty,Double pickQty, String createDatetime,Integer orderStatus,String createUser) {
+        this.orderNo = orderNo;
+        this.custPartNo = custPartNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.createDatetime = createDatetime;
+        this.orderStatus = orderStatus;
+        this.createUser = createUser;
+
+    }
     public WmsDocMovementDetails(String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo, String locateName) {
         this.orderNo = orderNo;
         this.srcZoneNo = srcZoneNo;

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

@@ -358,6 +358,23 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("查询状态集合")
     public List<Integer> orderStatusList;
 
+    @Transient
+    @ApiParam("一个应拣数里面的料子")
+    public Double snp;
+
+    @Transient
+    @ApiParam("实拣数")
+    public int pickQty;
+
+
+    @Transient
+    @ApiParam("拣货状态")
+    public Integer pickOrderStatus;
+
+    @Transient
+    @ApiParam("完成时间")
+    public String complateDatetime;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
@@ -401,4 +418,16 @@ public class WmsDocMovementMaster extends BaseBean {
         this.custOwner = custOwner;
         this.custTel = custTel;
     }
+
+    public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Double snp,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) {
+        this.orderNo = orderNo;
+        this.createDatetime = createDatetime;
+        this.qty = qty;
+        this.snp = snp;
+        this.orderStatus = orderStatus;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.assignPlanDate = planDate;
+        this.assignPlanTime = planTime;
+    }
 }

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

@@ -33,8 +33,8 @@ public class WmsFix extends BaseBean{
     @ApiParam("设备编号")
     public String fixId;
 
-    @Column(name = "FIX_MAC")
+    @Column(name = "FIX_MAC")    @ApiParam("设备mac地址")
-    @ApiParam("设备mac地址")
+
     public String fixMac;
 
     @Column(name = "FIX_NAME")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.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.MesPpMaster;
+import cn.estsh.i3plus.pojo.wms.bean.WmsProductVersion;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description 生产版本DAO层
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/12/4 18:49
+ * @Modify
+ */
+@Repository
+public interface WmsProductVersionRepository extends BaseRepository<WmsProductVersion, Long> {
+}

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

@@ -176,7 +176,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean);
-        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", packBean);
+        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorNo", packBean);
         DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
         DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);