diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml index 8705ce16..6abd6767 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml @@ -207,11 +207,10 @@ - UPDATE MES_WORK_PLAN a SET a.PRINT_TYPE = 'process' + UPDATE MES_WORK_PLAN a SET a.PRINT_TYPE = 1 WHERE a.ID IN ( SELECT DISTINCT c.ID FROM MES_MAC_TOOL_USE c LEFT JOIN MES_EQUIPMENT b ON c.EQUIPMENT_CARD = b.ID - LEFT JOIN MES_WORK_PLAN wp ON c.WP_ID = wp.ID WHERE b.DEVICE_CODE = #{deviceCode} AND c.MTN_CODE = #{mtnCode} AND c.is_deleted = 0 @@ -219,7 +218,7 @@ AND c.HANG_NUM = #{hangNum} ) - AND (a.PRINT_TYPE IS NULL OR a.PRINT_TYPE != 'process') + AND (a.PRINT_TYPE IS NULL OR a.PRINT_TYPE != 1) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java index 41b3c39f..2e73a7c8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java @@ -3,11 +3,11 @@ package org.springblade.desk.produce.service.impl; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.utils.StringUtil; import org.springblade.desk.produce.mapper.MacToolUseMapper; import org.springblade.desk.produce.mapper.MesQcProduceRunMapper; import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; @@ -126,8 +126,8 @@ public class MesQcProduceRunServiceImpl extends BaseServiceImpl entity = new HttpEntity<>(body, headers); ResponseEntity responseEntity = httpClientTemplate.postForEntity(