Browse Source

按钮盒业务逻辑修改

k 1 year ago
parent
commit
133e3173ed

+ 1 - 1
ruoyi-admin/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.101.169.124:3306/warewms-jnmc-jinco?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.100.220.92:3306/warewms-jnmc-jinco?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 username: warewms
                 password: warewms123
             # 从库数据源

+ 1 - 1
warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask01.java

@@ -35,7 +35,7 @@ public class AutoButtonBoxTask01 {
 
     public void buttonTask01(ButtonBoxClient.BUTTON_BOX_NO button_box_no) {
         log.info("氯化镍废料口-按钮已经被按下");
-        AjaxResult ajaxResult = agvCallProxyService.accessoriesHandlingLSN(LSN_FL_POINT, null
+        AjaxResult ajaxResult = agvCallProxyService.accessoriesHandlingLHN(LSN_FL_POINT, null
                 , "按钮盒");
         if (!ajaxResult.isSuccess()) {
             log.info(ajaxResult.getMsg());

+ 1 - 1
warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask02.java

@@ -35,7 +35,7 @@ public class AutoButtonBoxTask02 {
 
     public void buttonTask01(ButtonBoxClient.BUTTON_BOX_NO button_box_no) {
         log.info("硫酸镍废料接驳口-按钮已经被按下");
-        AjaxResult ajaxResult = agvCallProxyService.accessoriesHandlingLHN(LHN_FL_POINT, null
+        AjaxResult ajaxResult = agvCallProxyService.accessoriesReturnEmptyLSN(LHN_FL_POINT, null
                 , "按钮盒");
         if (!ajaxResult.isSuccess()) {
             log.info(ajaxResult.getMsg());

+ 1 - 1
warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask03.java

@@ -35,7 +35,7 @@ public class AutoButtonBoxTask03 {
 
     public void buttonTask01(ButtonBoxClient.BUTTON_BOX_NO button_box_no) {
         log.info("硫酸镍废料口-按钮已经被按下");
-        AjaxResult ajaxResult = agvCallProxyService.accessoriesReturnEmptyLSN(LSN_FL_R_POINT, null
+        AjaxResult ajaxResult = agvCallProxyService.accessoriesHandlingLSN(LSN_FL_R_POINT, null
                 , "按钮盒");
         if (!ajaxResult.isSuccess()) {
             log.info(ajaxResult.getMsg());