Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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

@@ -73,4 +73,8 @@ public class MesPackageTravel extends BaseBean implements Serializable {
     @Column(name = "FN_LOCATION_NO")
     @ApiParam("炉内位置代码")
     private String fnLocationNo;
+
+    @Column(name = "QR_CODE")
+    @ApiParam("包装二维码")
+    private String qrCode;
 }

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

@@ -248,6 +248,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("组内编号")
     private Integer groupNo;
 
+    @Transient
+    @ApiParam("总数")
+    private long sumQty;
+
     public MesProduceSn() {
     }
 
@@ -257,6 +261,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
         this.qty = qty;
     }
 
+
+    public MesProduceSn(String workCenterCode, String partNo, String partNameRdd, long sumQty) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sumQty = sumQty;
+    }
+
     public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus,
                         Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode,
                         String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo,

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

@@ -159,4 +159,8 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @Transient
     @ApiParam("班长")
     private String squadLeader;
+
+    @Transient
+    @ApiParam("质检单集合")
+    private List<String> orderNoList;
 }

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

@@ -17,6 +17,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -78,11 +79,11 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private Integer qty;
+    private Integer qty = 0;
 
     @Column(name = "FINISH_QTY")
     @ApiParam("已检数量")
-    private Integer finishQty;
+    private Integer finishQty = 0;
 
     @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
@@ -138,4 +139,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("质检单检测记录id")
     private Long qcOrderRecordId;
 
+    @Transient
+    @ApiParam("质检单集合")
+    private List<String> orderNoList;
+
 }

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

@@ -18,6 +18,8 @@ public class ProductSnModel implements Serializable {
 
     private static final long serialVersionUID = 7137684552464509466L;
 
+    @ApiParam("包装条码")
+    private String packageNo;
 
     @ApiParam("客户零件号")
     private String customerPartNo;
@@ -53,7 +55,13 @@ public class ProductSnModel implements Serializable {
     private String qcStatusName;
 
 
-    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) {
+
+
+    public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo,
+                          String qrCode, String workCenterName, String processName,
+                          String workCellName, String createDatetime,
+                          String createUser, Integer qcStatus) {
+        this.packageNo = packageNo;
         this.customerPartNo = customerPartNo;
         this.serialNumber = serialNumber;
         this.partNo = partNo;

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

@@ -1091,12 +1091,15 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
-        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
-        }
+//        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+//              DdlPreparedPack.getStringEqualPack(mesQcOrder.getOrderNo(), "orderNo", packBean);
+//        }
         if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) {
             DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
         }
+        if (!CollectionUtils.isEmpty(qcOrderDetail.getOrderNoList())) {
+            DdlPreparedPack.getInPackList(qcOrderDetail.getOrderNoList(), "orderNo", packBean);
+        }
         return packBean;
     }
 

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

@@ -30,6 +30,7 @@ public class WmsJobParamModel implements Serializable {
     private String zoneNos;//存储区
     private String id;//id
     private String groupName;//组名称
+    private String lineNo;//产线
 
 
     public int getMinuteDiffVal() {

modules/i3plus-pojo-screen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -9,8 +9,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -18,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**
@@ -212,6 +212,10 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "接收时间")
     private String rcTime;
 
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam(value = "产品条码")
+    private String serialNumber;
+
 
 
 

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

@@ -263,6 +263,10 @@ public class WmsMoveDetails extends BaseBean {
     public Integer lockVersion;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+    @Transient
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 

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

@@ -94,6 +94,10 @@ public class WmsMoveMaster extends BaseBean {
     private String partNo;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+    @Transient
     @ApiParam("明细状态")
     @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class)
     private String itemStatus;

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

@@ -209,6 +209,11 @@ public class WmsMoveSn extends BaseBean {
     private String ZoneNo;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+
+    @Transient
     @ApiParam("交易类型名称")
     private String transTypeName;
 

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

@@ -297,6 +297,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "jis料架号")
     private String queueGroupNo;
 
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam(value = "产品条码")
+    private String serialNumber;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;

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

@@ -3218,6 +3218,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
+        if (details.getIsRequire() != null) {
+            DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
+        }
         getStringBuilderPack(details, result);
         return result;
     }