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/asrs/task/TaskLogScheduler.java | 27 ++++
src/main/webapp/views/locMast/locMast_detail.html | 6 +
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 7 +
src/main/webapp/views/taskWrk/taskWrk.html | 2
src/main/java/com/zy/asrs/utils/Utils.java | 24 ++++
src/main/java/com/zy/asrs/controller/OpenController.java | 29 +++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 172 ++++++++++++++++++++++++++++++----
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 10 +-
src/main/resources/mapper/TaskWrkMapper.xml | 4
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 +
10 files changed, 243 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ada0552..da56835 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -192,15 +192,19 @@
map.put("J-1109",118);map.put("J-1110",117);
map.put("J-1111",122);map.put("J-1112",121);
map.put("H-1102",300);map.put("H-1101",305);
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("stn_desc", param.getWharfCode()));
-
- if (Cools.isEmpty(staDesc)){
- return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+ map.put("G-1102",400);map.put("G-1101",405);
+// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+// .eq("stn_desc", param.getWharfCode()));
+//
+// if (Cools.isEmpty(staDesc)){
+// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+// }
+ if (Cools.isEmpty(map.get(param.getWharfCode()))){
+ return R.error("鏈煡璇㈠埌绔欑偣");
}
- //BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
- BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
- if (basDevp.getAutoing().equals("Y")){
+ BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
+// BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
+ if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))){
apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
,request.getRemoteAddr()+request.getRequestURI()
,appkey
@@ -209,7 +213,7 @@
,R.ok().toString()
,true
);
- return R.ok();
+ return R.ok("鍙叆");
}else {
apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
,request.getRemoteAddr()+request.getRequestURI()
@@ -256,9 +260,12 @@
if (Cools.isEmpty(param.getEmptyContainer())){
return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
}
- if (Cools.isEmpty(param.getTargetWharf())){
- return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+ if (!param.getTaskType().equals("YK")){
+ if (Cools.isEmpty(param.getTargetWharf())){
+ return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+ }
}
+
StaDesc staDesc = new StaDesc();
if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("J")){
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
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 522bd71..d641197 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -10,6 +10,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.mapper.*;
@@ -85,6 +86,8 @@
@Autowired
private OpenServiceImpl openServiceImpl;
+ @Autowired
+ private StaDescService staDescService;
@Value("${wms.url}")
private String wmsUrl;
@@ -415,6 +418,15 @@
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
+ //寮�濮嬭繍琛�
+ String response = CrnStartRunning(taskWrk);
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+
+ }else {
+ log.error("鍏ュ簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
+
+ }
}
// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -513,25 +525,25 @@
String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
if (!Cools.isEmpty(hallowLocNoTask)){
- if (!Cools.isEmpty(hallowLocNoTask.getTargetPoint())){
- continue;
- }
-// 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), "璇锋眰绉诲簱浠诲姟鍒嗛厤搴撲綅");
- }
+// if (!Cools.isEmpty(hallowLocNoTask.getTargetPoint())){
+// continue;
+// }
+//// 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;
}
}
@@ -556,6 +568,15 @@
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
+ //寮�濮嬭繍琛�
+ String response = CrnStartRunning(taskWrk);
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+
+ }else {
+ log.error("鍑哄簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
+
+ }
}
}
@@ -570,9 +591,50 @@
public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑绉诲簱宸ヤ綔妗�
- List<TaskWrk> taskWrks = taskWrkMapper.selectPakOut3(slave.getId(), crnStn.getStaNo().toString());
+ List<TaskWrk> taskWrks = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>()
+ .eq("crn_no",slave.getId())
+ .eq("wrk_sts",11)
+ .eq("io_type",3));
for (TaskWrk taskWrk : taskWrks){
- if (taskWrk == null || Cools.isEmpty(taskWrk.getTargetPoint()) || taskWrk.getTargetPoint().equals("")) {
+ if (Cools.isEmpty(taskWrk.getTargetPoint())){
+ List<Integer> list = openServiceImpl.getInEnableRoadway();
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ ToWmsDTO toWmsDTO = new ToWmsDTO();
+ toWmsDTO.setWarehouseId("1688469798893297665");
+ toWmsDTO.setContainerCode(taskWrk.getBarcode());
+ toWmsDTO.setApplyType("TUNNEL_LOCATION");
+ toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
+ toWmsDTO.setCanInboundTunnels(list);
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/inboundTaskApply")
+ .setJson(JSON.toJSONString(toWmsDTO))
+ .build()
+ .doPost();
+ }catch (Exception e){
+ log.error("wms閫氳澶辫触,"+e.getMessage());
+ continue;
+ }
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
+ taskWrk.setOriginTargetPoint(getWmsDto.getTargetLocationCode());
+ taskWrk.setTargetPoint(Utils.getWcsLocNo(getWmsDto.getTargetLocationCode()));
+ if (!taskWrkService.updateById(taskWrk)){
+ log.error("淇濆瓨wms搴撲綅鍙峰け璐�");
+ }
+ continue;
+ }else {
+ log.error("wms閫氳澶辫触,"+jsonObject.get("msg"));
+ continue;
+ }
+
+ }
+ if (taskWrk == null || Cools.isEmpty(taskWrk.getTargetPoint()) || taskWrk.getTargetPoint().equals("") || taskWrk.getWrkNo() == null) {
continue;
}
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
@@ -607,7 +669,7 @@
crnCommand.setDestinationPosX(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosY(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setCommand((short) 1);
- if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand),false)) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
} else {
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
@@ -616,6 +678,15 @@
taskWrk.setModiTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ //寮�濮嬭繍琛�
+ String response = CrnStartRunning(taskWrk);
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+
+ }else {
+ log.error("绉诲簱浠诲姟寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
+ continue;
}
break;
}
@@ -890,4 +961,61 @@
}
+ public synchronized String CrnStartRunning(TaskWrk taskWrk){
+ String tasktype = null;
+ switch (taskWrk.getIoType()){
+ case 1:
+ tasktype= "RK";
+ break;
+ case 2:
+ tasktype= "CK";
+ break;
+ case 3:
+ tasktype= "YK";
+ break;
+ default:
+ tasktype= "鏈煡";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ TaskOverToWms taskOverToWms = new TaskOverToWms();
+ taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
+ taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
+ taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
+ taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
+ taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
+ if (taskWrk.getIoType() ==1 || taskWrk.getIoType() == 3){
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ }else if (taskWrk.getIoType() ==2){
+ Map<Integer,String> map1 = new HashMap<>();
+ map1.put(102,"J-1101");
+ map1.put(106,"J-1103");
+ map1.put(110,"J-1105");
+ 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()); //婧愬簱浣�
+ }
+
+ taskOverToWms.setTaskStatus("executing"); //浠诲姟鐘舵��
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/taskStatusFeedback")
+ .setJson(JSON.toJSONString(taskOverToWms))
+ .build()
+ .doPost();
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+ }
+ return response;
+ }
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d8a80b1..4347bc1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -92,6 +92,12 @@
taskWrk.setOriginStartPoint(param.getStartPoint());
}
taskWrk.setTargetPoint(param.getTargetPoint());
+ }else if (param.getIoType() == 3){
+ taskWrk.setWrkSts(11);
+ if (!Cools.isEmpty(param.getStartPoint())) {
+ taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+ taskWrk.setOriginStartPoint(param.getStartPoint());
+ }
}
@@ -176,8 +182,8 @@
.eq("type_no",1)
.ge("crn_stn",200));
}
- //map1.put("taskTunnel", staDesc.getStnDesc());
- map1.put("taskTunnel", "J-1104");
+ map1.put("taskTunnel", staDesc.getStnDesc());
+ //map1.put("taskTunnel", "J-1104");
return R.ok(map1);
}
return R.error((String) jsonObject.get("msg"));
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 8643494..7e41622 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
@@ -180,16 +181,15 @@
@Override
public void locMove(TaskWrk taskWrk, Long userId) {
//搴撴牸绉昏浇浠诲姟娲惧彂
- StaDesc staDesc = staDescService.queryCrn(taskWrk.getIoType(), Integer.parseInt(taskWrk.getTargetPoint()), taskWrk.getCrnNo());
- if (staDesc == null) {
- return;//涓嶅瓨鍦ㄨ矾寰�
- }
+ if (Cools.isEmpty(taskWrk.getTargetPoint())){
+ return;
+ }
int workNo = commonService.getWorkNo(WorkNoType.OTHER.type);//鑾峰彇宸ヤ綔鍙�
taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
taskWrk.setWrkSts(11);//宸ヤ綔鐘舵�� 11.鐢熸垚鍑哄簱ID
- taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
+ //taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
taskWrk.setModiTime(new Date());
taskWrk.setModiUser(userId);
updateById(taskWrk);
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 18ebbee..1620332 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -4,10 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
import com.zy.asrs.service.*;
@@ -20,6 +17,7 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,6 +40,8 @@
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
@Value("${wms.url}")
private String wmsUrl;
@@ -75,6 +75,25 @@
if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo())){
continue;
}
+ } else if (taskWrk.getIoType() ==3) {
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ Date now = new Date();
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("F");//F.鍦ㄥ簱
+ locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast2.setModiTime(now);
+ locMast2.setModiUser(9999L);
+ locMastService.updateById(locMast);
}
taskOverToWms.setTaskStatus("done"); //浠诲姟鐘舵��
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index ffee264..2cf925f 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -18,6 +18,30 @@
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
+ public static String getWmsRow(String loc){
+ String row = loc.substring(0, 2);
+ String bay = loc.substring(3, 5);
+ String lev = loc.substring(5, 7);
+ String locNo = null;
+
+ ArrayList<String> list = new ArrayList<>();
+ list.add("01");list.add("02");list.add("03");list.add("04");
+ int i = list.indexOf(row);
+ if (i != -1){
+ if (i == 0){
+ locNo = "01"+"-"+bay+"-"+lev+"-"+"01-02";
+ }else if (i == 1) {
+ locNo = "01"+"-"+bay+"-"+lev+"-"+"01-01";
+ }else if (i == 2) {
+ locNo = "01"+"-"+bay+"-"+lev+"-"+"02-01";
+ }else if (i == 3) {
+ locNo = "01"+"-"+bay+"-"+lev+"-"+"02-02";
+ }
+
+ }
+ return locNo;
+ }
+
//杞崲wms浼犺緭鐨勫簱浣嶅彿
public static String getWcsLocNo(String locNo){
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("鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index ddbeb5a..39e8c53 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -92,10 +92,10 @@
<select id="selectPakOut3" resultMap="BaseResultMap">
select * from dbo.wcs_task_wrk
where crn_no=#{crnNo}
- and target_point=#{targetPoint}
+-- and target_point=#{targetPoint}
and wrk_sts=11
and io_type = 3
- order by io_pri desc,create_time,wrk_no ASC
+ order by io_pri desc,create_time ASC
</select>
<select id="selectCrnWorking" resultMap="BaseResultMap">
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index e5993ef..be2b0d4 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -90,6 +90,12 @@
</div>
</div>
<div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">鎺掞細</label>
+ <div class="layui-input-inline">
+ <input id="row1" class="layui-input" type="text" autocomplete="off" disabled="disabled">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">鍒楋細</label>
<div class="layui-input-inline">
<input id="bay1" class="layui-input" type="text" autocomplete="off" disabled="disabled">
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index 3553bee..befd375 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -83,7 +83,7 @@
</el-table-column>
<el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
</el-table-column>
- <el-table-column property="memo" label="澶囨敞">
+ <el-table-column property="ioPri" label="浼樺厛绾�">
</el-table-column>
</el-table>
--
Gitblit v1.9.1