root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改:临时包装区上料

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-10 14:45:45 +08:00
parent 93fa9f818f
commit bcbe605342
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java
View File

@@ -5,6 +5,7 @@ package org.nl.wms.pda_manage.pda.controller;
*/
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -281,6 +282,7 @@ public class PdaWashController {
@Log("强制下料")
@SaIgnore
public ResponseEntity<Object> washQzFinish(@RequestBody JSONObject query) {
Assert.notNull(query.get("vechile_code"),"料框条码异常,请点击获取信息在强制下料");
RedissonUtils.lock(()->{washSendMaterialQZTask.createTask(query);},"washQzFinish",null);
return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
}

20
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpPackageController.java
View File

@@ -23,6 +23,7 @@ import org.nl.common.enums.StatusEnum;
import org.nl.common.enums.WorkerOrderEnum;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.RedissonUtils;
import org.nl.common.utils.SecurityUtils;
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;
@@ -30,6 +31,7 @@ import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
import org.nl.wms.scheduler_manage.service.extendtask.Engrave.EngraveCallService;
import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
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;
@@ -45,10 +47,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
@RestController
@@ -81,6 +80,12 @@ public class TmpPackageController {
@Transactional
public ResponseEntity<Object> callVechile(@RequestBody JSONObject param){
Assert.notNull(new Object[]{param.getString("device_code"),param.getString("point_code")},"请求参数不能为空");
List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
.eq("point_code3", param.getString("device_code"))
.in("task_status", TaskStatusEnum.ISSUE.getCode(), TaskStatusEnum.EXECUTING.getCode()));
if (!CollectionUtils.isEmpty(list)){
throw new BadRequestException("当前设备"+param.getString("device_code")+"存在正在执行的任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(",")));
}
JSONObject moveTask =taskService.createMoveTask(param.getString("point_code"),param.getString("device_code") , AcsTaskEnum.TASK_POINT_TO_POINT, AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20);
JSONArray data = new JSONArray();
data.add(moveTask);
@@ -90,6 +95,13 @@ public class TmpPackageController {
}
moveTask.put("task_status",StatusEnum.TASK_FINISH.getCode());
taskService.save(moveTask.toJavaObject(SchBaseTask.class));
taskService.update(new UpdateWrapper<SchBaseTask>()
.set("task_status", TaskStatusEnum.CANCEL.getCode())
.set("update_id", SecurityUtils.getCurrentUserId())
.set("update_name","手工叫料")
.set("update_time",new Date())
.eq("point_code3", param.getString("device_code"))
.eq("task_status",TaskStatusEnum.SURE_START_ERROR.getCode()));
basePointService.update(new UpdateWrapper<SchBasePoint>().set("lock_type",StatusEnum.LOCK_OFF.getCode())
.set("point_status",StatusEnum.POINT_STATUS_EMPTY.getCode())
.set("material_id","").set("qty",0)

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml
View File

@@ -58,7 +58,7 @@
SELECT p4.region_code FROM SCH_BASE_Point p4 WHERE p4.point_code = task.point_code4
)
WHERE
task.is_delete = '0'
1=1
<if test="task_type != null and task_type != ''">
and task.task_type = #{task_type}
</if>