add:添加空框送回按钮

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java

@@ -7,10 +7,12 @@ package org.nl.wms.pda_manage.pda.controller;
  */
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.api.R;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -18,18 +20,27 @@ import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.MapOf;
 import org.nl.common.utils.RedissonUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
 import org.nl.wms.scheduler_manage.service.extendtask.Engrave.EngraveCallService;
+import org.nl.wms.scheduler_manage.service.extendtask.Engrave.EngraveSendEmpTask;
 import org.nl.wms.scheduler_manage.service.extendtask.plotter.PlotterCallEmptyTask;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService;
+import org.nl.wms.storage_manage.productmanage.util.RuleUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -62,6 +73,13 @@ public class TmpKZController {
     private EngraveCallService engraveScheduleService;
     @Autowired
     private IMdMeMaterialbaseService materialbaseService;
+    @Autowired
+    private EngraveSendEmpTask engraveSendEmpTask;
+    @Autowired
+    private IStIvtSectattrService sectattrService;
+    @Autowired
+    private DivRuleCpService divRuleCpService;
+
     /**
      *
      * @param param
@@ -190,6 +208,24 @@ public class TmpKZController {
     @Log("手动送空框")
     @SaIgnore
     public ResponseEntity<Object> sendVechile(@RequestBody JSONObject param){
+        JSONObject object = new JSONObject();
+        object.put("device_code","A1_KZ_SL");
+        //?刻字满料请求：可以存在多个任务？
+        List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
+                .lt("task_status", StatusEnum.TASK_FINISH.getCode()).eq("task_type",AcsTaskEnum.TASK_Engrave_EMPTY.getCode()));
+        if (!CollectionUtils.isEmpty(list)){
+            throw new BadRequestException(String.format("刻字输送线-空框送回存在未完成任务"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList()).toString(), param.getString("device_code")));
+        }
+        StIvtSectattr sect = sectattrService.getOne(new QueryWrapper<StIvtSectattr>().eq("sect_name", "半成品库区"));
+        JSONObject jo = new JSONObject();
+        jo.put("sect_id", sect.getSect_id());
+        jo.put("stor_id", sect.getStor_id());
+        jo.put("rule_type", RuleUtil.PRODUCTION_IN_1);
+        StIvtStructattr stIvtStructattr = divRuleCpService.divRuleIn(jo);
+        if (stIvtStructattr ==null){
+            throw new BadRequestException("半成品库没有可用空位.");
+        }
+        engraveSendEmpTask.createTask(object);
         return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveSendEmpTask.java

@@ -100,7 +100,7 @@ public class EngraveSendEmpTask extends AbstractAcsTask {
         List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
                 .lt("task_status", StatusEnum.TASK_FINISH.getCode()).eq("task_type",AcsTaskEnum.TASK_Engrave_EMPTY.getCode()));
         if (!CollectionUtils.isEmpty(list)){
-            throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code")));
+            throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList()).toString(), param.getString("device_code")));
         }
         // 查找任务状态
         JSONObject task = new JSONObject();

mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java

@@ -81,6 +81,7 @@ public class SysMenuController {
     //("查询菜单")
     @SaCheckPermission("menu:list")
     public ResponseEntity<Object> pageQuery(MenuQuery query, PageQuery page) throws Exception {
+        page.setSize(100);
         List list = iSysMenuService.query(query, page);
         return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
     }