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

【需求：1202，条码补打】

Browse Source
yun-zuoyi
王杰 6 years ago
parent 3eda200854
commit 7d623560b6
7 changed files with 89 additions and 87 deletions
Show Stats Download Patch File Download Diff File

13
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
Unescape Escape View File

@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("操作类型")
private Integer operateType;
@Transient
@ApiParam("下线时间开始")
private String outWorkCenterTimeStart;
@Transient
@ApiParam("下线时间截止")
private String outWorkCenterTimeEnd;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -178,9 +186,12 @@ public class MesProduceSn extends BaseBean implements Serializable {
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", snType='" + snType + '\'' +
", snType=" + snType +
", tray='" + tray + '\'' +
", resultMsg='" + resultMsg + '\'' +
", operateType=" + operateType +
", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
'}';
}
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java
Unescape Escape View File

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.mes.model;
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model;
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java
Unescape Escape View File

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.mes.model;
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

70
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -280,4 +280,74 @@ public class MesHqlPack {
return packBean;
}
/**
* 按条件分页查询产品条码补打印数据
* @param mesProduceSn
* @return
*/
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
return packBean;
}
/**
* 按条件分页查询包装条码补打印数据
* @param mesPackage
* @return
*/
public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode());
if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackLevel())) {
DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackageNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesPackage.getCreateDateTimeStart(),
mesPackage.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
return packBean;
}
}

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

@ -129,15 +129,6 @@ public class MesProduceSn extends BaseBean {
@ApiParam("返回信息")
private String resultMsg;
@Transient
@ApiParam("下线时间开始")
private String outWorkCenterTimeStart;
@Transient
@ApiParam("下线时间截止")
private String outWorkCenterTimeEnd;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -184,11 +175,10 @@ public class MesProduceSn extends BaseBean {
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", snType='" + snType + '\'' +
", snType=" + snType +
", tray='" + tray + '\'' +
", operateType=" + operateType +
", resultMsg='" + resultMsg + '\'' +
", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
'}';
}
}

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

@ -1923,73 +1923,4 @@ public class MesHqlPack {
return packBean;
}
/**
* 按条件分页查询产品条码补打印数据
* @param mesProduceSn
* @return
*/
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getMesAllData(mesProduceSn.getOrganizeCode());
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
return packBean;
}
/**
* 按条件分页查询包装条码补打印数据
* @param mesPackage
* @return
*/
public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
DdlPackBean packBean = getMesAllData(mesPackage.getOrganizeCode());
if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesPackage.getCreateDateTimeStart(),
mesPackage.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
return packBean;
}
}

Write Preview
Loading…
Cancel
Save