From 452fd41d1683fdfd2a615e498a04da2a064b7afb Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Wed, 11 Sep 2024 09:43:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E6=89=8B=E6=8C=81=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=AD=98=E5=9C=A8?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../agv/ndcone/AgvNdcOneDeviceDriver.java | 183 +++++++++---------
.../plc_to_agv/PlcToAgvDeviceDriver.java | 1 -
.../nl/common/enums/region/RegionEnum.java | 7 +-
.../wms/ext/fab/controller/FabController.java | 89 +++++----
.../service/dao/mapper/FabRequestMapper.java | 8 +-
.../wms/ext/fab/service/dto/SendMaterVo.java | 2 +
.../ext/fab/service/impl/FabServiceImpl.java | 2 +-
.../service/impl/HandheldServiceImpl.java | 11 +-
.../service/impl/SchBasePointServiceImpl.java | 25 ++-
.../sch/task_manage/task/ConnectorUtil.java | 4 +-
.../task/tasks/connector/CNTTask.java | 12 +-
.../task/tasks/connector/FTGTask.java | 2 +-
.../task/tasks/sorting/SortingSMTTask.java | 12 +-
.../task/tasks/sorting/SortingSNTTask.java | 2 +-
.../task/tasks/sorting/SortingTwoCNTTask.java | 1 +
.../src/views/wms/sch/task/index.vue | 4 +-
16 files changed, 201 insertions(+), 164 deletions(-)
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
index ccc84d2..da4c709 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
@@ -46,6 +46,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
/**
* NDC单工位AGV
@@ -180,9 +181,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
PlcToAgvDeviceDriver plcToAgvDeviceDriver = (PlcToAgvDeviceDriver) device.getDeviceDriver();
Map<String, Object> extraValue = plcToAgvDeviceDriver.getExtraValue();
if (plcToAgvDeviceDriver.getAGVEnable() != 0) {
- /*if (device_code.contains("_01")) {
+ if (device_code.contains("_01")) {
if (plcToAgvDeviceDriver.getAGVSetOutUpperAllowed() == 1) {
- data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
+ data = feedBackStatus(data, index, 1, inst, task, 2, false);
}
} else if (device_code.contains("_02")) {
Object plc_to_agv = extraValue.get("upper_lower_levels");
@@ -193,8 +194,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
data = feedBackStatus(data, index, 1, inst, task, 2, false);
}
}
- } else */
- if (ObjectUtil.isNotEmpty(extraValue.get("upper_lower_levels"))) {
+ } else if (ObjectUtil.isNotEmpty(extraValue.get("upper_lower_levels"))) {
Object plc_to_agv = extraValue.get("upper_lower_levels");
if ("1".equals(plc_to_agv)) {
plcToAgvDeviceDriver.writing("AGVSetOutReqUpper", "1");
@@ -257,49 +257,53 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
}
if (device.getDeviceDriver() instanceof PlcToAgvDeviceDriver) {
PlcToAgvDeviceDriver plcToAgvDeviceDriver = (PlcToAgvDeviceDriver) device.getDeviceDriver();
- /*if (device_code.contains("_01")) {
- try {
- List list = new ArrayList<>();
- Map map = new HashMap();
- map.put("code", "AGVInOP");
- map.put("value", "0");
- Map map1 = new HashMap();
- map1.put("code", "AGVSetOutReqUpper");
- map1.put("value", "0");
- Map map2 = new HashMap();
- map2.put("code", "AGVSetOutReqLower");
- map2.put("value", "0");
- list.add(map);
- list.add(map1);
- list.add(map2);
- plcToAgvDeviceDriver.writing(list);
- } catch (Exception e) {
- log.info("下发AGVInOP信号:{}失败", "0");
- }
+ if (device_code.contains("_01")) {
+ CompletableFuture.runAsync(() -> {
+ try {
+ List list = new ArrayList<>();
+ Map map = new HashMap();
+ map.put("code", "AGVInOP");
+ map.put("value", "0");
+ Map map1 = new HashMap();
+ map1.put("code", "AGVSetOutReqUpper");
+ map1.put("value", "0");
+ Map map2 = new HashMap();
+ map2.put("code", "AGVSetOutReqLower");
+ map2.put("value", "0");
+ list.add(map);
+ list.add(map1);
+ list.add(map2);
+ plcToAgvDeviceDriver.writing(list);
+ } catch (Exception e) {
+ log.info("下发AGVInOP信号:{}失败", "0");
+ }
+ });
data = feedBackStatus(data, index, 2, inst, task, 2, false);
} else if (device_code.contains("_02")) {
- data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
- } else {*/
- try {
- List list = new ArrayList<>();
- Map map = new HashMap();
- map.put("code", "AGVInOP");
- map.put("value", "0");
- Map map1 = new HashMap();
- map1.put("code", "AGVSetOutReqUpper");
- map1.put("value", "0");
- Map map2 = new HashMap();
- map2.put("code", "AGVSetOutReqLower");
- map2.put("value", "0");
- list.add(map);
- list.add(map1);
- list.add(map2);
- plcToAgvDeviceDriver.writing(list);
- } catch (Exception e) {
- log.info("下发AGVInOP信号:{}失败", "0");
+ data = feedBackStatus(data, index, 2, inst, task, 2, false);
+ } else {
+ CompletableFuture.runAsync(() -> {
+ try {
+ List list = new ArrayList<>();
+ Map map = new HashMap();
+ map.put("code", "AGVInOP");
+ map.put("value", "0");
+ Map map1 = new HashMap();
+ map1.put("code", "AGVSetOutReqUpper");
+ map1.put("value", "0");
+ Map map2 = new HashMap();
+ map2.put("code", "AGVSetOutReqLower");
+ map2.put("value", "0");
+ list.add(map);
+ list.add(map1);
+ list.add(map2);
+ plcToAgvDeviceDriver.writing(list);
+ } catch (Exception e) {
+ log.info("下发AGVInOP信号:{}失败", "0");
+ }
+ });
+ data = feedBackStatus(data, index, 2, inst, task, 2, false);
}
- data = feedBackStatus(data, index, 2, inst, task, 2, false);
- /*}*/
} else if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
try {
data = feedBackStatus(data, index, 2, inst, task, 1, false);
@@ -341,7 +345,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
PlcToAgvDeviceDriver plcToAgvDeviceDriver = (PlcToAgvDeviceDriver) device.getDeviceDriver();
if (plcToAgvDeviceDriver.getAGVEnable() != 0) {
Map<String, Object> extraValue = plcToAgvDeviceDriver.getExtraValue();
- /*if (device_code.contains("_01")) {
+ if (device_code.contains("_01")) {
Object plc_to_agv = extraValue.get("upper_lower_levels");
if (ObjectUtil.isNotNull(plc_to_agv) && "1".equals(plc_to_agv)) {
plcToAgvDeviceDriver.writing("AGVSetInReqUpper", "1");
@@ -352,10 +356,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
}
} else if (device_code.contains("_02")) {
if (plcToAgvDeviceDriver.getAGVSetInUpperAllowed() == 1) {
- data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
+ data = feedBackStatus(data, index, 3, inst, task, 2, false);
}
- } else */
- if (ObjectUtil.isNotEmpty(extraValue.get("upper_lower_levels"))) {
+ } else if (ObjectUtil.isNotEmpty(extraValue.get("upper_lower_levels"))) {
Object plc_to_agv = extraValue.get("upper_lower_levels");
if ("1".equals(plc_to_agv)) {
plcToAgvDeviceDriver.writing("AGVSetInReqUpper", "1");
@@ -424,49 +427,53 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
transportOrder = "";
if (device.getDeviceDriver() instanceof PlcToAgvDeviceDriver) {
PlcToAgvDeviceDriver plcToAgvDeviceDriver = (PlcToAgvDeviceDriver) device.getDeviceDriver();
- /*if (device_code.contains("_01")) {
- data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
+ if (device_code.contains("_01")) {
+ data = feedBackStatus(data, index, 4, inst, task, 2, false);
} else if (device_code.contains("_02")) {
- try {
- List list = new ArrayList<>();
- Map map = new HashMap();
- map.put("code", "AGVInOP");
- map.put("value", "0");
- Map map1 = new HashMap();
- map1.put("code", "AGVSetInReqUpper");
- map1.put("value", "0");
- Map map2 = new HashMap();
- map2.put("code", "AGVSetInReqLower");
- map2.put("value", "0");
- list.add(map);
- list.add(map1);
- list.add(map2);
- plcToAgvDeviceDriver.writing(list);
- } catch (Exception e) {
- log.info("下发AGVInOP信号:{}失败", "0");
- }
+ CompletableFuture.runAsync(() -> {
+ try {
+ List list = new ArrayList<>();
+ Map map = new HashMap();
+ map.put("code", "AGVInOP");
+ map.put("value", "0");
+ Map map1 = new HashMap();
+ map1.put("code", "AGVSetInReqUpper");
+ map1.put("value", "0");
+ Map map2 = new HashMap();
+ map2.put("code", "AGVSetInReqLower");
+ map2.put("value", "0");
+ list.add(map);
+ list.add(map1);
+ list.add(map2);
+ plcToAgvDeviceDriver.writing(list);
+ } catch (Exception e) {
+ log.info("下发AGVInOP信号:{}失败", "0");
+ }
+ });
+ data = feedBackStatus(data, index, 4, inst, task, 2, false);
+ } else {
+ CompletableFuture.runAsync(() -> {
+ try {
+ List list = new ArrayList<>();
+ Map map = new HashMap();
+ map.put("code", "AGVInOP");
+ map.put("value", "0");
+ Map map1 = new HashMap();
+ map1.put("code", "AGVSetInReqUpper");
+ map1.put("value", "0");
+ Map map2 = new HashMap();
+ map2.put("code", "AGVSetInReqLower");
+ map2.put("value", "0");
+ list.add(map);
+ list.add(map1);
+ list.add(map2);
+ plcToAgvDeviceDriver.writing(list);
+ } catch (Exception e) {
+ log.info("下发AGVInOP信号:{}失败", "0");
+ }
+ });
data = feedBackStatus(data, index, 4, inst, task, 2, false);
- } else {*/
- try {
- List list = new ArrayList<>();
- Map map = new HashMap();
- map.put("code", "AGVInOP");
- map.put("value", "0");
- Map map1 = new HashMap();
- map1.put("code", "AGVSetInReqUpper");
- map1.put("value", "0");
- Map map2 = new HashMap();
- map2.put("code", "AGVSetInReqLower");
- map2.put("value", "0");
- list.add(map);
- list.add(map1);
- list.add(map2);
- plcToAgvDeviceDriver.writing(list);
- } catch (Exception e) {
- log.info("下发AGVInOP信号:{}失败", "0");
}
- data = feedBackStatus(data, index, 4, inst, task, 2, false);
- /* }*/
} else if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
try {
StandardOrdinarySiteDeviceDriver standar = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plc_to_agv/PlcToAgvDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plc_to_agv/PlcToAgvDeviceDriver.java
index 9d53d9b..a95da68 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plc_to_agv/PlcToAgvDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/plc_to_agv/PlcToAgvDeviceDriver.java
@@ -110,7 +110,6 @@ public class PlcToAgvDeviceDriver extends AbstractOpcDeviceDriver implements Dev
AGVSetOutReqUpper = this.itemProtocol.getAGVSetOutReqUpper();
AGVSetOutReqLower = this.itemProtocol.getAGVSetOutReqLower();
heartbeat = this.itemProtocol.getHeartbeat();
-
if (heartbeat == 1) {
writing("heartbeat", writing_heartbeat);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/region/RegionEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/region/RegionEnum.java
index 06cc043..7ff96bb 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/region/RegionEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/region/RegionEnum.java
@@ -9,10 +9,13 @@ public enum RegionEnum {
STAMPING_AND_BLANKING("Amada 80T冲床（手动加工）","111-06"),
TRUBEND_SHELVES_3_1_1("TruBend 7036货架03-01-01","111-07"),
+ TRUBEND_5170("TruBend 5170(手动加工)","111-08"),
+ TruBend_cell_7000("折弯","111-09"),
+ LAG_ROBOT_BEANDING_CELL("手动加工","111-10"),
ZDFJ("分拣工序","111-08"),
DDLK("堆叠笼框工序","111-20"),
- NBJG("内部加工区","111-10"),
- WXJG("外协加工区","111-12"),
+ NBJG("内部加工区","NBJGZCQ"),
+ WXJG("外协加工区","WXJGZCQ"),
ZDZWQ("自动折弯区","ZDZWQ"),
;
private final String region_name;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java
index fa312b6..8890de4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java
@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.base.TableDataInfo;
import org.nl.common.enums.VehicleTypeEnum;
+import org.nl.common.enums.region.RegionEnum;
import org.nl.common.exception.BadRequestException;
import org.nl.common.logging.annotation.Log;
import org.nl.config.MapOf;
@@ -53,7 +54,6 @@ public class FabController {
private WmsToConnectorService wmsToConnectorService;
-
/**
* 设备工序列表
*
@@ -204,52 +204,59 @@ public class FabController {
@Log("工序下料")
@PostMapping("/sendMater")
public ResponseEntity<TableDataInfo> sendMater(@RequestBody SendMaterVo materInfo) {
- if (StrUtil.isNotEmpty(materInfo.getRegion_code())) {
+ /*if (StrUtil.isNotEmpty(materInfo.getRegion_code())) {
JSONObject toJSON = (JSONObject) JSON.toJSON(materInfo);
fabService.createAgvTask(toJSON, "smt");
return new ResponseEntity(TableDataInfo.build(), HttpStatus.OK);
- } else {
- JSONObject toJSON = (JSONObject) JSON.toJSON(materInfo);
- //TODO:待确定
- List<SendVehicleVo> mater = materInfo.getMater();
- if (CollUtil.isEmpty(mater)) throw new BadRequestException("物料信息为空,请确认!");
- JSONObject json = new JSONObject();
- JSONArray jsonArray = new JSONArray();
- HashMap<String, Object> map = new HashMap<>();
- mater.stream().forEach(material -> {
- map.put("order_code", material.getOrder_code());
- map.put("qty", material.getMaterial_qty());
- jsonArray.add(map);
- });
- SchBasePoint schBasePoint = iSchBasePointService.selectByPointCode(materInfo.getDevice_code());
- json.put("vehicle_code", schBasePoint.getVehicle_code());
- json.put("region_code", schBasePoint.getRegion_code());
- json.put("materials", jsonArray);
- JSONObject jsonObject = wmsToConnectorService.applyRegionAndDueDate(json);
- if (ObjectUtil.isNotEmpty(jsonObject) && jsonObject.getInteger("status") == 200) {
- JSONArray data = jsonObject.getJSONArray("data");
- data.stream().forEach(material -> {
- JSONObject jsonObject1 = JSONObject.parseObject(StrUtil.toString(material));
- mater.stream().forEach(material1 -> {
- if (material1.getOrder_code().equals(jsonObject1.getString("order_code"))) {
- material1.setDue_date(jsonObject1.getString("due_date"));
- material1.setRegion_code(jsonObject1.getString("next_region_code"));
- }
- });
+ } else {*/
+ JSONObject toJSON = (JSONObject) JSON.toJSON(materInfo);
+ //TODO:待确定
+ List<SendVehicleVo> mater = materInfo.getMater();
+ if (CollUtil.isEmpty(mater)) throw new BadRequestException("物料信息为空,请确认!");
+ JSONObject json = new JSONObject();
+ JSONArray jsonArray = new JSONArray();
+ HashMap<String, Object> map = new HashMap<>();
+ mater.stream().forEach(material -> {
+ map.put("order_code", material.getOrder_code());
+ map.put("qty", material.getMaterial_qty());
+ jsonArray.add(map);
+ });
+ SchBasePoint schBasePoint = iSchBasePointService.selectByPointCode(materInfo.getDevice_code());
+ json.put("vehicle_code", schBasePoint.getVehicle_code());
+ json.put("region_code", schBasePoint.getRegion_code());
+ json.put("materials", jsonArray);
+ JSONObject jsonObject = wmsToConnectorService.applyRegionAndDueDate(json);
+ if (ObjectUtil.isNotEmpty(jsonObject) && jsonObject.getInteger("status") == 200) {
+ JSONArray data = jsonObject.getJSONArray("data");
+ data.stream().forEach(material -> {
+ JSONObject jsonObject1 = JSONObject.parseObject(StrUtil.toString(material));
+ mater.stream().forEach(material1 -> {
+ if (material1.getOrder_code().equals(jsonObject1.getString("order_code"))) {
+ material1.setDue_date(jsonObject1.getString("due_date"));
+ material1.setRegion_code(jsonObject1.getString("next_region_code"));
+ }
});
- } else if (ObjectUtil.isNotEmpty(jsonObject) && jsonObject.getInteger("status") == 400) {
- throw new BadRequestException(jsonObject.getString("msg"));
- }
- List<String> materiales = new ArrayList<>();
- mater.stream().forEach(material -> {
- materiales.add(JSONObject.toJSONString(material));
});
- toJSON.put("material_info", materiales);
- toJSON.put("vehicle_code", schBasePoint.getVehicle_code());
+ } else if (ObjectUtil.isNotEmpty(jsonObject) && jsonObject.getInteger("status") == 400) {
+ throw new BadRequestException(jsonObject.getString("msg"));
+ }
+ List<String> materiales = new ArrayList<>();
+ mater.stream().forEach(material -> {
+ materiales.add(JSONObject.toJSONString(material));
+ });
+ toJSON.put("material_info", materiales);
+ toJSON.put("vehicle_code", schBasePoint.getVehicle_code());
+ if ("1".equals(materInfo.getPoint_code())) {
toJSON.put("region_code", StrUtil.isNotEmpty(mater.get(0).getRegion_code()) ? mater.get(0).getRegion_code() : schBasePoint.getRegion_code());
- fabService.createAgvTask(toJSON, "smt");
- return new ResponseEntity(TableDataInfo.build(), HttpStatus.OK);
+ } else if ("2".equals(materInfo.getPoint_code())) {
+ toJSON.put("region_code", RegionEnum.NBJG.getRegion_code());
+ } else if ("3".equals(materInfo.getPoint_code())) {
+ toJSON.put("region_code", RegionEnum.WXJG.getRegion_code());
}
+
+ fabService.createAgvTask(toJSON, "smt");
+ return new ResponseEntity(TableDataInfo.build(), HttpStatus.OK);
+ /* }*/
}
//TODO: 根据物料查主盘信息; 当前工序查所有物料 ->
@@ -283,7 +290,7 @@ public class FabController {
keys.add(item);
});
List<JSONObject> jsonObjectList = new ArrayList<>();
- list.stream().forEach(item -> {
+ keys.stream().forEach(item -> {
JSONObject jsonObject = new JSONObject();
jsonObject.put("order_code", item);
jsonObjectList.add(jsonObject);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dao/mapper/FabRequestMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dao/mapper/FabRequestMapper.java
index 8b615b6..61bbe43 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dao/mapper/FabRequestMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dao/mapper/FabRequestMapper.java
@@ -14,17 +14,17 @@ import java.util.Map;
public interface FabRequestMapper {
- @DS("sqlserver")
- List<Map> sqlServerConnectionDemo();
+ /*@DS("sqlserver")
+ List<Map> sqlServerConnectionDemo();*/
/**
* 根据工序查看FAb的订单列表
* @param regionCode
* @return
*/
- @DS("sqlserver")
+ /*@DS("sqlserver")
List<FabConsumptionDo> getMWorkOrderInfos(@Param("regionCode") String regionCode);
@DS("sqlserver")
- List<OrderMater> selectCraftByOrderCode(List<String> orders);
+ List<OrderMater> selectCraftByOrderCode(List<String> orders);*/
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendMaterVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendMaterVo.java
index ae35c5d..8d553c5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendMaterVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendMaterVo.java
@@ -51,4 +51,6 @@ public class SendMaterVo {
List<SendVehicleVo> mater;
+ public String point_code;
+
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/impl/FabServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/impl/FabServiceImpl.java
index 7bc7233..33fcb27 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/impl/FabServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/impl/FabServiceImpl.java
@@ -74,7 +74,7 @@ public class FabServiceImpl {
// for (SchBaseVehiclematerialgroup schBaseVehiclematerialgroup : list) {
//
// }
- List<OrderMater> orderMaters = fabRequestMapper.selectCraftByOrderCode(orders);
+// List<OrderMater> orderMaters = fabRequestMapper.selectCraftByOrderCode(orders);
}
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java
index 0084a48..0928cdd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java
@@ -124,14 +124,14 @@ public class HandheldServiceImpl implements HandheldService {
if (vehicle.contains(",")) {
vehicle_list = vehicle.split(",");
}
- if(CollUtil.isEmpty(Arrays.asList(vehicle_list))){
+ if (CollUtil.isEmpty(Arrays.asList(vehicle_list))) {
MdBaseVehicle mdBaseVehicle = iMdBaseVehicleService.selectByVehicleCode(vehicle);
if (ObjectUtil.isEmpty(mdBaseVehicle)) throw new BadRequestException("载具不存在!");
if (!mdBaseVehicle.getVehicle_type().equals(VehicleTypeEnum.RACKS_S04.getVehicleCode())
- && !mdBaseVehicle.getVehicle_type().equals(VehicleTypeEnum.RACKS_S06.getVehicleCode())){
+ && !mdBaseVehicle.getVehicle_type().equals(VehicleTypeEnum.RACKS_S06.getVehicleCode())) {
throw new BadRequestException("托盘类型不匹配,,生成搬运任务失败!");
}
- }else {
+ } else {
String[] finalVehicle_list = vehicle_list;
MdBaseVehicle mdBaseVehicle = iMdBaseVehicleService.selectByVehicleCode(vehicle_list[0]);
if (ObjectUtil.isEmpty(mdBaseVehicle)) throw new BadRequestException("载具不存在!");
@@ -231,7 +231,7 @@ public class HandheldServiceImpl implements HandheldService {
jsonArray.add(map);
});
json.put("vehicle_code", vehicle_code);
- json.put("region_code", region_code);
+ json.put("region_code", schBasePoint.getRegion_code());
json.put("materials", jsonArray);
JSONObject json1 = wmsToConnectorService.applyRegionAndDueDate(json);
if (ObjectUtil.isNotEmpty(json1) && json1.getInteger("status") == 200) {
@@ -248,10 +248,10 @@ public class HandheldServiceImpl implements HandheldService {
});
});
region_code = JSONObject.parseObject(StrUtil.toString(date.get(0))).getString("region_code");
+ jo.put("region_code", region_code);
} else if (ObjectUtil.isNotEmpty(json1)) {
throw new BadRequestException(json1.getString("msg"));
}
- jo.put("region_code", region_code);
} else {
jo.put("region_code", region_code);
}
@@ -259,7 +259,6 @@ public class HandheldServiceImpl implements HandheldService {
jo.put("config_code", "BLANKINGTask");
jo.put("create_mode", GeneralDefinition.AUTO_CREATION);
jo.put("vehicle_code", vehicle_code);
- jo.put("region_code", region_code);
jo.put("ext_data", param);
iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class)
.eq(SchBasePoint::getPoint_code, device_code)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index d847981..62c6201 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -390,6 +390,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
.eq(SchBasePoint::getIs_lock, false)
.eq(SchBasePoint::getIs_used, true)
.eq(SchBasePoint::getPoint_status, pointStatus)
+ .eq(SchBasePoint::getPoint_type, "1")
.eq(StrUtil.isNotBlank(vehicle_type),SchBasePoint::getCan_vehicle_type, vehicle_type)
.isNull(seq == 2, SchBasePoint::getVehicles)
.isNull(seq == 1, SchBasePoint::getVehicle_code)
@@ -421,10 +422,18 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
.orderByDesc(SchBasePoint::getIn_order_seq));
if (CollUtil.isNotEmpty(schBasePoints) && schBasePoints.size() > 0) {
SchBasePoint schBasePoint = schBasePoints.get(0);
- Gson gson = new Gson();
+ /*Gson gson = new Gson();
Type setType = new TypeToken<List<String>>() {
- }.getType();
- List<String> msg = gson.fromJson(schBasePoint.getVehicles(), setType);
+ }.getType();*/
+ List<String> msg = new ArrayList<>();
+ String vehicles = schBasePoint.getVehicles();
+ boolean contains = vehicles.contains(",");
+ if(contains){
+ String[] split = vehicles.split(",");
+ msg = Arrays.asList(split);
+ }else{
+ msg.add(vehicles);
+ }
Integer vehicle_qty = schBasePoint.getVehicle_qty();
if (vehicle_qty != msg.size()) throw new BadRequestException("载具数量与载具编码数量不一致!");
String s = msg.get(msg.size() - 1);
@@ -438,7 +447,13 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
.set(SchBasePoint::getPoint_status, GoodsEnum.OUT_OF_STOCK.getValue())
.set(SchBasePoint::getVehicles, null));
}
- SchBasePoint schBasePoint1 = selectByPointCode(schBasePoint.getPoint_code() + "_" + (vehicle_qty - 1));
+ SchBasePoint schBasePoint1 = null;
+ if(vehicle_qty == 1){
+ schBasePoint1 = selectByPointCode(schBasePoint.getPoint_code());
+ }else{
+ schBasePoint1 = selectByPointCode(schBasePoint.getPoint_code() + "_" + (vehicle_qty - 1));
+ }
+ if(ObjectUtil.isEmpty(schBasePoint1)) throw new BadRequestException("该货位不存在!");
schBasePoint1.setVehicle_code(s);
return schBasePoint1;
}
@@ -508,7 +523,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
//查询满足条件的站点
List<SchBasePoint> schBasePoints = pointMapper.selectList(Wrappers.lambdaQuery(SchBasePoint.class).eq(SchBasePoint::getIs_lock, false).
isNotNull(SchBasePoint::getVehicle_code)
- .eq(SchBasePoint::getRegion_code, region_code)
+ .eq(StrUtil.isNotEmpty(region_code),SchBasePoint::getRegion_code, region_code)
.eq(SchBasePoint::getPoint_status, GoodsEnum.EMPTY_PALLETS.getValue())
.in(SchBasePoint::getCan_vehicle_type, vehicleType)
.eq(SchBasePoint::getIs_used, true));
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/ConnectorUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/ConnectorUtil.java
index f4fc4a6..1fc5020 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/ConnectorUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/ConnectorUtil.java
@@ -90,7 +90,7 @@ public class ConnectorUtil {
return AcsResponse.requestRefuse("未连接Connector!");
}
String url = connectorUrl + api;
- log.info("向connector申请物料下道工序和交期时间:{},接口路径:{}", JSON.toJSONString(object),url);
+ log.info("反馈connector到达取货点的请求参数参数为:{},url:{}", JSON.toJSONString(object),url);
AcsResponse resultForAcs;
try {
String resultMsg = HttpRequest.post(url)
@@ -182,7 +182,7 @@ public class ConnectorUtil {
.body(JSON.toJSONString(object))
.execute().body();
result = JSONObject.parseObject(resultMsg);
- log.info("反馈connector到达取货点的响应参数为:{}", result);
+ log.info("向connector申请物料下道工序和交期时间的响应参数:{}", result);
} catch (Exception e) {
String msg = e.getMessage();
//网络不通
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/CNTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/CNTTask.java
index 41bb52e..9735443 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/CNTTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/CNTTask.java
@@ -60,16 +60,16 @@ public class CNTTask extends AbstractTask {
Integer suffix2 = getNumericSuffix(s2.getPoint_code1());
return suffix1.compareTo(suffix2);
};
- tasks.stream().sorted(numericSuffixComparator).collect(Collectors.toList());
- for (SchBaseTask task : tasks) {
+ List<SchBaseTask> collect = tasks.stream().sorted(numericSuffixComparator).collect(Collectors.toList());
+ for (SchBaseTask task : collect) {
TaskUtils.setUpdateByAcs(task);
// 找起点
SchBasePoint schBasePoint = null;
if (TaskType.CARRY_TASK.getValue().equals(task.getTask_type())) {
- schBasePoint = schBasePointService.selectByRegionCode(RegionEnum.TRUBEND_SHELVES_3_1_1.getRegion_code(), task.getVehicle_code(),"1");
- } else if (TaskType.REASSIGN_TASK.getValue().equals(task.getTask_type())) {
- schBasePoint = schBasePointService.selectByReassign(RegionEnum.TRUBEND_SHELVES_3_1_1.getRegion_code(), task.getVehicle_code());
- }
+ schBasePoint = schBasePointService.selectByRegionCode(RegionEnum.LAG_ROBOT_BEANDING_CELL.getRegion_code(), task.getVehicle_code(),"1");
+ }/* else if (TaskType.REASSIGN_TASK.getValue().equals(task.getTask_type())) {
+ schBasePoint = schBasePointService.selectByReassign(RegionEnum.LAG_ROBOT_BEANDING_CELL.getRegion_code(), task.getVehicle_code());
+ }*/
if (ObjectUtil.isEmpty(schBasePoint)) {
task.setRemark("未找到所需点位!");
taskService.updateById(task);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java
index 8d4f939..52ac7db 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java
@@ -58,7 +58,7 @@ public class FTGTask extends AbstractTask {
String requestParam = task.getRequest_param();
JSONObject jsonObject = JSONObject.parseObject(requestParam);
// 查找空载具点位
- SchBasePoint schBasePoint = schBasePointService.selectEmpVehicleByRegionCode(RegionEnum.TRUBEND_SHELVES_3_1_1.getRegion_code(),task.getVehicle_type());
+ SchBasePoint schBasePoint = schBasePointService.selectEmpVehicleByRegionCode(null,task.getVehicle_type());
if (ObjectUtil.isEmpty(schBasePoint)) {
task.setRemark("未找到所需点位!");
taskService.updateById(task);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingSMTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingSMTTask.java
index 5db2ae4..5ebf383 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingSMTTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingSMTTask.java
@@ -2,6 +2,7 @@ package org.nl.wms.sch.task_manage.task.tasks.sorting;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -68,8 +69,12 @@ public class SortingSMTTask extends AbstractTask {
// 找起点
String requestParam = task.getRequest_param();
JSONObject jsonObject = JSONObject.parseObject(requestParam);
+ JSONArray pallet_detail = jsonObject.getJSONArray("pallet_detail");
+ JSONObject jsonObject1 = JSONObject.parseObject(StrUtil.toString(pallet_detail.get(0)));
+ String regionCode = StrUtil.isEmpty(jsonObject1.getString("NextOperation")) ?
+ RegionEnum.LAG_ROBOT_BEANDING_CELL.getRegion_code() : jsonObject1.getString("NextOperation");
// 根据对接位查找对应的载具类型
- SchBasePoint schBasePoint = schBasePointService.selectByRegionCode(RegionEnum.ZDFJ.getRegion_code(),task.getVehicle_code(),"1");
+ SchBasePoint schBasePoint = schBasePointService.selectByRegionCode(regionCode, task.getVehicle_code(), "1");
if (ObjectUtil.isEmpty(schBasePoint)) {
task.setRemark("未找到所需点位!");
taskService.updateById(task);
@@ -81,9 +86,8 @@ public class SortingSMTTask extends AbstractTask {
jsonObject.put("vehicle_type", schBasePoint.getCan_vehicle_type());
schBaseVehiclematerialgroupService.remove(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class)
.eq(SchBaseVehiclematerialgroup::getVehicle_code, task.getVehicle_code()));
- JSONArray pallet_detail = jsonObject.getJSONArray("pallet_detail");
for (Object o : pallet_detail) {
- JSONObject jO = (JSONObject)JSONObject.toJSON(o);
+ JSONObject jO = (JSONObject) JSONObject.toJSON(o);
String workorder = jO.getString("ProductionOrder");
String ProductID = jO.getString("ProductID");
Integer qty = jO.getInteger("Currentqty");
@@ -114,7 +118,7 @@ public class SortingSMTTask extends AbstractTask {
}
}
- private Long getTime(String dateString){
+ private Long getTime(String dateString) {
String pattern = "yyyy-MM-dd HH:mm:ss";
java.util.Date date = DateUtil.parse(dateString, pattern);
long timestamp = date.getTime();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingSNTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingSNTTask.java
index 3995b07..4c2556b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingSNTTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingSNTTask.java
@@ -69,7 +69,7 @@ public class SortingSNTTask extends AbstractTask {
String requestParam = task.getRequest_param();
JSONObject jsonObject = JSONObject.parseObject(requestParam);
// 根据对接位查找对应的载具类型
- SchBasePoint schBasePoint = schBasePointService.selectByRegionCode(RegionEnum.ZDFJ.getRegion_code(),task.getVehicle_code(),"0");
+ SchBasePoint schBasePoint = schBasePointService.selectByRegionCode(RegionEnum.LAG_ROBOT_BEANDING_CELL.getRegion_code(),task.getVehicle_code(),"0");
if(ObjectUtil.isEmpty(schBasePoint)) continue;
jsonObject.put("vehicle_type", schBasePoint.getCan_vehicle_type());
if (ObjectUtil.isEmpty(schBasePoint)) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingTwoCNTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingTwoCNTTask.java
index c5d03d6..2c7f261 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingTwoCNTTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/sorting/SortingTwoCNTTask.java
@@ -73,6 +73,7 @@ public class SortingTwoCNTTask extends AbstractTask {
task.setTask_status(TaskStatus.CREATED.getCode());
task.setPoint_code1(basePoint.getPoint_code());
task.setVehicle_code(basePoint.getVehicle_code());
+ task.setRemark(" ");
taskService.update(task);
schBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class)
.eq(SchBasePoint::getPoint_code,basePoint.getPoint_code())
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 29d6ded..0149e4d 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -227,12 +227,12 @@
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
@click="doOperate(scope.row, 'a')"
>完成</el-button>
- <el-button
+ <!-- <el-button
type="text"
icon="el-icon-error"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
@click="doOperate(scope.row, 's')"
- >任务调度</el-button>
+ >任务调度</el-button> -->
</template>
</el-table-column>
</el-table>