jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev-temp-xw-202502170000-45112' into dev

Browse Source 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java
dev
xiangwei.zhang 3 months ago
parent 39cfb67414 bb49d87d5a
commit 3dbd65ab92
5 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File

70
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
dataQueryHql.append("c.equipId ");
dataQueryHql.append(") ");
StringBuilder countQueryHql= new StringBuilder();
StringBuilder countQueryHql = new StringBuilder();
countQueryHql.append("select count(1)");
StringBuilder commonQueryHql = new StringBuilder();
commonQueryHql.append("FROM MesProductionAssembly a ");
@ -68,69 +68,69 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
commonQueryHql.append("AND a.isValid = :isValid ");
commonQueryHql.append("AND b.isValid = :isValid ");
commonQueryHql.append("AND c.isValid = :isValid ");
if (!StringUtils.isEmpty(model.getCustSn())){
if (!StringUtils.isEmpty(model.getCustSn())) {
commonQueryHql.append("AND a.custSn like :custSn ");
}
// like 条码
if(!StringUtils.isEmpty(model.getSerialNumber())){
if (!StringUtils.isEmpty(model.getSerialNumber())) {
commonQueryHql.append("AND a.serialNumber like :serialNumber ");
}
// = 装配件条码确认规则
if (!StringUtils.isEmpty(model.getMatchRule())){
if (!StringUtils.isEmpty(model.getMatchRule())) {
commonQueryHql.append("AND a.matchRule = :matchRule ");
}
// like 零件号
if(!StringUtils.isEmpty(model.getPartNo())){
if (!StringUtils.isEmpty(model.getPartNo())) {
commonQueryHql.append("AND a.partNo like :partNo ");
}
//like 主零件号
if(!StringUtils.isEmpty(model.getPartName())){
if (!StringUtils.isEmpty(model.getPartName())) {
commonQueryHql.append("AND a.partName like :partName ");
}
//like 装配零件号
if(!StringUtils.isEmpty(model.getAssemblyPartNo())){
if (!StringUtils.isEmpty(model.getAssemblyPartNo())) {
commonQueryHql.append("AND a.assemblyPartNo like :assemblyPartNo ");
}
//like 装配件零件名称
if(!StringUtils.isEmpty(model.getAssemblyPartName())){
if (!StringUtils.isEmpty(model.getAssemblyPartName())) {
commonQueryHql.append("AND a.assemblyPartName like :assemblyPartName ");
}
//like 装配条码
if(!StringUtils.isEmpty(model.getAssemblySn())){
if (!StringUtils.isEmpty(model.getAssemblySn())) {
commonQueryHql.append("AND a.assemblySn like :assemblySn ");
}
// = 是否跳过
if(model.getIsSkip() != null){
if (model.getIsSkip() != null) {
commonQueryHql.append("AND a.isSkip = :isSkip ");
}
//like 创建人
if(!StringUtils.isEmpty(model.getCreateUser())){
if (!StringUtils.isEmpty(model.getCreateUser())) {
commonQueryHql.append("AND a.createUser like :createUser ");
}
//范围时间 创建时间
if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())){
if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())) {
commonQueryHql.append("AND a.createDatetime between :createDateTimeStart and :createDateTimeEnd ");
}
//like 产线
if(!StringUtils.isEmpty(model.getWorkCenterCode())){
if (!StringUtils.isEmpty(model.getWorkCenterCode())) {
commonQueryHql.append("AND a.workCenterCode like :workCenterCode ");
}
//like 工位编号
if(!StringUtils.isEmpty(model.getWorkCellCode())){
if (!StringUtils.isEmpty(model.getWorkCellCode())) {
commonQueryHql.append("AND a.workCellCode like :workCellCode ");
}
if (model.getMatchType()!=null){
if (model.getMatchType() != null) {
commonQueryHql.append("AND a.matchRule = :matchRule ");
}
//like 加工单号
if(!StringUtils.isEmpty(model.getWorkOrderNo())){
if (!StringUtils.isEmpty(model.getWorkOrderNo())) {
commonQueryHql.append("AND b.workOrderNo like :workOrderNo ");
}
//like 设备名称
if(!StringUtils.isEmpty(model.getEquipmentName())){
if (!StringUtils.isEmpty(model.getEquipmentName())) {
commonQueryHql.append("AND c.equipmentName like :equipmentName ");
}
if (model.getEquipId()!=null){
if (model.getEquipId() != null) {
commonQueryHql.append("AND c.equipId = :equipId ");
}
commonQueryHql.append("ORDER BY a.createDatetime DESC ");
@ -152,56 +152,56 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
dataQuery.setParameter("organizeCode", model.getOrganizeCode());
dataQuery.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
dataQuery.setParameter("isValid", CommonEnumUtil.IS_VAILD.VAILD.getValue());
if (!StringUtils.isEmpty(model.getCustSn())){
if (!StringUtils.isEmpty(model.getCustSn())) {
dataQuery.setParameter("custSn", model.getCustSn() + "%");
}
if(!StringUtils.isEmpty(model.getSerialNumber())){
if (!StringUtils.isEmpty(model.getSerialNumber())) {
dataQuery.setParameter("serialNumber", model.getSerialNumber() + "%");
}
if (model.getMatchType()!=null){
if (model.getMatchType() != null) {
dataQuery.setParameter("matchType", model.getMatchType());
}
if(!StringUtils.isEmpty(model.getPartNo())){
if (!StringUtils.isEmpty(model.getPartNo())) {
dataQuery.setParameter("partNo", model.getPartNo() + "%");
}
if(!StringUtils.isEmpty(model.getPartName())){
if (!StringUtils.isEmpty(model.getPartName())) {
dataQuery.setParameter("partName", model.getPartName() + "%");
}
if(!StringUtils.isEmpty(model.getAssemblyPartNo())){
if (!StringUtils.isEmpty(model.getAssemblyPartNo())) {
dataQuery.setParameter("assemblyPartNo", model.getAssemblyPartNo() + "%");
}
if(!StringUtils.isEmpty(model.getAssemblyPartName())){
if (!StringUtils.isEmpty(model.getAssemblyPartName())) {
dataQuery.setParameter("assemblyPartName", model.getAssemblyPartName() + "%");
}
if(!StringUtils.isEmpty(model.getAssemblySn())){
if (!StringUtils.isEmpty(model.getAssemblySn())) {
dataQuery.setParameter("assemblySn", model.getAssemblySn() + "%");
}
if(model.getIsSkip() != null){
if (model.getIsSkip() != null) {
dataQuery.setParameter("isSkip", model.getIsSkip());
}
if(!StringUtils.isEmpty(model.getCreateUser())){
if (!StringUtils.isEmpty(model.getCreateUser())) {
dataQuery.setParameter("createUser", model.getCreateUser() + "%");
}
if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())){
if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())) {
dataQuery.setParameter("createDateTimeStart", model.getCreateDateTimeStart());
dataQuery.setParameter("createDateTimeEnd", model.getCreateDateTimeEnd());
}
if(!StringUtils.isEmpty(model.getWorkCenterCode())){
if (!StringUtils.isEmpty(model.getWorkCenterCode())) {
dataQuery.setParameter("workCenterCode", model.getWorkCenterCode() + "%");
}
if(!StringUtils.isEmpty(model.getWorkCellCode())){
if (!StringUtils.isEmpty(model.getWorkCellCode())) {
dataQuery.setParameter("workCellCode", model.getWorkCellCode() + "%");
}
if (model.getMatchType()!=null){
if (model.getMatchType() != null) {
dataQuery.setParameter("matchRule", model.getMatchRule());
}
if(!StringUtils.isEmpty(model.getWorkOrderNo())){
if (!StringUtils.isEmpty(model.getWorkOrderNo())) {
dataQuery.setParameter("workOrderNo", model.getWorkOrderNo() + "%");
}
if(!StringUtils.isEmpty(model.getEquipmentName())){
if (!StringUtils.isEmpty(model.getEquipmentName())) {
dataQuery.setParameter("equipmentName", model.getEquipmentName() + "%");
}
if (model.getEquipId()!=null){
if (model.getEquipId() != null) {
dataQuery.setParameter("equipId", model.getEquipId());
}
}

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java
Unescape Escape View File

@ -112,10 +112,10 @@ public class MesInspectionProductDataReportDao implements IMesInspectionProductD
hql.append(" and mpi.inspectionDate <= :inspectionDateEnd ");
}
if (!StringUtils.isEmpty(model.getModifyDateTimeStart())) {
hql.append(" and mpi.modifyDatetime >= :modifyDateTimeStart ");
hql.append(" and mpi.modifyDatetime >= :modifyDatetimeStart ");
}
if (!StringUtils.isEmpty(model.getModifyDateTimeEnd())) {
hql.append(" and mpi.modifyDatetime <= :modifyDateTimeEnd ");
hql.append(" and mpi.modifyDatetime <= :modifyDatetimeEnd ");
}
if (!StringUtils.isEmpty(model.getPartNo())) {
hql.append(" and mpi.partNo like :partNo ");

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java
Unescape Escape View File

@ -142,6 +142,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
if (!StringUtils.isEmpty(model.getPublishTimeStart()) && !StringUtils.isEmpty(model.getPublishTimeEnd())) {
commonQueryHql.append("AND ms.publishTime between :publishTimeStart and :publishTimeEnd ");
}
if (!StringUtils.isEmpty(model.getPlanArriveEndTime()) && !StringUtils.isEmpty(model.getPlanArriveEndTime())) {
commonQueryHql.append("AND ms.planArriveEndTime between :planArriveEndTimeStart and :planArriveEndTimeEnd ");
}
//按照结束扫描时间倒叙
orderByHql.append(" ORDER BY endScanTime DESC ");
@ -207,5 +210,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
dataQuery.setParameter("publishTimeStart",model.getPublishTimeStart());
dataQuery.setParameter("publishTimeEnd", model.getPublishTimeEnd());
}
if (!StringUtils.isEmpty(model.getPlanArriveEndTimeStart()) && !StringUtils.isEmpty(model.getPlanArriveEndTimeEnd())) {
dataQuery.setParameter("planArriveEndTimeStart",model.getPlanArriveEndTimeStart());
dataQuery.setParameter("planArriveEndTimeEnd", model.getPlanArriveEndTimeEnd());
}
}
}

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java
Unescape Escape View File

@ -119,7 +119,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
return;
}
//6.装配件获取的三种条件
String custCode = mesCustomerPart.getCustCode();
String custCode = mesPartProdGroup.getCustCode();
MesCustomerCarModel mesCustomerCarModel = getMesCustomerCarModel(custPartNo, organizeCode, custCode);
if (mesCustomerCarModel == null) {
return;

5
pom.xml
Unescape Escape View File

@ -171,6 +171,11 @@
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-platform</artifactId>
<version>${i3plus.pojo.version}</version>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-model</artifactId>
<version>${i3plus.pojo.version}</version>
</dependency>

Write Preview
Loading…
Cancel
Save