BUG#12166

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

@@ -1891,6 +1891,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
     }
 
     /**

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesQcOrderDetailRecordModel implements Serializable {
+    private static final long serialVersionUID = -7216132883079491432L;
+
+    @ApiParam("检测人")
+    private String createUser;
+
+    @ApiParam("检测时间")
+    private String createDatetime;
+
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @ApiParam("判定结果")
+    private Integer checkResult = 0;
+
+    @ApiParam("检测值")
+    private String checkValue;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("检测顺序")
+    private Integer checkSeq;
+
+
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @ApiParam("检测项类型")
+    private String checkItemType;
+
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @ApiParam("是否允许让步")
+    private Integer isConcession = 0;
+
+    @ApiParam("检验行号")
+    private Integer itemNo = 0;
+
+//    @ApiParam("产品条码")
+//    private String serialNumber;
+
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("已检数量")
+    private Integer finishQty;
+
+    @ApiParam("最大数")
+    private Double maximum = 0d;
+
+    @ApiParam("最小数")
+    private Double minimum = 0d;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("数据源")
+    private String dataSource;
+
+    @ApiParam("检测值类型")
+    private String checkValueType;
+
+    @ApiParam("是否关键检测项")
+    private Integer isKeyCheckItem;
+
+    @ApiParam(value = "检测项类型名称")
+    private String businessTypeName;
+
+}

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

@@ -8,12 +8,7 @@ import lombok.EqualsAndHashCode;
 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.util.List;
-import java.util.Map;
+import javax.persistence.*;
 
 /**
  * @Description : 推送信息配置
@@ -62,7 +57,7 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "SQL_STR", columnDefinition = "TEXT")
     private String sqlStr;
 
-    @ApiParam("脚本编号")
+    @ApiParam("数据获取脚本编号")
     @Column(name = "SCRIPT_NO")
     private String scriptNo;
 
@@ -70,6 +65,10 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "SCRIPT_PARAM")
     private String scriptParam;
 
+    @ApiParam("附件文件路径获取脚本编号")
+    @Column(name = "ATTACH_SCRIPT_NO")
+    private String attachScriptNo;
+
     @Lob
     @ApiParam("标题模板")
     @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT")
@@ -100,5 +99,8 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "CONTENT_LABEL")
     private String contentLabel;
 
-
+    // 临时存储
+    @ApiParam("附件的文件路径")
+    @Transient
+    private String attachFilePath;
 }

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

@@ -48,5 +48,7 @@ public class WmsPushLog extends BaseBean{
     @ApiParam("推送地址")
     private String pathUrl;
 
-
+    @ApiParam("附件地址")
+    @Column(name = "ATTACH_FILE_PATH")
+    private String attachFilePath;
 }

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

@@ -106,6 +106,28 @@ public class WmsQCDetails extends BaseBean {
     public WmsQCDetails() {
     }
 
+    public WmsQCDetails(String organizeCode, String partNo, String partNameRdd, String item,
+                        Double qty, String unit, String orderNo,
+                        Integer itemStatus, String remark, Double factQty,
+                        Double passQty, Double rejectQty,
+                        Integer orderStatus, String vendorNo, String vendorDesc) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.item = item;
+        this.qty = qty;
+        this.unit = unit;
+        this.orderNo = orderNo;
+        this.itemStatus = itemStatus;
+        this.remark = remark;
+        this.factQty = factQty;
+        this.passQty = passQty;
+        this.rejectQty = rejectQty;
+        this.orderStatus = orderStatus;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+    }
+
     public WmsQCDetails(String partNo, String partNameRdd, String item,
                         Double qty, String unit, String orderNo,
                         Integer itemStatus, String remark, Double factQty,

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

@@ -874,4 +874,18 @@ public class WmsStockSn extends BaseBean {
         this.partNameRdd = wmsStockSn.getPartNameRdd();
         this.sumQty = sumQty;
     }
+
+    public WmsStockSn( String zoneNo, String locateNo, String partNo,
+                      String partNameRdd, String sn, Double qty, String qualityDate,
+                       Integer snStatus,String lotNo) {
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.qty = qty;
+        this.qualityDate = qualityDate;
+        this.snStatus = snStatus;
+        this.lotNo = lotNo;
+    }
 }

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

@@ -1,12 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import java.util.List;
-import java.util.Map;
-
 @Data
 public class PushMessageModel {
 
@@ -29,5 +25,6 @@ public class PushMessageModel {
     @ApiParam("工厂代码")
     private String organizeCode;
 
-
+    @ApiParam("附件的文件路径")
+    private String attachFilePath;
 }

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

@@ -58,6 +58,9 @@ public class WmsQCStatusModel {
     @ApiParam("标准质检时间")
     private Double stdCheckTime;
 
+    @ApiParam("质检时长")
+    private long qcCostTime;
+
     public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) {
         this.asnOrderNo = asnOrderNo;
         this.qcOrderNo = qcOrderNo;
@@ -68,4 +71,8 @@ public class WmsQCStatusModel {
         this.proportion = proportion;
         this.stdCheckTime = stdCheckTime;
     }
+    public Double getStdQcTimeVal() {
+        return this.stdQcTime == null ? 0 : this.stdQcTime;
+    }
+
 }