rev: 成品、半成品任务反馈修改

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java

@@ -1,6 +1,7 @@
 package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -636,6 +637,12 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
         WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
         bean.issueTaskToAcs3(param);
 
+        // 反馈失败报错
+        Map<String, Object> result = bean.issueTaskToAcs3(param);
+        if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) {
+            throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message"));
+        }
+
         // 2.更新任务状态
         taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode());
         iSchBaseTaskService.updateById(taskDao);

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java

@@ -1,6 +1,7 @@
 package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -847,7 +848,12 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         param.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
         // 1.下发任务
         WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
-        bean.issueTaskToAcs3(param);
+
+        // 反馈失败报错
+        Map<String, Object> result = bean.issueTaskToAcs3(param);
+        if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) {
+            throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message"));
+        }
 
         // 2.更新任务状态
         taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode());

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java

@@ -1,6 +1,7 @@
 package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
@@ -316,6 +317,12 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl<StIvtIostorinvB
         WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
         bean.issueTaskToAcs3(param);
 
+        // 反馈失败报错
+        Map<String, Object> result = bean.issueTaskToAcs3(param);
+        if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) {
+            throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message"));
+        }
+
         // 2.更新任务状态
         taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode());
         iSchBaseTaskService.updateById(taskDao);

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java

@@ -1,6 +1,7 @@
 package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
@@ -350,10 +351,17 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
         SchBaseTask taskDao = iSchBaseTaskService.getById(task_id);
         JSONArray param = new JSONArray();
         param.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
+
         // 1.下发任务
         WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
         bean.issueTaskToAcs3(param);
 
+        // 反馈失败报错
+        Map<String, Object> result = bean.issueTaskToAcs3(param);
+        if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) {
+            throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message"));
+        }
+
         // 2.更新任务状态
         taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode());
         iSchBaseTaskService.updateById(taskDao);