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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java

@@ -66,7 +66,7 @@ public class Material extends BaseAPS {
     private String purchaseLeadTime;
 
     @Column(name="MANUF_LEAD_TIME")
-    @ApiParam(value ="制造提前期")
+    @ApiParam(value ="生产提前期")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String manufLeadTime;
 
@@ -80,7 +80,7 @@ public class Material extends BaseAPS {
     private Integer unitPurchase;
 
     @Column(name="UNIT_MANUF")
-    @ApiParam(value ="单位制造量")
+    @ApiParam(value ="单位生产量")
     private Integer unitManuf;
 
     @Column(name="UNIT_SHIPMENT")
@@ -99,16 +99,16 @@ public class Material extends BaseAPS {
     private Boolean autoFixPegging;
 
     @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="最大制造批量")
+    @ApiParam(value ="最大生产批量")
     private Double maxProductBatch;
 
     @Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="最小制造批量")
+    @ApiParam(value ="最小生产批量")
     @FieldAnnotation(defaultValue = "0.0")
     private Double minProductBatch;
 
     @Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="制造批量单位")
+    @ApiParam(value ="生产批量单位")
     private Double UnitProductBatch;
 
     @Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)")

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

@@ -195,7 +195,7 @@ public class ApsEnumUtil {
     public enum MATERIAL_ASSIGN_LIMIT {
         INVENTORY(1, "库存制约"),
         PURCHASE(2, "采购制约"),
-        PRODUCT(4, "制造制约");
+        PRODUCT(4, "生产制约");
 
         private int value;
         private String description;

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

@@ -3399,6 +3399,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_STATE_TYPE {
         BEGIN(10, "begin", "开始状态点"),
+        BACK(20, "back", "回退状态点"),
         END(40, "end", "结束状态点");
 
         private int value;
@@ -3601,7 +3602,8 @@ public class MesPcnEnumUtil {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
         TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(40, "FINISH", "完成状态"),
+        BACK(99, "BACK", "回退状态");
 
         private int value;
         private String code;

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

@@ -88,35 +88,35 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
 
     @Column(name = "PEST1")
     @ApiParam("PEST编码1")
-    private Integer pest1;
+    private String pest1;
 
     @Column(name = "PEST2")
     @ApiParam("PEST编码2")
-    private Integer pest2;
+    private String pest2;
 
     @Column(name = "PEST3")
     @ApiParam("PEST编码3")
-    private Integer pest3;
+    private String pest3;
 
     @Column(name = "PEST4")
     @ApiParam("PEST编码4")
-    private Integer pest4;
+    private String pest4;
 
     @Column(name = "PEST5")
     @ApiParam("PEST编码5")
-    private Integer pest5;
+    private String pest5;
 
     @Column(name = "PEST6")
     @ApiParam("PEST编码6")
-    private Integer pest6;
+    private String pest6;
 
     @Column(name = "PEST7")
     @ApiParam("PEST编码7")
-    private Integer pest7;
+    private String pest7;
 
     @Column(name = "PEST8")
     @ApiParam("PEST编码8")
-    private Integer pest8;
+    private String pest8;
 
     @Column(name = "TORQUE_NO")
     @ApiParam("扭矩枪编号")

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

@@ -78,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("状态类型 10=初始化状态")
     private Integer statusType;
 
+    @Column(name = "SEQ")
+    @ApiParam("状态点顺序")
+    private Integer seq;
+
     @Transient
     @ApiParam("状态点是否完成")
     private boolean isComplete;

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

@@ -2937,4 +2937,49 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 物料校验项
+     * @param partCheck
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesPartCheck(MesPartCheck partCheck, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partCheck, organizeCode);
+        if (!StringUtils.isEmpty(partCheck.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(partCheck.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(partCheck.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(partCheck.getObjectCode(), "objectCode", packBean);
+        }
+        return packBean;
+    }
+
+
+    /**
+     * 过程质量检测数据
+     *
+     * @param qcOrderDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
+        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+            DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
+        }
+        if (qcOrderDetail.getCheckType() != null) {
+            DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    qcOrderDetail.getCreateDateTimeStart(),
+                    qcOrderDetail.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }

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

@@ -119,13 +119,13 @@ public class MesPcnHqlPack {
      * @param rawPartSn
      * @return
      */
-    public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) {
+    public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
         DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
-        DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean);
         return packBean;
     }
 

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-PROD-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./