diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index bc7071b..11691be 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index f902a7c..8ef99a3 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 807bef5..577686d 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index b948580..f714b7d 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index e12eaee..b7991cc 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index c338f71..0648e9f 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 1674a47..f10cf39 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 7637865..3b9e57a 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index d98b7d8..b1911ec 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index bf96e57..56d54cb 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index a758a6a..830caa5 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
index 8e58dec..74de05a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
@@ -98,4 +98,8 @@ public class IfQcOrder extends BaseBean implements Serializable {
@ApiParam("检测类型")
private Integer checkType;
+ @Column(name = "CUST_DELIERY_LOCATION")
+ @ApiParam("客户发运地")
+ private String custDelieryLocation;
+
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
index 3f0402c..b9c75bf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
@@ -88,6 +88,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("是否允许让步")
private Integer isConcession = 0;
+ @Column(name = "NUMBER_FLAG")
+ @ApiParam("数量标识")
+ private String numberFlag;
+
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
index 126dda8..9e98310 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
@@ -100,9 +100,9 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("发运时间")
private String deliveryDate;
- @Column(name = "CUST_DELIVERY_LOCATION")
- @ApiParam("客户发往地")
- private String custDeliveryLocation;
+ @Column(name = "CUST_DELIERY_LOCATION")
+ @ApiParam("客户发运地")
+ private String custDelieryLocation;
@ApiParam(value = "检测结果")
@Transient
@@ -120,4 +120,8 @@ public class MesQcOrder extends BaseBean implements Serializable {
@Transient
private String mesWorkNo;
+ @Transient
+ @ApiParam("产品条码")
+ private String productSn;
+
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
index 3f192ac..60fae90 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
@@ -82,7 +82,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam(value = "已完成数量")
@Transient
- private Integer finishQty;
+ private Integer finishQty = 0;
@ApiParam(value = "检测项类型名称")
@Transient
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java
new file mode 100644
index 0000000..e0a1558
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java
@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/7 15:20
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SUB_PART")
+@Api("数据同步死信")
+public class MesSubPart extends BaseBean implements Serializable {
+ private static final long serialVersionUID = 4636507477301700549L;
+
+ @Column(name = "PART_NO")
+ @ApiParam("零件号")
+ private String partNo;
+
+ @Column(name = "SUB_PART_NO")
+ @ApiParam("替代料")
+ private String subPartNo;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java
new file mode 100644
index 0000000..5a4ca58
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesSubPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/7 15:23
+ * @desc
+ */
+@Repository
+public interface MesSubPartRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index ce8771b..91597a2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -91,7 +91,7 @@ public class MesPcnHqlPack {
* @param mesLabelTemplate
* @return
*/
- public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
+ public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
return packBean;
@@ -116,20 +116,20 @@ public class MesPcnHqlPack {
* 获取原材料扫描信息的对应工序BOM
*
* @param stationBom
- * @param rawPartSn
+ * @param rawPartNo
* @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;
}
- public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) {
+ public static DdlPackBean getStationBom(String org, String workCenter, String workCell, String partNo) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean);
@@ -183,7 +183,7 @@ public class MesPcnHqlPack {
}
// 工单管理，查询下达，启动，暂停状态
- if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){
+ if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())) {
DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean);
}
@@ -319,6 +319,7 @@ public class MesPcnHqlPack {
/**
* 按条件分页查询产品条码补打印数据
+ *
* @param mesProduceSn
* @return
*/
@@ -358,6 +359,7 @@ public class MesPcnHqlPack {
/**
* 按条件分页查询包装条码补打印数据
+ *
* @param mesPackage
* @return
*/
@@ -420,9 +422,9 @@ public class MesPcnHqlPack {
}
-
/**
* 按条件分页查询类型信息数据
+ *
* @param typeCfg
* @return
*/
@@ -454,8 +456,8 @@ public class MesPcnHqlPack {
DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean);
DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean);
- if(mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()){
- DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty()+1, "itemNo", packBean);
+ if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) {
+ DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean);
}
return packBean;
}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index efacfd2..fb51da0 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index dba12cc..78bbdef 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 81670b2..fb44d00 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 26a7311..dc4ea86 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index eaf2544..8571a5f 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 0f615b6..e36258d 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 9e5f745..9915420 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 0fea52b..61027b2 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index cc8fce6..c2104bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform