From 3e4ca9accd2be4240308565bb21469f3abb86023 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 17 十一月 2023 15:02:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 39 +++++++++++++++++++++++----------------
src/main/java/com/zy/asrs/service/TaskWrkService.java | 1 +
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 5 +++++
src/main/resources/mapper/TaskWrkMapper.xml | 7 +++++++
5 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 65cb0ab..17b4e46 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -14,6 +14,7 @@
public interface TaskWrkMapper extends BaseMapper<TaskWrk> {
TaskWrk selectByTaskNo(String taskNo);
+ TaskWrk selectByStartPoint(@Param("startPoint") String startPoint);
TaskWrk selectByWrkNo(Integer wrkNo);
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
index a3c320a..e62ee0b 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -8,6 +8,7 @@
public interface TaskWrkService extends IService<TaskWrk> {
TaskWrk selectByTaskNo(String taskNo);
+ TaskWrk selectByStartPoint(String taskNo);
TaskWrk selectByWrkNo(Integer wrkNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2a9978d..0418842 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -14,6 +15,7 @@
import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.cache.SlaveConnection;
@@ -320,27 +322,32 @@
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
+ taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
+
List<TaskWrk> taskWrks1 = taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
if (Cools.isEmpty(taskWrks1) && taskWrks1.size()!=0){
- break;
+ continue;
}
String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (!shallowLoc.getLocSts().equals("O")){
- // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
- if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
- log.error("宸ヤ綔鍙�={}锛屽簱浣嶅彿={}锛屾祬搴撲綅寮傚父锛氭祬搴撲綅鍙凤細={}锛屽簱浣嶇姸鎬�={}",taskWrk.getTaskNo(),taskWrk.getStartPoint(),shallowLocNo,shallowLoc.getLocSts());
- } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
- taskWrk.setTransferMark(1);
- taskWrkMapper.updateById(taskWrk);
- WMSAndAGVInterfaceParam param = new WMSAndAGVInterfaceParam();
- param.setTaskNo(taskWrk.getTaskNo());
- new PostMesDataUtils().postMesData("MES绯荤粺",wmsUrl,movePath,param);
- log.error("宸ヤ綔鍙�={}锛屽簱浣嶅彿={}锛屾祬搴撲綅闇�瑕佺Щ搴擄細娴呭簱浣嶅彿锛�={}锛屽簱浣嶇姸鎬�={}",taskWrk.getTaskNo(),taskWrk.getStartPoint(),shallowLocNo,shallowLoc.getLocSts());
- } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
- log.error("宸ヤ綔鍙�={}锛屽簱浣嶅彿={}锛屾祬搴撲綅寮傚父锛氭祬搴撲綅鍙凤細={}锛屽簱浣嶇姸鎬�={}",taskWrk.getTaskNo(),taskWrk.getStartPoint(),shallowLocNo,shallowLoc.getLocSts());
+ TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
+ if (!Cools.isEmpty(hallowLocNoTask)){
+// new PostMesDataUtils().postMesData("绉诲簱浠诲姟鍒嗛厤搴撲綅",wmsUrl,movePath,hallowLocNoTask);
+ try {
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(movePath)
+ .setJson(JSON.toJSONString(hallowLocNoTask))
+ .build()
+ .doPost();
+ System.out.println("response:"+response);
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ //瑙ｆ瀽
+ }
+ }catch (Exception e){
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/"+movePath, JSON.toJSONString(hallowLocNoTask), "璇锋眰绉诲簱浠诲姟鍒嗛厤搴撲綅");
}
- continue;
+ break;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 50eb0da..5534011 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -31,6 +31,11 @@
}
@Override
+ public TaskWrk selectByStartPoint(String taskNo) {
+ return this.baseMapper.selectByStartPoint(taskNo);
+ }
+
+ @Override
public TaskWrk selectByWrkNo(Integer wrkNo) {
return this.baseMapper.selectByWrkNo(wrkNo);
}
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index aaecabe..c318b92 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -33,6 +33,13 @@
and task_no = #{taskNo}
</select>
+ <select id="selectByStartPoint" resultMap="BaseResultMap">
+ select top 1 * from wcs_task_wrk
+ where 1=1
+ and io_type=3
+ and start_point = #{startPoint}
+ </select>
+
<select id="selectByWrkNo" resultMap="BaseResultMap">
select top 1 * from wcs_task_wrk
where 1=1
--
Gitblit v1.9.1