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

提交

Browse Source
This commit is contained in:
18188916393
2022-08-10 09:34:15 +08:00
parent fe1bddb3f4
commit 1cca98d1de
12 changed files with 100 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
wms/hd/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls
View File

Binary file not shown.

14
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -72,6 +72,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
case "1":
jsonObject.put("start_point_code", device_code);
jsonObject.put("create_mode", "01");
jsonObject.put("group_id",group_id);
if (StrUtil.isEmpty(is_full)) {
throw new BadRequestException("托盘是否满托不能为空！");
@@ -155,10 +156,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jsonObject.put("next_point_code", device_code);
produceInfoByCode = this.getProduceInfoByCode(device_code);
//假如是码垛位的上料位，则去看看有没有当前排产单生产的物料的半满托
if (StrUtil.equals(device_code, "FJJXSXLW201") ||
StrUtil.equals(device_code, "FJJXSXLW202") ||
StrUtil.equals(device_code, "FJJXSXLW301") ||
StrUtil.equals(device_code, "FJJXSXLW302")
if (StrUtil.equals(device_code, "FJJXSSLW101") ||
StrUtil.equals(device_code, "FJJXSSLW102") ||
StrUtil.equals(device_code, "FJJXSSLW301") ||
StrUtil.equals(device_code, "FJJXSSLW302")
) {
material_id = produceInfoByCode.getString("material_id");
@@ -175,7 +176,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jsonObject.put("pcsn", "pcsn");
jsonObject.put("material_id", material_id);
jsonObject.put("is_full", "0");
jsonObject.put("workprocedure_id", workprocedure_id);
jsonObject.put("workprocedure_id", WorkProcedureEnum.BZGX.getId());
callMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject));
break;
}
@@ -358,7 +359,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//1组盘
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
WQLObject taskTable = WQLObject.getWQLObject("sch_base_task");
String task_id = taskTable.query("task_code='" + task_code + "'").uniqueResult(0).getString("task_id");
//将之前的托盘信息删除
groupTable.delete("vehicle_code='"+vehicle_code+"' and task_id <>'"+task_id+"'");
JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(groupObj)) {
throw new BadRequestException("未找到指令为'" + task_id + "'的组盘信息！");

29
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -169,7 +169,7 @@ public class CallMaterialTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
//请求参数 终点不能为空 物料，数量，客户,批次，创建方式，托盘，是否满托不能为空！ 起点点位不为空时,单据编号不能为空！
String start_point_code = form.getString("start_point_code");
@@ -253,6 +253,12 @@ public class CallMaterialTask extends AbstractAcsTask {
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
break;
//包装工序
case BZGX:
startArea_type = AreaEnum.BTHCQ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.FJGX.getId();
break;
}
} else {
// （机械手呼叫空托盘，需要呼叫半满托盘）如果请求有工序，假如是压制工序，则库存工序是压制，起点是出窑货架
@@ -270,6 +276,11 @@ public class CallMaterialTask extends AbstractAcsTask {
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
break;
case BZGX:
startArea_type = AreaEnum.BTHCQ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.FJGX.getId();
break;
}
}
@@ -311,10 +322,18 @@ public class CallMaterialTask extends AbstractAcsTask {
iosObj.put("create_mode", create_mode);
iosObj.put("task_id", task_id);
iosObj.put("pcsn", pcsn);
iosObj.put("create_id", SecurityUtils.getCurrentUserId());
iosObj.put("create_name", SecurityUtils.getNickName());
iosObj.put("create_id","1");
iosObj.put("create_name", "管理员");
iosObj.put("create_time", DateUtil.now());
WQLObject.getWQLObject("ST_IVT_workProcedureIOS").insert(iosObj);
//将组盘里面的task_id改为当前的任务
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject groupObj = groupTable.query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(groupObj)){
groupObj.put("task_id",task_id);
groupTable.update(groupObj);
}
}
task_status = TaskStatusEnum.START_AND_POINT.getCode();
@@ -351,8 +370,8 @@ public class CallMaterialTask extends AbstractAcsTask {
taskObj.put("vehicle_code", vehicle_code);
taskObj.put("handle_class", THIS_CLASS);
taskObj.put("is_auto_issue", "1");
taskObj.put("create_name", SecurityUtils.getCurrentUsername());
taskObj.put("create_id", SecurityUtils.getCurrentUserId());
taskObj.put("create_name", "管理员");
taskObj.put("create_id", "1");
taskObj.put("create_time", DateUtil.now());
taskObj.put("is_delete", "0");
taskTable.insert(taskObj);

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ConveyorTask.java
View File

@@ -75,7 +75,7 @@ public class ConveyorTask extends AbstractAcsTask {
taskObj.put("task_id", IdUtil.getSnowflake(1, 1).nextId() + "");
String task_status = TaskStatusEnum.EXECUTING.getCode();
taskObj.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
taskObj.put("task_type", "04");
taskObj.put("task_type", "06");
//输送任务
taskObj.put("acs_task_type", "2");
String start_area = AreaEnum.RYSSXQ.getCode();

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/RgvTask.java
View File

@@ -76,7 +76,7 @@ public class RgvTask extends AbstractAcsTask {
taskObj.put("task_id", IdUtil.getSnowflake(1, 1).nextId() + "");
String task_status = TaskStatusEnum.START_AND_POINT.getCode();
taskObj.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
taskObj.put("task_type", TaskTypeEnum.RGV_TASK.getCode());
taskObj.put("task_type", "05");
//输送任务
taskObj.put("acs_task_type", "2");
String start_area = AreaEnum.RYSSXQ.getCode();

30
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
View File

@@ -165,7 +165,6 @@ public class SendMaterialTask extends AbstractAcsTask {
taskObj.put("update_optname", SecurityUtils.getNickName());
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
//组盘
}
@@ -188,6 +187,7 @@ public class SendMaterialTask extends AbstractAcsTask {
String create_mode = form.getString("create_mode");
String pcsn = form.getString("pcsn");
String vehicle_code = form.getString("vehicle_code");
String group_id = form.getString("group_id");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
if (StrUtil.isEmpty(start_point_code)) {
throw new BadRequestException("起点不能为空！");
@@ -252,7 +252,7 @@ public class SendMaterialTask extends AbstractAcsTask {
case FJGX:
qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID;
bill_type = BillTypeEnum.SZRK.getCode();
endArea_type = AreaEnum.MTPQ.getCode();
endArea_type = AreaEnum.BTHCQ.getCode();
break;
default:
qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID;
@@ -327,31 +327,17 @@ public class SendMaterialTask extends AbstractAcsTask {
taskObj.put("vehicle_code", vehicle_code);
taskObj.put("is_delete", "0");
taskTable.insert(taskObj);
//如果是压制工序，则需要组盘
JSONObject jo = new JSONObject();
String is_autopackage = "1";
if (StrUtil.equals(start_point_code, "MDJXS601")) {
is_autopackage = "0";
}
//如果是压制工序，则需要插入组盘表
// 如果是压制下料需要更新组盘信息，将task_id 更新
JSONObject workInfo = WQL.getWO("QSTRUCT_RULE").addParam("flag", "1").addParam("code", start_point_code)
.process().uniqueResult(0);
if (StrUtil.equals(WorkProcedureEnum.YZGX.getCode(), workInfo.getString("workprocedure_code"))) {
JSONObject materialObj = WQLObject.getWQLObject("md_me_material").query("material_id='" + material_id + "'").uniqueResult(0);
String group_id = IdUtil.getSnowflake(1, 1).nextIdStr();
jo.put("group_id", group_id);
jo.put("material_id", material_id);
jo.put("material_code", materialObj.getString("material_code"));
jo.put("material_name", materialObj.getString("material_name"));
jo.put("is_autopackage", is_autopackage);
jo.put("pcsn", pcsn);
jo.put("qty", qty);
jo.put("create_id", SecurityUtils.getCurrentUserId());
jo.put("create_name", SecurityUtils.getCurrentUserId());
jo.put("create_time", DateUtil.now());
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
groupTable.insert(jo);
JSONObject groupInfo = groupTable.query("group_id='" + group_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(groupInfo)) {
groupInfo.put("task_id", task_id);
groupTable.update(groupInfo);
}
}
return task_id;
}

96
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToConveyorTask.java
View File

@@ -66,57 +66,6 @@ public class ToConveyorTask extends AbstractAcsTask {
jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
jsonTask.put("update_time", DateUtil.now());
jsonTask.put("remark", "任务执行完成");
///审核单据 增加库存 改变出入库表的状态
/*WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
//审核 加库存可和用数量
StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
mstObj.put("bill_status", "50");
mstObj.put("confirm_optid", SecurityUtils.getCurrentUserId());
mstObj.put("confirm_optname", SecurityUtils.getNickName());
mstObj.put("confirm_time", DateUtil.now());
mstTab.update(mstObj);
String iostorinv_id = mstObj.getString("iostorinv_id");
String next_point_code = mstObj.getString("end_point_code");
String start_point_code = mstObj.getString("start_point_code");
JSONObject param = new JSONObject();
param.put("material_id", mstObj.getString("material_id"));
param.put("bill_id", iostorinv_id);
param.put("qty_unit_id", mstObj.getString("qty_unit_id"));
param.put("pcsn", mstObj.getString("pcsn"));
param.put("change_qty", mstObj.getString("qty"));
param.put("vehicle_code", mstObj.getString("vehicle_code"));
param.put("workprocedure_id", mstObj.getString("workprocedure_id"));
param.put("is_full", mstObj.getString("is_full"));
param.put("stewing_time", mstObj.getString("stewing_time"));
param.put("producetask_id", mstObj.getString("producetask_id"));
PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class);
PointDto nextPointDto = pointService.findByCode(next_point_code);
if (ObjectUtil.isNull(nextPointDto)) {
throw new BadRequestException("未找到可用点位:" + next_point_code);
}
PointDto startPointDto = pointService.findByCode(start_point_code);
if (ObjectUtil.isNull(startPointDto)) {
throw new BadRequestException("未找到可用点位:" + start_point_code);
}
param.put("struct_id", nextPointDto.getPoint_id());
ivtService.addIvtFlow(param, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE);
//解锁仓位，托盘信息，回写到点位上去
String vehicle_code = jsonTask.getString("vehicle_code");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("next_point_code") + "'").uniqueResult(0);
endpointObj.put("lock_type", "00");
endpointObj.put("point_status", "02");
endpointObj.put("vehicle_code", vehicle_code);
pointTab.update(endpointObj);
JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
pointTab.update(startPointObj);*/
taskTab.update(jsonTask);
}
@@ -128,46 +77,7 @@ public class ToConveyorTask extends AbstractAcsTask {
}
@Override
public void findNextPoint() {
String task_status = TaskStatusEnum.SURE_START.getCode();
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONArray taskArry = taskTab.query("task_status='" + task_status + "' AND handle_class='" + THIS_CLASS + "' AND is_delete='0' ").getResultJSONArray(0);
for (int i = 0; i < taskArry.size(); i++) {
JSONObject taskObj = taskArry.getJSONObject(i);
String task_id = taskObj.getString("task_id");
//1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位
//找一个合适的仓位
WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
JSONObject IosObj = ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0);
if (ObjectUtil.isEmpty(IosObj)) {
throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的入库单据！");
}
JSONObject param = new JSONObject();
param.put("material_id", IosObj.getString("material_id"));
param.put("area_type", IosObj.getString("end_area"));
param.put("vehicle_code", IosObj.getString("vehicle_code"));
JSONObject inStructObj = StructFindUtil.getInStruct(param);
if (ObjectUtil.isEmpty(inStructObj)) {
throw new BadRequestException("未找到合适的入库仓位！");
}
//修改单据状态，将终点填入
IosObj.put("bill_status", "20");
IosObj.put("end_point_code", inStructObj.getString("struct_code"));
ProcedureIOStable.update(IosObj);
//终点加锁
HashMap lock_map = new HashMap();
lock_map.put("lock_type", "01");
WQLObject.getWQLObject("sch_base_point").update(lock_map, "point_code = '" + inStructObj.getString("struct_code") + "'");
//修改任务状态
taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
taskObj.put("update_optid", SecurityUtils.getCurrentUserId());
taskObj.put("update_optname", SecurityUtils.getNickName());
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
}
}
public void findNextPoint() {}
@Override
@Transactional
@@ -204,7 +114,7 @@ public class ToConveyorTask extends AbstractAcsTask {
JSONObject materialObj = WQLObject.getWQLObject("md_me_material").query("material_id='" + material_id + "'").uniqueResult(0);
//更新组盘信息，将task_id 更新
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject groupInfo =groupTable.query("gruop_id='"+group_id+"'").uniqueResult(0);
JSONObject groupInfo =groupTable.query("group_id='"+group_id+"'").uniqueResult(0);
groupInfo.put("task_id",task_id);
groupTable.update(groupInfo);
@@ -216,7 +126,7 @@ public class ToConveyorTask extends AbstractAcsTask {
JSONObject taskObj = new JSONObject();
taskObj.put("task_id", task_id);
taskObj.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
taskObj.put("task_type", "00");
taskObj.put("task_type", "06");
taskObj.put("acs_task_type", "1");
taskObj.put("task_status", task_status);
taskObj.put("start_point_code", start_point_code);

41
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoCleanUpLogs.java Normal file
View File

@@ -0,0 +1,41 @@
package org.nl.wms.sch.task;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Component;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* @author geng by
* 自动清理大于十五天的日志
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class AutoCleanUpLogs {
private ExecutorService threadPool = Executors.newCachedThreadPool();
public void run() throws Exception {
try {
System.out.println("开始清理日志");
// 0 0/10 0,1 * * ? * 每天0-1点执行间隔10分钟一次
//sys_log
//delete from sys_log where DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL 30 day)) limit 10;
WQLObject logTab = WQLObject.getWQLObject("sys_log");
String days = WQLObject.getWQLObject("sys_param").query("code='clean_day'").uniqueResult(0).getString("value");
logTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL '" + days + "' day)) limit 500");
log.info("自动清理日志执行成功...!");
} catch (Exception e) {
e.printStackTrace();
}
}
}

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoOutStructTask.java
View File

@@ -46,18 +46,18 @@ public class AutoOutStructTask {
return;
}
JSONObject param = new JSONObject();
param.put("flag", "10");
param.put("flag", "9");
param.put("area_type", "01");
param.put("if_full", "1");
JSONObject structObj = WQL.getWO("QSTRUCT_RULE").addParamMap(param).process().uniqueResult(0);
CallMaterialTask callMaterialTask = new CallMaterialTask();
JSONObject taskObj = new JSONObject();
taskObj.put("start_point_code", structObj.get("struct_code"));
taskObj.put("next_point_code",conveyorObj.get("point_code"));
taskObj.put("vehicle_code", structObj.get("vehicle_code"));
taskObj.put("material_id", structObj.get("material_id"));
taskObj.put("create_mode", "02");
taskObj.put("is_full", "1");
taskObj.put("workprocedure_id", WorkProcedureEnum.YZGX.getId());
taskObj.put("workprocedure_id", WorkProcedureEnum.SZGX.getId());
callMaterialTask.createTask(taskObj);
return;
}