From 4efdfa79008cb12e1fbb7120cd68198cd0d0677c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 十二月 2023 16:47:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 575f0b2..ccf1d69 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -219,7 +219,7 @@
                     taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
                     taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
                     taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
-                    if (taskWrk.getIoType() ==1 ){
+                    if (taskWrk.getIoType() ==1 || taskWrk.getIoType() == 3){
                         taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
                         taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
                     }else if (taskWrk.getIoType() ==2){
@@ -230,6 +230,8 @@
                         map1.put(114,"J-1107");
                         map1.put(118,"J-1109");
                         map1.put(122,"J-1111");
+                        map1.put(305,"H-1101");
+                        map1.put(405,"G-1101");
                         taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
                         taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
                     }
@@ -258,6 +260,9 @@
                     );
                     JSONObject jsonObject = JSON.parseObject(response);
                     if (jsonObject.getInteger("code").equals(200)){
+                        if (taskWrk.getIoType() == 3){
+                            taskWrk.setWrkSts(4);
+                        }
                         taskWrk.setStatus(5);
                         if (!taskWrkService.update(taskWrk,new EntityWrapper<TaskWrk>().eq("wrk_no",crnProtocol.getTaskNo()))){
                             log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");

--
Gitblit v1.9.1