生产管理修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml

@@ -207,11 +207,10 @@
     </select>
 
     <update id="updatePrintType">
-        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}
             </if>
         )
-        AND (a.PRINT_TYPE IS NULL OR a.PRINT_TYPE != 'process')
+        AND (a.PRINT_TYPE IS NULL OR a.PRINT_TYPE != 1)
     </update>
 
 </mapper>

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<MesQcProduceRunM
 		body.put("orgId", orgId);
 		body.put("systemId", systemId);
 		body.put("deviceId", deviceCode);
-		body.put("params", Arrays.asList("Trace"));
-		body.put("paramsRequest", "PatId\\\"" + ":\\\"" + hangNum + "\\\"");
+		body.put("params", Lists.newArrayList("Trace"));
+		body.put("paramsRequest", "PatId\\\\\\\"" + ":\\\\\\\"" + hangNum + "\\\\\\\"");
 
 		HttpEntity<JSONObject> entity = new HttpEntity<>(body, headers);
 		ResponseEntity<JSONObject> responseEntity = httpClientTemplate.postForEntity(