I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into test

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent 8ec9f1b137 1cedf2b75b
commit a71d7a31ce
27 changed files with 100 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-aps/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-base/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-ics/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-mdm/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-mes/pom.xml
Unescape Escape View File

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

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
Unescape Escape View File

@ -98,4 +98,8 @@ public class IfQcOrder extends BaseBean implements Serializable {
@ApiParam("检测类型")
private Integer checkType;
@Column(name = "CUST_DELIERY_LOCATION")
@ApiParam("客户发运地")
private String custDelieryLocation;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
Unescape Escape View File

@ -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;

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
Unescape Escape View File

@ -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;
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
Unescape Escape View File

@ -82,7 +82,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam(value = "已完成数量")
@Transient
private Integer finishQty;
private Integer finishQty = 0;
@ApiParam(value = "检测项类型名称")
@Transient

39
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java
Unescape Escape View File

@ -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;
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java
Unescape Escape View File

@ -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<MesSubPart, Long> {
}

20
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
Unescape Escape View File

@ -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;
}

2
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-platform/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-ptl/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-report/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-sweb/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

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

2
modules/i3plus-pojo-workflow/pom.xml
Unescape Escape View File

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

2
pom.xml
Unescape Escape View File

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-PROD-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Write Preview
Loading…
Cancel
Save