diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index e015e969..88dffb08 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -481,4 +481,13 @@ public class YieldOrder extends BaseEntity { @JsonSerialize(nullsUsing = NullSerializer.class) private Double quota2; + @TableField(exist = false) + private String releaseDateStart; + + @TableField(exist = false) + private String releaseDateEnd; + + @TableField(exist = false) + private String receiveUserName; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/QcHardnessIot.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/QcHardnessIot.java index bc94d713..8ee26500 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/QcHardnessIot.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/QcHardnessIot.java @@ -30,7 +30,7 @@ public class QcHardnessIot implements Serializable { /** * 主键ID */ - @TableId(value = "QH_ID", type = IdType.AUTO) + @TableId(value = "QH_ID", type = IdType.ASSIGN_ID) @Schema(description = "主键ID") private Long qhId; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/QcWithstandVoltageIot.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/QcWithstandVoltageIot.java index 7eda6c31..f2ccf121 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/QcWithstandVoltageIot.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/QcWithstandVoltageIot.java @@ -30,7 +30,7 @@ public class QcWithstandVoltageIot implements Serializable { /** * 主键ID */ - @TableId(value = "QW_ID", type = IdType.AUTO) + @TableId(value = "QW_ID", type = IdType.ASSIGN_ID) @Schema(description = "主键ID") private Long qwId; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/iot/controller/IotWebApiController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/iot/controller/IotWebApiController.java index 8cb41c0d..27923fd8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/iot/controller/IotWebApiController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/iot/controller/IotWebApiController.java @@ -12,7 +12,7 @@ import org.springblade.desk.basic.pojo.entity.BasicClazz; import org.springblade.desk.basic.service.IBasicClazzService; import org.springblade.desk.iot.setvice.IEpLineElectricService; import org.springblade.desk.quality.service.IQcHardnessIotService; -import org.springblade.desk.quality.service.IQcThicknessIotService; +import org.springblade.desk.quality.service.IIotThicknessService; import org.springblade.desk.quality.service.IQcWithstandVoltageIotService; import org.springframework.web.bind.annotation.*; @@ -28,7 +28,7 @@ public class IotWebApiController { private final IEpLineElectricService lineElectricService; private final IBasicClazzService bsBasicClassService; - private final IQcThicknessIotService qcThicknessIotService; + private final IIotThicknessService iotThicknessService; private final IQcHardnessIotService qcHardnessIotService; private final IQcWithstandVoltageIotService qcWithstandVoltageIotService; @@ -61,7 +61,7 @@ public class IotWebApiController { if (data == null || data.isEmpty()) { throw new ServiceException("参数传递异常!"); } - qcThicknessIotService.pushThickness(data); + iotThicknessService.pushThickness(data); return R.success(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index 4ebd27c2..5db7ab0f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -17,9 +17,10 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml index 57d45df8..df1ea8db 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml @@ -26,6 +26,7 @@ AND status = #{entity.status} + ORDER BY RELEASE_DATE DESC - select * from FM_PROJECT_MILESTONE where is_deleted = 0 + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java index e6970b06..49c7bacc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java @@ -141,7 +141,7 @@ public class FmProjectMilestoneEntity extends BaseEntity { * 核查结果 */ @Schema(description = "核查结果") - private Short checkResult=0; + private Short checkResult; /** * 核查人 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java index 8dd61ffc..b65a2426 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java @@ -25,11 +25,15 @@ */ package org.springblade.desk.process.pojo.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; +import java.util.Date; /** * 项目里程碑 视图实体类 @@ -43,4 +47,24 @@ public class FmProjectMilestoneVO extends FmProjectMilestoneEntity { @Serial private static final long serialVersionUID = 1L; + private String paCode; + + private String projectName; + + private String projectHead; + + private String approvalStatus; + + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date projectStartTime; + + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date projectDesiredEnd; + + private String milestoneNodeStart; + + private String milestoneNodeEnd; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java index e90dddd5..a8a64f85 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java @@ -177,6 +177,7 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl> mtuList = macToolUseMapper.listAllByNoFinished(); if (mtuList == null || mtuList.isEmpty()) { return; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java index da707ce3..7ebe91ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java @@ -83,6 +83,7 @@ public class ProReTemplateController extends BladeController { public R> list(@Parameter(hidden = true) @RequestParam Map proReTemplate, Query query) { QueryWrapper qw = Condition.getQueryWrapper(proReTemplate, ProReTemplate.class); + qw.orderByDesc("UPDATE_TIME"); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ProReTemplateWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java index 38fd5479..c505d66b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java @@ -37,4 +37,13 @@ public interface IotThicknessMapper extends BaseMapper { * @return List */ List exportIotThickness(@Param("ew") Wrapper queryWrapper); + + /** + * 根据设备编码和文件时间查询记录（去重） + * + * @param equipmentCode 设备编码 + * @param filetime 文件时间 + * @return IotThickness + */ + IotThickness getByEquipmentAndFiletime(@Param("equipmentCode") String equipmentCode, @Param("filetime") String filetime); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml index 653c9a6e..c78789a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml @@ -29,4 +29,11 @@ SELECT * FROM QA_IOT_THICKNESS ${ew.customSqlSegment} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcHardnessIotMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcHardnessIotMapper.xml index 4903aaa3..50f4a7ce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcHardnessIotMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcHardnessIotMapper.xml @@ -18,10 +18,10 @@ \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcThicknessIotMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcThicknessIotMapper.xml index 20645eda..a7cf2677 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcThicknessIotMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcThicknessIotMapper.xml @@ -24,7 +24,7 @@ SELECT QT_ID, DEVICE_CODE, FILETIME, DATA_CONTENT, CREATE_TIME, NOT_USE FROM QC_THICKNESS_IOT WHERE DEVICE_CODE = #{deviceCode} AND FILETIME = #{filetime} - FETCH FIRST 1 ROWS ONLY + AND ROWNUM <= 1 \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcWithstandVoltageIotMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcWithstandVoltageIotMapper.xml index ed9f9040..a7115ca2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcWithstandVoltageIotMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/QcWithstandVoltageIotMapper.xml @@ -20,7 +20,7 @@ SELECT QW_ID, DEVICE_CODE, WO_CODE, TEST_TIME, CUR_CONTENT, RES_RANGE, CREATE_TIME, IS_READ FROM QC_WITHSTAND_VOLTAGE_IOT WHERE WO_CODE = #{woCode} - FETCH FIRST 1 ROWS ONLY + AND ROWNUM <= 1 \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java index 7d7afdd0..65985653 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.service; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; @@ -41,4 +42,11 @@ public interface IIotThicknessService extends BaseService { * @param vo */ void setVOValue(IotThicknessVO vo); + + /** + * iot系统推送测厚数据 + * + * @param data 推送数据 + */ + void pushThickness(JSONObject data); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java index dba54c09..e6466107 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.service.impl; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; @@ -58,4 +59,29 @@ public class IotThicknessServiceImpl extends BaseServiceImpl implements IQcHardnessIotService { @Override + @SuppressWarnings("unchecked") public void pushHardness(JSONArray dataArray) { - // 存储需要的字段：hardnessValue列表、IP、deviceCode - List hardnessValues = new ArrayList<>(); - List ipList = new ArrayList<>(); - List deviceCodeList = new ArrayList<>(); - - // 遍历数组提取所需数据 for (Object obj : dataArray) { - if (!(obj instanceof JSONObject)) { - log.error("数组中包含非JSON对象元素: {}", obj); + JSONObject data; + if (obj instanceof JSONObject) { + data = (JSONObject) obj; + } else if (obj instanceof java.util.Map) { + data = new JSONObject((java.util.Map) obj); + } else { + log.error("数组中包含不支持类型的元素: {}", obj); continue; } - JSONObject data = (JSONObject) obj; - // 提取largeEquipment对象 - JSONObject largeEquipment = data.getJSONObject("largeEquipment"); - if (largeEquipment == null) { - log.warn("未找到largeEquipment字段，跳过当前数据: {}", data); - continue; - } - - // 提取deviceCode并添加到列表 - String deviceCode = largeEquipment.getString("deviceCode"); - if (StringUtils.isNotBlank(deviceCode)) { - deviceCodeList.add(deviceCode); - } - - // 提取IP并添加到列表 - String ip = largeEquipment.getString("IP"); - if (StringUtils.isNotBlank(ip)) { - ipList.add(ip); - } + String deviceCode = data.getString("Equipment_code"); + String batchNo = data.getString("Batch_number"); + String testTime = data.getString("Test_time"); - // 提取parameter_Values中的hardnessValue - JSONArray paramValuesArray = largeEquipment.getJSONArray("parameter_Values"); - if (paramValuesArray == null) { - log.warn("parameter_Values字段为空，跳过当前数据"); + if (StringUtils.isBlank(deviceCode)) { + log.warn("未获取到有效设备编码，跳过当前数据"); continue; } - // 遍历每个参数值字符串，解析JSON并提取hardnessValue - for (Object paramValObj : paramValuesArray) { - String paramValStr = paramValObj.toString(); - try { - JSONObject paramValJson = JSONObject.parseObject(paramValStr); - Double hardnessValue = paramValJson.getDouble("hardnessValue"); - if (hardnessValue != null) { - hardnessValues.add(hardnessValue); + // 提取Parameter_values并格式化为 "name:value unit" 形式 + JSONArray paramValues = data.getJSONArray("Parameter_values"); + List paramStrList = new ArrayList<>(); + if (paramValues != null) { + for (Object pvObj : paramValues) { + JSONObject pv; + if (pvObj instanceof JSONObject) { + pv = (JSONObject) pvObj; + } else if (pvObj instanceof java.util.Map) { + pv = new JSONObject((java.util.Map) pvObj); } else { - log.warn("当前参数中未找到hardnessValue: {}", paramValStr); + continue; } - } catch (Exception e) { - log.error("解析parameter_Values元素失败: {}，错误信息: {}", paramValStr, e.getMessage(), e); + String paramName = pv.getString("Parameter_name"); + String paramValue = pv.getString("Parameter_value"); + String paramUnit = pv.getString("Parameter_unit"); + paramStrList.add(paramName + ":" + paramValue + " " + paramUnit); } } - } - - // 处理合并后的数据 - processMergedData(deviceCodeList, ipList, hardnessValues); - } + String formattedParams = String.join(", ", paramStrList); - /** - * 处理合并后的三个列表数据 - */ - private void processMergedData(List deviceCodeList, List ipList, List hardnessValues) { - // 获取核心字段 - String deviceCode = deviceCodeList.isEmpty() ? "" : deviceCodeList.get(0); - String ip = ipList.isEmpty() ? "" : ipList.get(0); - - if (StringUtils.isBlank(deviceCode)) { - log.warn("未获取到有效设备编码，终止数据处理"); - return; - } - - // 格式化hardnessValue为"hv 值1-值2-值3"格式 - String formattedHardness; - if (hardnessValues.isEmpty()) { - formattedHardness = "hv "; - log.warn("未提取到任何hardnessValue值"); - } else { - List hardnessStrList = new ArrayList<>(); - for (Double hv : hardnessValues) { - hardnessStrList.add(String.valueOf(hv)); + // 数据去重检查 + QcHardnessIot duplicateData = baseMapper.getDataByDeviceCodeAndDataContent(deviceCode, data.toJSONString()); + if (duplicateData != null) { + log.info("已存在相同设备编码+相同硬度数据的记录，无需重复存储: deviceCode={}", deviceCode); + continue; } - formattedHardness = "hv " + String.join("-", hardnessStrList); - } - // 构建存储的JSON对象 - JSONObject formattedJson = new JSONObject(); - formattedJson.put("formatted_hardness", formattedHardness); - String dataContentStr = formattedJson.toJSONString(); - - // 数据去重检查 - QcHardnessIot duplicateData = baseMapper.getDataByDeviceCodeAndDataContent(deviceCode, dataContentStr); - if (duplicateData != null) { - log.info("已存在相同设备编码+相同硬度数据的记录，无需重复存储"); - return; + // 将同设备编码下所有未读记录标记为超时未读 + baseMapper.updateAllToRead(deviceCode); + + // 新增记录 + QcHardnessIot entity = new QcHardnessIot(); + entity.setCreateTime(new Date()); + entity.setNotUse(2); + entity.setDataContent(data.toJSONString()); + entity.setDeviceCode(deviceCode); + entity.setBatchNo(batchNo); + entity.setFiletime(testTime); + entity.setIsRead(0); + save(entity); + + log.info("新增硬度数据成功，设备编码：{}，批次号：{}，检测时间：{}，参数：{}", deviceCode, batchNo, testTime, formattedParams); } - - // 将同设备编码下所有未读记录标记为超时未读 - baseMapper.updateAllToRead(deviceCode); - - // 新增记录 - QcHardnessIot entity = new QcHardnessIot(); - entity.setCreateTime(new Date()); - entity.setNotUse(2); - entity.setDataContent(dataContentStr); - entity.setDeviceCode(deviceCode); - entity.setIp(ip); - entity.setIsRead(0); - save(entity); - - log.info("新增硬度数据成功，设备编码：{}，IP：{}，格式化硬度值：{}", deviceCode, ip, formattedHardness); } } \ No newline at end of file diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml index d26ce303..3b92f5f6 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml @@ -29,6 +29,7 @@ FROM dba_mgr.v_mes_rb_pacturnrecord a + a.processlinedesc like '%4%' AND a.cdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml index 0184851c..c49191de 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml @@ -40,7 +40,7 @@ FROM dba_mgr.v_mes_rb_pk a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml index 7850dcb8..db434488 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml @@ -24,7 +24,7 @@ a.warctlr,a.lewdept,a.prtudeptcode,a.newlevname,a.newlevdate from dba_mgr.V_MES_RB_PURTOSO a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml index 8fde9329..97e69538 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml @@ -29,7 +29,7 @@ FROM dba_mgr.v_mes_rb_sjso a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml index c55d7d3f..879bc7d3 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml @@ -39,7 +39,7 @@ FROM dba_mgr.v_mes_rb_sodelrecwx a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml index 15fb625f..18b68a69 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml @@ -39,7 +39,7 @@ FROM dba_mgr.v_mes_rb_sodelreczg a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml index e613f411..508e1b24 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml @@ -28,7 +28,7 @@ FROM dba_mgr.v_mes_rb_wxpromotion a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartoplinkFirseqMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartoplinkFirseqMapper.xml index a8d4bbf9..0cc36594 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartoplinkFirseqMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartoplinkFirseqMapper.xml @@ -5,5 +5,6 @@ select a.prtno as partcode, a.prtname as partname, a.firpp, a.firppname, a.firseq, a.firseqname, a.firseqno from dba_mgr.v_partoplink_firseq a where prtno = #{partCode} + order by a.firseqno diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index 524b231b..82d306b8 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -164,6 +164,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldPlan.setProductIdent(mesRbWo.getPrtlotno()); yieldPlan.setYpQty(Long.valueOf(Math.round(Double.parseDouble(mesRbWo.getWoporqty())))); //直接取erp数据不查询mes + log.info("qyl:同步生产计划零件信息:{}:{}:{}",mesRbWo.getPrtarea(),mesRbWo.getPrtdesc(),mesRbWo.getProcesslinedesc()); yieldPlan.setYpArea(mesRbWo.getPrtarea()); yieldPlan.setPartName(mesRbWo.getPrtdesc()); yieldPlan.setPrimaryCraft(mesRbWo.getProcesslinedesc()); @@ -430,6 +431,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ); + yieldOrder.setYpMemo("烧结转工单"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号 yieldOrder.setYpCode(mesRbtoso.getWono()); @@ -572,6 +574,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(false); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setYpMemo("外协转工单"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号 yieldOrder.setYpCode(mesRbSodelrecwx.getWono()); @@ -732,6 +735,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setYpMemo("配套转工单"); yieldOrder.setYoCode(mesRbPk.getWono());//生产单号 yieldOrder.setYpCode(mesRbPk.getWono()); yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml index 652a499a..ff40d772 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml @@ -67,7 +67,6 @@ and batch_no LIKE CONCAT('%', CONCAT(#{yieldOrder.batchNo}, '%')) - and yo_code LIKE CONCAT('%', CONCAT(#{yieldOrder.yoCode}, '%')) @@ -87,6 +86,9 @@ and work_center_id = #{yieldOrder.workCenterId} + + and card_no LIKE CONCAT('%', CONCAT(#{yieldOrder.cardNo}, '%')) + order by receive_time desc