rev:海柔业务

wcs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java

@@ -33,7 +33,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
     private final ParamService paramService;
     private Map<String, AgvDto> AGVDeviceStatus = new HashMap();
 
-    @LokiLog(type = LokiLogType.AGV)
+    //@LokiLog(type = LokiLogType.AGV)
     @Override
     public void deleteAgvInstToNDC(Instruction inst) throws Exception {
         if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) {
@@ -66,7 +66,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
 
     }
 
-    @LokiLog(type = LokiLogType.AGV)
+    //@LokiLog(type = LokiLogType.AGV)
     @Override
     public void deleteAgvOneInstToNDC(Instruction inst) throws Exception {
         if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) {
@@ -99,7 +99,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
 
     }
 
-    @LokiLog(type = LokiLogType.AGV)
+    //@LokiLog(type = LokiLogType.AGV)
     @Override
     public void sendAgvInstToNDC(String agv_system_type, Instruction inst) {
         if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) {
@@ -357,7 +357,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
     }
 
 
-    @LokiLog(type = LokiLogType.AGV)
+    //@LokiLog(type = LokiLogType.AGV)
     @Override
     public Map<String, AgvDto> findAllAgvFromCache() {
         return AGVDeviceStatus;

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_hr_ssx/HailiangHrSsxDeviceDriver.java

@@ -14,6 +14,9 @@ import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.IssuedDeviceOrderInfo;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.ext.wms.liKuData.Resp;
+import org.nl.acs.ext.wms.liKuData.a.ContainerArrivedRequest;
+import org.nl.acs.ext.wms.liKuData.a.NodeStates;
 import org.nl.acs.ext.wms.service.AcsToLiKuService;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.LiKuToAcsService;
@@ -35,6 +38,7 @@ import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -82,6 +86,10 @@ public class HailiangHrSsxDeviceDriver extends AbstractOpcDeviceDriver implement
     private int instruction_finished_time_out;
     String device_code = null;
 
+    private long lastReadTime = System.currentTimeMillis();
+    private long lastReportTime = System.currentTimeMillis();
+    private long lastHasContainerTime = System.currentTimeMillis();
+
     @Override
     public Device getDevice() {
         return this.device;
@@ -102,33 +110,15 @@ public class HailiangHrSsxDeviceDriver extends AbstractOpcDeviceDriver implement
             if (move != last_move) {
                 message = null;
                 requireSucess = false;
-                if (move == 1 && barcode.length() > 0) {
+                if (last_move == 1 && move == 0) {
-                    TaskDto vehicle_dto = taskServer.findByContainer(barcode);
+                    this.lastHasContainerTime = System.currentTimeMillis();
-                    if (vehicle_dto == null) {
+                }
-                        instruction_require_time = new Date();
+                if (move == 1 && barcode.length() > 0 && !requireSucess) {
+                    String containerArrived = ObjectUtil.isEmpty(this.getDevice().getExtraValue().get("containerArrived")) ? "false" : this.getDevice().getExtraValue().get("apply_task").toString();
+                    if ("true".equals(containerArrived)) {
+                        this.containerArrived();
                     }
                 }
-
-
-//                if(move ==0 && barcode.length()>0 && !requireSucess ){
-//                    ContainerArrivedRequest containerArrivedRequest = new ContainerArrivedRequest();
-//                    NodeStates nodeStates = new NodeStates();
-//                    containerArrivedRequest.setSlotCode(device_code);
-//                    containerArrivedRequest.setContainerCode(barcode);
-//                    Date date = new Date();
-//                    SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
-//                    nodeStates.setLastHasContainerTime(Long.parseLong(dateFormat.format(date)));
-//                    nodeStates.setLastReadTime(Long.parseLong(dateFormat.format(date)));
-//                    nodeStates.setLastReportTime(Long.parseLong(dateFormat.format(date)));
-//                    Resp<JSONObject> containerArrivedResp=acsToLiKuService.containerArrived(containerArrivedRequest);
-//                    JSONObject response1=JSONObject.parseObject(String.valueOf(containerArrivedResp));
-//                    int code=response1.getInteger("code");
-//                    String msg=response1.getString("msg");
-//                    if(code == 0) {
-//                        log.info("请求成功 请求结果{}", code,msg);
-//                        requireSucess = true;
-//                    }
-//                }
             }
             if (error != last_error) {
                 if (error != 0) {
@@ -169,7 +159,7 @@ public class HailiangHrSsxDeviceDriver extends AbstractOpcDeviceDriver implement
 
 
     /**
-     * 申请出空框任务
+     * 申请出空框任务 acs->lms
      */
     public void applyEmptyTask() {
         JSONObject reqParam = new JSONObject();
@@ -184,6 +174,36 @@ public class HailiangHrSsxDeviceDriver extends AbstractOpcDeviceDriver implement
         }
     }
 
+    /**
+     * 容器到达通知 acs->ess
+     *
+     * @return
+     */
+    public void containerArrived() throws Exception {
+        TaskDto vehicle_dto = taskServer.findByContainer(barcode);
+        if (vehicle_dto == null) {
+            instruction_require_time = new Date();
+            ContainerArrivedRequest containerArrivedRequest = new ContainerArrivedRequest();
+            NodeStates nodeStates = new NodeStates();
+            containerArrivedRequest.setSlotCode(device_code);
+            containerArrivedRequest.setContainerCode(barcode);
+            Date date = new Date();
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+            nodeStates.setLastHasContainerTime(Long.parseLong(dateFormat.format(date)));
+            nodeStates.setLastReadTime(Long.parseLong(dateFormat.format(date)));
+            nodeStates.setLastReportTime(Long.parseLong(dateFormat.format(date)));
+            Resp<JSONObject> containerArrivedResp = acsToLiKuService.containerArrived(containerArrivedRequest);
+            JSONObject response = JSONObject.parseObject(String.valueOf(containerArrivedResp));
+            int code = response.getInteger("code");
+            String msg = response.getString("msg");
+            if (code == 0) {
+                requireSucess = true;
+                this.setLastReportTime(System.currentTimeMillis());
+                log.info("请求成功 请求结果{}", code, msg);
+            }
+        }
+    }
+
 
     @Override
     public JSONObject getDeviceStatusName() {

wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/AcsUtil.java

@@ -20,33 +20,31 @@ import org.nl.modules.wql.util.SpringContextHolder;
 @Slf4j
 public class AcsUtil {
 
-
-    @LokiLog(type = LokiLogType.ACS_TO_LK)
     public static <W> String notifyAcs(String api, W requestParam) {
-        DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);;
         ParamService paramService = SpringContextHolder.getBean(ParamServiceImpl.class);
         //判断是否连接立库WCS系统
         String isConnect = paramService.findByCode("is_connect_liKu_Wcs").getValue();
         if (StrUtil.equals("0", isConnect)) {
+            log.info("ACS请求ESS,请求路径:{},参数配置表中-is_connect_liKu_Wcs为:0", api);
             throw new BadRequestException("参数配置表中-is_connect_liKu_Wcs为:0");
         }
+        log.info("ACS请求ESS,请求路径:{},请求参数:{}", api, JSON.toJSONString(requestParam));
         String liKu_wcs_url = paramService.findByCode("liKu_wcs_url").getValue();
         try {
-            logServer.extLog(LokiLogType.ACS_TO_LK.name(),"下发立库任务请求参数:{}"+JSON.toJSONString(requestParam) );
-            log.info("下发立库任务请求参数:{}", JSON.toJSONString(requestParam));
             String body = HttpRequest
-                    .post(liKu_wcs_url + api).setConnectionTimeout(3000)
+                    .post(liKu_wcs_url + api)
+                    .setConnectionTimeout(5000)
                     .body(JSON.toJSONString(requestParam))
                     .execute()
                     .body();
-            log.info("下发立库任务返回参数:{}", body);
+            log.info("ACS请求ESS,请求路径:{},响应参数:{}", api, body);
             return body;
         } catch (Exception e) {
             JSONObject result = new JSONObject();
-            result.put("result", "false");
             result.put("code", "1");
-            result.put("comment", e.getMessage());
+            result.put("msg", e.getMessage());
-            log.info("下发立库任务异常返回参数:{}", String.valueOf(result));
+            result.put("data", new JSONObject());
+            log.error("ACS请求ESS,请求路径:{},响应参数:{}", api, result.toString());
             return String.valueOf(result);
         }
     }

wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/Resp.java

@@ -13,25 +13,20 @@ public class Resp<T> {
     /**
      * 成功返回true，失败返回false
      */
-    public String result;
+    private String result;
 
     /**
      * 错误码（0表示成功）1代表入库目的位置有货，其他更多情况待定
      */
-    public String code;
+    private String code;
-
-    /**
-     * 错误信息，如果成功则为null
-     */
-    public String comment;
 
     /**
      * 报文携带的数据
      */
-    public T data;
+    private T data;
     /**
      * 成功返回true，失败返回false
      */
-    public String msg;
+    private String msg;
 
 }

wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/a/QueryNodeReaderRequest.java

@@ -1,5 +1,8 @@
 package org.nl.acs.ext.wms.liKuData.a;
 
+import lombok.Data;
+
+@Data
 public class QueryNodeReaderRequest {
     public String slotCode;
 }

wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java

@@ -28,94 +28,38 @@ public class AcsToLiKuServiceImpl implements AcsToLiKuService {
 
     private final AddressService addressService;
 
-    private String log_file_type = "log_file_type";
-    private String log_type = "ACS请求立库";
-
-
     @Override
     public Resp<JSONObject> containerArrived(ContainerArrivedRequest requestParam) throws Exception {
-        try {
-            MDC.put(log_file_type, log_type);
-            log.info("containerArrivedRequest-----输入参数{}", JSON.toJSONString(requestParam));
         String api = addressService.findByCode("containerArrived").getMethods_url();
         String result = AcsUtil.notifyAcs(api, requestParam);
-            log.info("containerArrivedRequest-----输出参数{}", result);
         return RespUtil.getResp(result, new JSONObject());
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 
     @Override
     public Resp<CreateResponse> create(CreateRequest requestParam) throws Exception {
-        try {
-            MDC.put(log_file_type, log_type);
-            log.info("CreateRequest-----输入参数{}", JSON.toJSONString(requestParam));
         String api = addressService.findByCode("createLikuTask").getMethods_url();
         String result = AcsUtil.notifyAcs(api, requestParam);
-            log.info("CreateRequest-----输出参数{}", result);
         return RespUtil.getResp(result, new CreateResponse());
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 
     @Override
     public Resp<CancelResponse> cancel(CancelRequest requestParam) throws Exception {
-        try {
-            MDC.put(log_file_type, log_type);
-            log.info("CancelRequest-----输入参数{}", JSON.toJSONString(requestParam));
         String api = addressService.findByCode("cancelLikuTask").getMethods_url();
         String result = AcsUtil.notifyAcs(api, requestParam);
-            log.info("CancelRequest-----输出参数{}", result);
         return RespUtil.getResp(result, new CancelResponse());
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 
     @Override
     public Resp<JSONObject> robotQuery(RobotQueryRequest requestParam) throws Exception {
-        try {
-            MDC.put(log_file_type, log_type);
-            log.info("RobotQueryRequest-----输入参数{}", JSON.toJSONString(requestParam));
         String api = addressService.findByCode("robotQuery").getMethods_url();
         String result = AcsUtil.notifyAcs(api, requestParam);
-//            String result="{\"code\":0,\"msg\":\"success\",\"data\":{\"robots\":[{\"robotCode\":\"AGVLK\",\"robotTypeCode\":\"RT_KUBOT\",\"pointCode\":\"POINT:1280:5070\",\"positionX\":1283,\"positionY\":5057,\"theta\":269,\"forkHeight\":679,\"forkLength\":4,\"forkTheta\":1,\"stationCode\":\"1\",\"locationCode\":\"LT_CONVEYOR_OUTPUT:POINT:1280:5070\",\"state\":\"IDLE\",\"hardwareState\":\" ROBOT_IDLE \",\"trays\":[{\"trayLevel\":0,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#0\"},{\"trayLevel\":1,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#1\"},{\"trayLevel\":2,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#2\"},{\"trayLevel\":3,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#3\"},{\"trayLevel\":4,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#4\"},{\"trayLevel\":64,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#64\"}]}]}}";
-            log.info("RobotQueryRequest-----输出参数{}", result);
-
         return RespUtil.getResp(result, new JSONObject());
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 
     @Override
     public Resp<LocationQueryResponse> locationQuery(LocationQueryRequest requestParam) throws Exception {
-        try {
-            MDC.put(log_file_type, log_type);
-            log.info("LocationQueryRequest-----输入参数{}", JSON.toJSONString(requestParam));
         String api = addressService.findByCode("locationQuery").getMethods_url();
         String result = AcsUtil.notifyAcs(api, requestParam);
-            log.info("LocationQueryRequest-----输出参数{}", result);
         return RespUtil.getResp(result, new LocationQueryResponse());
-        } finally {
-            MDC.remove(log_file_type);
-        }
-    }
-
-
-    public static void main(String[] args) {
-        JSONObject jo = new JSONObject();
-        jo.put("code", 0);
-        jo.put("msg", "111");
-
-        UnloadContainerReqResponse unloadContainerReqResponse = new UnloadContainerReqResponse();
-        unloadContainerReqResponse.setAllow(false);
-        JSONObject result = new JSONObject();
-        result.put("code", "0");
-        result.put("msg", "success");
-        result.put("data", unloadContainerReqResponse);
-        log.info("放容器请求-----输出参数{}", JSON.toJSONString(result));
     }
 }

wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java

@@ -47,8 +47,6 @@ import java.util.List;
 @RequiredArgsConstructor
 @Slf4j
 public class LiKuToAcsServiceImpl implements LiKuToAcsService {
-    @Autowired
-    private AddressService addressService;
     @Autowired
     private TaskService taskService;
     @Autowired
@@ -62,11 +60,6 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
     @Autowired
     private ParamService paramService;
 
-//    DeviceAppService appService= SpringContextHolder.getBean(DeviceAppServiceImpl.class);
-
-
-    private String log_file_type = "log_file_type";
-    private String log_type = "立库请求ACS";
 
     @Override
     public JSONObject queryConveyor(QueryConveyorRequest requestParam) throws Exception {
@@ -87,11 +80,14 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
                 if (!ObjectUtil.isEmpty(device.getLocation())) {
                     nodeStates.setSlotCode(device.getDevice_code());
                 }
-                if (ObjectUtil.equals(hailiangHrSsxDeviceDriver.getMove(),"1")) {
+                if (hailiangHrSsxDeviceDriver.getMove() == 1) {
                     nodeStates.setHasContainer(true);
                 } else {
                     nodeStates.setHasContainer(false);
                 }
+                nodeStates.setLastReadTime(hailiangHrSsxDeviceDriver.getLastReadTime());
+                hailiangHrSsxDeviceDriver.setLastReadTime(System.currentTimeMillis());
+                nodeStates.setLastReportTime(hailiangHrSsxDeviceDriver.getLastReportTime());
             }
             list2.add(nodeStates);
             conveyors.setNodeStates(list2);
@@ -102,29 +98,33 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
             result.put("msg", "success");
             result.put("data", queryConveyorResponse);
         } catch (Exception e) {
+            result = new JSONObject();
             result.put("code", "1");
             result.put("msg", "fail");
-            result.put("data", new JSONObject());
+            result.put("data", e.getMessage());
-            log.info("查询输送线料箱状态--------------:输出参数{}" , JSON.toJSONString(result));
         }
         log.info("查询输送线料箱状态,响应参数:{}", JSON.toJSONString(result));
         return result;
     }
+
     @Override
     public JSONObject queryNodeReader(QueryNodeReaderRequest requestParam) throws Exception {
-        try{
         log.info("查询输送线点位状态-----输入参数{}", JSON.toJSONString(requestParam));
-            String slotCode = requestParam.slotCode;
-            QueryNodeReaderResponse queryNodeReaderResponse = new QueryNodeReaderResponse();
         JSONObject result = new JSONObject();
+        try {
+            String slotCode = requestParam.getSlotCode();
+            QueryNodeReaderResponse queryNodeReaderResponse = new QueryNodeReaderResponse();
             result.put("code", "0");
             result.put("msg", "success");
             result.put("data", queryNodeReaderResponse);
+        } catch (Exception e) {
+            result = new JSONObject();
+            result.put("code", "1");
+            result.put("msg", "fail");
+            result.put("data", e.getMessage());
+        }
         log.info("查询输送线点位状态-----输出参数{}", result);
         return result;
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 
     @Override
@@ -132,8 +132,8 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
         log.info("取容器完成通知-----输入参数{}", JSON.toJSONString(requestParam));
         JSONObject result = new JSONObject();
         try {
-            String slotCode = requestParam.slotCode;
+            String slotCode = requestParam.getSlotCode();
-            String containerCode=requestParam.containerCode;
+            String containerCode = requestParam.getContainerCode();
 //            LoadContainerFinishResponse loadContainerFinishResponse = new LoadContainerFinishResponse();
             Device device = deviceAppService.findDeviceByCode(slotCode);
             if (device != null && device.getDeviceDriver() instanceof HailiangHrSsxDeviceDriver) {
@@ -144,12 +144,16 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
                 result.put("code", "0");
                 result.put("msg", "success");
                 result.put("data", new JSONObject());
+            } else {
+                result.put("code", "0");
+                result.put("msg", "success");
+                result.put("data", new JSONObject());
             }
         } catch (Exception e) {
+            result = new JSONObject();
             result.put("code", "1");
             result.put("msg", "fail");
-            result.put("data", new JSONObject());
+            result.put("data", e.getMessage());
-            log.info("取容器完成通知--------------:输出参数{}" , JSON.toJSONString(result));
         }
         log.info("取容器完成通知-----输出参数{}", JSON.toJSONString(result));
         return result;
@@ -161,11 +165,12 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
         UnloadContainerReqResponse unloadContainerReqResponse = new UnloadContainerReqResponse();
         JSONObject result = new JSONObject();
         try {
-            String slotCode = requestParam.slotCode;
+            String slotCode = requestParam.getSlotCode();
-            String containerCode=requestParam.containerCode;
+            String containerCode = requestParam.getContainerCode();
             Device device = deviceAppService.findDeviceByCode(slotCode);
             if (device != null && device.getDeviceDriver() instanceof HailiangHrSsxDeviceDriver) {
                 HailiangHrSsxDeviceDriver hailiangHrSsxDeviceDriver = (HailiangHrSsxDeviceDriver) device.getDeviceDriver();
+                hailiangHrSsxDeviceDriver.writing("to_command", "3");
                 if (hailiangHrSsxDeviceDriver.getAction() == 2) {
                     unloadContainerReqResponse.setAllow(true);
                 } else {
@@ -176,10 +181,10 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
             result.put("msg", "success");
             result.put("data", unloadContainerReqResponse);
         } catch (Exception e) {
+            result = new JSONObject();
             result.put("code", "1");
             result.put("msg", "fail");
-            result.put("data", new JSONObject());
+            result.put("data", e.getMessage());
-            log.info("放容器请求--------------:输出参数{}" , JSON.toJSONString(result));
         }
         log.info("放容器请求-----输出参数{}", JSON.toJSONString(result));
         return result;
@@ -187,85 +192,79 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
 
     @Override
     public JSONObject unloadContainerFinish(UnloadContainerFinishRequest requestParam) throws Exception {
-        try{
         log.info("放容器完成通知-----输入参数{}", JSON.toJSONString(requestParam));
-            String slotCode = requestParam.slotCode;
-            String containerCode=requestParam.containerCode;
-            String containerAttribute=requestParam.containerAttribute;
-            UnloadContainerFinishResponse unloadContainerFinishResponse = new UnloadContainerFinishResponse();
         JSONObject result = new JSONObject();
+        try {
+            String slotCode = requestParam.getSlotCode();
+            String containerCode = requestParam.getContainerCode();
+            String containerAttribute = requestParam.getContainerAttribute();
+            UnloadContainerFinishResponse unloadContainerFinishResponse = new UnloadContainerFinishResponse();
+            Device device = deviceAppService.findDeviceByCode(slotCode);
+            if (device != null && device.getDeviceDriver() instanceof HailiangHrSsxDeviceDriver) {
+                HailiangHrSsxDeviceDriver hailiangHrSsxDeviceDriver = (HailiangHrSsxDeviceDriver) device.getDeviceDriver();
+                hailiangHrSsxDeviceDriver.writing("to_command", "4");
+            }
             JSONObject json = (JSONObject) JSONObject.toJSON(unloadContainerFinishResponse);
             result.put("code", "0");
             result.put("msg", "success");
             result.put("data", json);
+        } catch (Exception e) {
+            result = new JSONObject();
+            result.put("code", "1");
+            result.put("msg", "fail");
+            result.put("data", e.getMessage());
+        }
         log.info("放容器完成通知-----输出参数{}", result);
         return result;
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 
     @Override
     public JSONObject moveContainer(MoveContainerRequest requestParam) throws Exception {
-        try{
         log.info("容器流动请求-----输入参数{}", JSON.toJSONString(requestParam));
+        JSONObject result = new JSONObject();
+        try {
             String slotCode = requestParam.slotCode;
             String containerCode = requestParam.containerCode;
             String direction = requestParam.direction;
             MoveContainerResponse moveContainerResponse = new MoveContainerResponse();
-            JSONObject result=new JSONObject();
             JSONObject json = (JSONObject) JSONObject.toJSON(moveContainerResponse);
             result.put("code", "0");
             result.put("msg", "success");
             result.put("data", json);
+        } catch (Exception e) {
+            result = new JSONObject();
+            result.put("code", "1");
+            result.put("msg", "fail");
+            result.put("data", e.getMessage());
+        }
         log.info("容器流动请求-----输出参数{}", result);
         return result;
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 
     @Override
     public Object taskstatusreporting(TaskstatusReportingRequest requestParam) throws Exception {
-        try{
         log.info("任务状态上报-----输入参数{}", JSON.toJSONString(requestParam));
-            String inst_id = requestParam.getTaskCode();
+        JSONObject result = new JSONObject();
+        try {
+            String inst_code = requestParam.getTaskCode();
             String eventType = requestParam.getEventType();
             String status = requestParam.getStatus();
             String carNo = requestParam.getRobotCode();
-            Instruction inst = instructionService.findById(inst_id);
+            Instruction inst = instructionService.findByCodeFromCache(inst_code);
             if (ObjectUtil.isEmpty(inst)) {
                 TaskstatusReportingResponse taskstatusReportingResponse = new TaskstatusReportingResponse();
-                JSONObject result = new JSONObject();
+                result = new JSONObject();
-                result.put("result", "false");
+                result.put("code", "1");
-                result.put("code", "0");
+                result.put("msg", "未找到对应指令信息,指令号:'" + inst_code + "',指令已完成或取消");
-                result.put("comment", "未找到对应指令");
                 result.put("data", taskstatusReportingResponse);
                 log.info("任务状态上报-----输出参数{}", result);
                 return RespUtil.getResp(result.toString(), new TaskstatusReportingResponse());
             }
-            if (!StrUtil.equals(inst.getInstruction_status(),"0") && !StrUtil.equals(inst.getInstruction_status(),"1")) {
+            if (StrUtil.equals(inst.getInstruction_status(), "0")) {
-                TaskstatusReportingResponse taskstatusReportingResponse = new TaskstatusReportingResponse();
+                inst.setInstruction_status("1");
-                JSONObject result = new JSONObject();
+                inst.setCarno(carNo);
-                result.put("result", "false");
+                instructionService.update(inst);
-                result.put("code", "0");
-                result.put("comment", "未找到对应未完成的指令");
-                result.put("data", taskstatusReportingResponse );
-                log.info("任务状态上报-----输出参数{}", result);
-                return RespUtil.getResp(result.toString(), new TaskstatusReportingResponse());
             }
-            TaskDto task = taskService.findByCode(inst.getTask_code());
-            if (ObjectUtil.isEmpty(task)) {
-                TaskstatusReportingResponse taskstatusReportingResponse = new TaskstatusReportingResponse();
-                JSONObject result = new JSONObject();
-                result.put("result", "false");
-                result.put("code", "0");
-                result.put("comment", "未找到对应任务");
-                result.put("data", taskstatusReportingResponse );
-                log.info("任务状态上报-----输出参数{}", result);
-                return RespUtil.getResp(result.toString(), new TaskstatusReportingResponse());
-            }
-
             /**
              * eventType
              * task：上报任务状态
@@ -283,54 +282,30 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
              * cancel：取消
              * suspend：挂起
              */
-
-            if(StrUtil.equals(inst.getInstruction_status(),"0")){
-                inst.setInstruction_status("1");
-                inst.setCarno(carNo);
-            }
-
             if (StrUtil.equals(eventType, "task")) {
                 if (StrUtil.equals(status, "success")) {
-                    if (!StrUtil.equals(task.getTask_status(),"0") && !StrUtil.equals(task.getTask_status(),"1")) {
-                        TaskstatusReportingResponse taskstatusReportingResponse = new TaskstatusReportingResponse();
-                        JSONObject result = new JSONObject();
-                        result.put("result", "false");
-                        result.put("code", "0");
-                        result.put("comment", "未找到未完成的对应任务");
-                        result.put("data", taskstatusReportingResponse);
-                        log.info("任务状态上报-----输出参数{}", result);
-                        return RespUtil.getResp(result.toString(), new TaskstatusReportingResponse());
-                    }
                     instructionService.finish(inst.getInstruction_id());
                 } else if (StrUtil.equals(status, "fail") || StrUtil.equals(status, "cancel")) {
                     instructionService.cancel(inst.getInstruction_id());
                 } else if (StrUtil.equals(status, "suspend")) {
-
                 }
-            } else if ( StrUtil.equals(eventType,"tote_load")) {
-                inst.setExecute_code("2");
-                instructionService.update(inst);
-            } else if ( StrUtil.equals(eventType,"tote_unload")) {
-                inst.setExecute_code("4");
-                instructionService.update(inst);
             }
-
             TaskstatusReportingResponse taskstatusReportingResponse = new TaskstatusReportingResponse();
             JSONObject json = (JSONObject) JSONObject.toJSON(taskstatusReportingResponse);
-            JSONObject result = new JSONObject();
             result.put("code", "0");
             result.put("msg", "success");
             result.put("data", json);
+        } catch (Exception e) {
+            result.put("code", "1");
+            result.put("msg", "fail");
+            result.put("data", e.getMessage());
+        }
         log.info("任务状态上报反馈-----输出参数{}", result);
         return result;
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 
     @Override
     public JSONObject abnormalreporting(AbnormarReportingRequest requestParam) throws Exception {
-        try{
         log.info("异常上报-----输入参数{}", JSON.toJSONString(requestParam));
         String eventType = requestParam.getEventType();
         String barcode = requestParam.getContainerCode();
@@ -384,20 +359,6 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
                     }
                 }
             }
-//                if (StrUtil.equals(message,"TRY_ACTION_LOCATION_NOT_LOADING_CONTAINER")){
-//                    // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS
-//                    String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue();
-//                    if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
-//                        JSONObject reqParam = new JSONObject();
-//                        reqParam.put("task_id", dto.getExt_task_id());
-//                        reqParam.put("status", StatusEnum.TASK_EMPTY_OUT.getCode());
-//
-//                        HttpResponse httpResponse = acsToWmsService.washTask(reqParam);
-//                        if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
-//                            log.info("反馈LMS半成品库任务状态成功");
-//                        }
-//                    }
-//                }
 
             if (StrUtil.equals(message, "TRY_ACTION_LOCATION_CONTAINER_NOT_SAME_WITH_TASK") || StrUtil.equals(message, "NO_CONTAINER_CODE")) {
                 // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS
@@ -425,9 +386,6 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
         result.put("data", json);
         log.info("异常上报-----输出参数{}", result);
         return result;
-        } finally {
-            MDC.remove(log_file_type);
-        }
     }
 }
 

wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -372,7 +372,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
 
                         AGVTask agvTask1 = new AGVTask();
                         agvTask1.setTaskDescribe(inTaskDescribe);
-                        agvTask1.setTaskCode(dto.getTask_id());
+                        agvTask1.setTaskCode(dto.getInstruction_code());
                         agvTask1.setTaskPriority(dto.getPriority());
 
                         list.add(agvTask1);
@@ -388,7 +388,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
 
                         AGVTask agvTask = new AGVTask();
                         agvTask.setTaskDescribe(outTaskDescribe);
-                        agvTask.setTaskCode(dto.getTask_id());
+                        agvTask.setTaskCode(dto.getInstruction_code());
                         agvTask.setTaskPriority(dto.getPriority());
                         list.add(agvTask);
                         createRequest.setTasks(list);
@@ -403,7 +403,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
 
                         AGVTask agvTask2 = new AGVTask();
                         agvTask2.setTaskDescribe(relocationTaskDescribe);
-                        agvTask2.setTaskCode(dto.getTask_id());
+                        agvTask2.setTaskCode(dto.getInstruction_code());
                         agvTask2.setTaskPriority(dto.getPriority());
 
                         list.add(agvTask2);
@@ -421,7 +421,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
 
                         AGVTask agvTask4 = new AGVTask();
                         agvTask4.setTaskDescribe(carryTaskDescribe);
-                        agvTask4.setTaskCode(dto.getTask_id());
+                        agvTask4.setTaskCode(dto.getInstruction_code());
                         agvTask4.setTaskPriority(dto.getPriority());
 
                         list.add(agvTask4);
@@ -436,7 +436,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                         checkTaskDescribe.setCheckType("scan");
                         AGVTask agvTask3 = new AGVTask();
                         agvTask3.setTaskDescribe(checkTaskDescribe);
-                        agvTask3.setTaskCode(dto.getTask_id());
+                        agvTask3.setTaskCode(dto.getInstruction_code());
                         agvTask3.setTaskPriority(dto.getPriority());
 
                         list.add(agvTask3);
@@ -1072,7 +1072,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         if (flag) {
             if (StrUtil.equals(entity.getInstruction_type(), AgvTypeEnum.HAIROU_TYPE_1.getTaskType())) {
                 CancelRequest cancelRequest = new CancelRequest();
-                cancelRequest.setTaskCodes(new ArrayList<String>(Collections.singleton(entity.getInstruction_id())));
+                cancelRequest.setTaskCodes(new ArrayList<String>(Collections.singleton(entity.getInstruction_code())));
                 acsToLiKuService.cancel(cancelRequest);
             }
             String currentUsername = SecurityUtils.getCurrentUsername();

wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateAgvOneInst.java

@@ -32,7 +32,7 @@ public class AutoCreateAgvOneInst {
      * @throws Exception
      */
     public void run() throws Exception {
-        List<TaskDto> list = taskService.queryAll("task_status = '0' and agv_system_type = '2' ");
+        List<TaskDto> list = taskService.queryAll("task_status = '0' and agv_system_type = '2' or agv_system_type = '3'");
         for (int i = 0; i < list.size(); i++) {
             TaskDto taskDto = list.get(i);
             String link_no = CodeUtil.getNewCode("LINK_NO");

wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryRobot.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /*
@@ -35,10 +36,9 @@ public class QueryRobot {
 
     public void run() throws Exception {
         RobotQueryRequest robotQueryRequest = new RobotQueryRequest();
-        HashMap map = new HashMap();
+        Map<String, List<String>> map = new HashMap();
-        List list = new ArrayList();
+        List<String> list = new ArrayList();
         List<Device> devices = deviceAppService.findDevice(DeviceType.agv);
-
         for (int i = 0; i < devices.size(); i++) {
             if (devices.get(i).getDeviceDriver() instanceof LiKuDeviceDriver) {
                 list.add(devices.get(i).getDevice_code());

wcs/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java

@@ -32,7 +32,7 @@ public class ParamController {
 
     private final ParamService paramService;
 
-    @LokiLog
+    //@LokiLog
     @GetMapping
     @Log("查询系统参数")
     @ApiOperation("查询系统参数")

wcs/nladmin-system/src/main/resources/config/application-dev.yml

@@ -13,7 +13,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       #      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       #     url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_acs_old}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
       #      password: ${DB_PWD:P@ssw0rd}
       #     password: ${DB_PWD:Root.123456}
@@ -164,6 +164,6 @@ sa-token:
   # token 前缀
   token-prefix: Bearer
 
-loki:
+#loki:
-  url: http://10.211.55.3:3100/loki/api/v1
+#  url: http://10.211.55.3:3100/loki/api/v1
-  systemName: acs
+#  systemName: acs

wcs/nladmin-system/src/main/resources/config/application-prod.yml

@@ -11,7 +11,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_acs_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_old_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数
@@ -166,6 +166,6 @@ sa-token:
   # token 前缀
   token-prefix: Bearer
 
-loki:
+#loki:
-  url: http://localhost:3100/loki/api/v1
+#  url: http://localhost:3100/loki/api/v1
-  systemName: acs
+#  systemName: acs

wcs/nladmin-system/src/main/resources/log/AcsToLk.xml

@@ -3,14 +3,14 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!-- 按照每天生成日志文件 -->
-    <appender name="AcsToLiKuServiceImpl" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="AcsUtil" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
             <FileNamePattern>${LOG_HOME}/ACS请求立库/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>100MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
@@ -23,11 +23,11 @@
     </appender>
 
     <appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="AcsToLiKuServiceImpl" />
+        <appender-ref ref="AcsUtil"/>
         <!-- 设置队列大小，根据您的需求调整 -->
         <queueSize>512</queueSize>
     </appender>
-    <logger name="org.nl.acs.ext.wms.service.impl.AcsToLiKuServiceImpl" level="info" additivity="true">
+    <logger name="org.nl.acs.ext.wms.AcsUtil" level="info" additivity="true">
         <appender-ref ref="asyncFileAppender"/>
     </logger>
 </included>

wcs/nladmin-system/src/main/resources/log/AcsToMes.xml

@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>50MB</maxFileSize>
+            <maxFileSize>100MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>

wcs/nladmin-system/src/main/resources/logback-spring.xml

@@ -77,6 +77,33 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="CONSOLE"/>
         </root>
+        <logger name="jdbc" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.hibernate" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.quartz" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="com.google" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.redisson" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.nl.modules.wql" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework.data" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.jinterop" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
     </springProfile>
 
     <!--测试环境:打印控制台-->
@@ -96,5 +123,32 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="asyncFileAppender"/>
         </root>
+        <logger name="jdbc" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.hibernate" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.quartz" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="com.google" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.redisson" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.nl.modules.wql" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework.data" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.jinterop" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
     </springProfile>
 </configuration>

wcs/nladmin-ui/src/views/acs/device/driver/hailiang_hr_ssx_station.vue

@@ -90,8 +90,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="申请空框数量" label-width="150px">
+            <el-form-item label="容器到达通知" label-width="150px">
-              <el-input v-model="form.apply_num" />
+              <el-switch v-model="form.containerArrived" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -118,6 +118,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请空框数量" label-width="150px">
+              <el-input v-model="form.apply_num" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="输送线编码" label-width="150px">
+              <el-input v-model="form.aa" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -277,7 +287,8 @@ export default {
         apply_empty: [],
         manual_create_task: true,
         is_pickup: true,
-        is_release: true
+        is_release: true,
+        containerArrived: false
       },
       rules: {}
     }

wcs/nladmin-ui/src/views/acs/task/index.vue

@@ -102,7 +102,7 @@
               />
             </el-select>
           </el-form-item>
-           <el-form-item v-if="form.task_type == '10'" label="立库任务类型">
+          <el-form-item v-if="form.task_type == '18'" label="立库任务类型">
             <el-select
               v-model="form.storage_task_type"
               style="width: 370px;"