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

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-17 16:11:25 +08:00
parent e16ebd1b70
commit 73fcf38138
12 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
View File

Binary file not shown.

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

@@ -16,6 +16,8 @@ import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.AcsToWmsService;
import org.nl.wms.log.LokiLog;
import org.nl.wms.log.LokiLogType;
import org.nl.wms.pdm.service.DeviceService;
import org.nl.wms.pdm.service.dto.DeviceDto;
import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -46,6 +48,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
* @param string 条件
* @returnzss
*/
@LokiLog(type = LokiLogType.ACS_TO_LMS)
@Override
public Map<String, Object> receiveTaskStatusAcs(String string) {
JSONArray array = JSONArray.parseArray(string);
@@ -111,12 +114,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("errArr", errArr);
return result;
}
@LokiLog(type = LokiLogType.ACS_TO_LMS)
@Override
public Map<String, Object> receivePointStatusFromAcs(Map<String, String> jsonObject) {
return null;
}
@LokiLog(type = LokiLogType.ACS_TO_LMS)
@Override
public Map<String, Object> orderFinish(String string) {
JSONObject orderJson = JSONObject.parseObject(string);
@@ -139,6 +142,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
return result;
}
@LokiLog(type = LokiLogType.ACS_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject apply(JSONObject whereJson) {
@@ -152,10 +156,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(type)) throw new BadRequestException("类型不能为空");
if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("点位不能为空");
WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord");// 空载具作业记录表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");// 空载具作业记录表
WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO"); // 区域出入库表
WQLObject veQtyTab = WQLObject.getWQLObject("PDM_BI_vehicleQty"); // 托盘对应数量表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");//
WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); // 区域出入库表
// WQLObject veQtyTab = WQLObject.getWQLObject("PDM_BI_vehicleQty"); // 托盘对应数量表
/*
@@ -208,6 +211,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject param = new JSONObject();
param.put("start_point_code", point_code); // 满料位
SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class);
String task_id = taskBean.createTask(param); // 创建任务
@@ -337,7 +341,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 查询载具号对应的数量
JSONObject jsonVeQty = new JSONObject();
if (ObjectUtil.isEmpty(qty)) {
jsonVeQty = veQtyTab.query("vehicle_code = '" + vehicle_code + "' and is_task = '0' order by create_time DESC").uniqueResult(0);
// jsonVeQty = veQtyTab.query("vehicle_code = '" + vehicle_code + "' and is_task = '0' order by create_time DESC").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonVeQty)) throw new BadRequestException("请先手持扫码");
} else {
jsonVeQty.put("qty", qty);
@@ -367,7 +371,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
taskTab.update(jsonTask);
// 更新载具对应数量表
jsonVeQty.put("is_task", "1");
veQtyTab.update(jsonVeQty);
// veQtyTab.update(jsonVeQty);
} else {
throw new BadRequestException(jsonObject.getString("message"));
}
@@ -419,7 +423,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
return resuft;
}
@LokiLog(type = LokiLogType.ACS_TO_LMS)
@Transactional(rollbackFor = Exception.class)
public void createEmp(JSONObject json) {
String vehicle_qty = json.getString("vehicle_qty");
@@ -449,7 +453,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jsonEmp.put("create_time", DateUtil.now());
empTab.insert(jsonEmp);
}
@LokiLog(type = LokiLogType.ACS_TO_LMS)
@Transactional(rollbackFor = Exception.class)
public JSONObject inCreateRegion(JSONObject json) {
String start_point_code = json.getString("start_point_code");
@@ -458,7 +462,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
Long task_id = json.getLongValue("task_id");
String io_type = json.getString("io_type");
WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO");
WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder");
WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase");
@@ -502,13 +506,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
resuft.put("create_mode", jsonRegion.getString("create_mode"));
return resuft;
}
@LokiLog(type = LokiLogType.ACS_TO_LMS)
@Transactional(rollbackFor = Exception.class)
public JSONObject outCreateRegion(JSONObject json) {
String next_point_code = json.getString("next_point_code");
String io_type = json.getString("io_type");
WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO");
WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder");
WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase");

4
lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java
View File

@@ -9,8 +9,8 @@ public enum LokiLogType {
DEFAULT("默认"),
LMS_TO_MES("LMS请求MES"),
MES_TO_LMS("MES请求LMS"),
LMS_TO_SAP("LMS请求MES"),
SAP_TO_LMS("MES请求LMS");
LMS_TO_ACS("LMS请求ACS"),
ACS_TO_LMS("ACS请求LMS");
private String desc;

BIN
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.

8
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java
View File

@@ -60,7 +60,7 @@ public class CallMaterialTask extends AbstractAcsTask {
map.put("update_optid", SecurityUtils.getCurrentUserId());
map.put("update_optname", SecurityUtils.getCurrentNickName());
map.put("update_time", DateUtil.now());
WQLObject.getWQLObject("ST_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
WQLObject.getWQLObject("SCH_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
}
@@ -71,7 +71,7 @@ public class CallMaterialTask extends AbstractAcsTask {
jsonTask.put("update_time", DateUtil.now());
jsonTask.put("remark", "任务执行完成");
///审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject mstTab = WQLObject.getWQLObject("SCH_IVT_regionIO");
JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
//审核 加库存可和用数量
StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
@@ -128,7 +128,7 @@ public class CallMaterialTask extends AbstractAcsTask {
String task_id = taskObj.getString("task_id");
//1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位
//找一个合适的仓位
WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject ProcedureIOStable = WQLObject.getWQLObject("SCH_IVT_regionIO");
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") + "'的入库单据！");
@@ -178,7 +178,7 @@ public class CallMaterialTask extends AbstractAcsTask {
String iostorinv_id = form.getString("iostorinv_id");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject regionTable = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject regionTable = WQLObject.getWQLObject("SCH_IVT_regionIO");
if (StrUtil.isEmpty(next_point_code)) {
throw new BadRequestException("终点不能为空！");

41
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxFullMaterialTask.java
View File

@@ -1,2 +1,41 @@
package org.nl.wms.sch.tasks;public class YsaFullMateriall {
package org.nl.wms.sch.tasks;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.sch.manage.AbstractAcsTask;
public class GjxFullMaterialTask extends AbstractAcsTask {
@Override
public void updateTaskStatus(JSONObject taskObj, String status) {
}
@Override
public void findStartPoint() {
}
@Override
public void findNextPoint() {
}
@Override
public String createTask(JSONObject form) {
return null;
}
@Override
public void forceFinish(String task_id) {
}
@Override
public void pullBack(String task_id) {
}
@Override
public void cancel(String task_id) {
}
}

12
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java
View File

@@ -67,7 +67,7 @@ public class SendMaterialTask extends AbstractAcsTask {
map.put("update_optname", SecurityUtils.getCurrentNickName());
map.put("update_time", DateUtil.now());
map.put("bill_status", "40");
WQLObject.getWQLObject("ST_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
WQLObject.getWQLObject("SCH_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
@@ -77,7 +77,7 @@ public class SendMaterialTask extends AbstractAcsTask {
jsonTask.put("update_time", DateUtil.now());
jsonTask.put("remark", "任务执行完成");
///审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject mstTab = WQLObject.getWQLObject("SCH_IVT_regionIO");
JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
//审核 加库存可和用数量
StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
@@ -154,7 +154,7 @@ public class SendMaterialTask extends AbstractAcsTask {
String task_id = taskObj.getString("task_id");
//1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位
//找一个合适的仓位
WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject ProcedureIOStable = WQLObject.getWQLObject("SCH_IVT_regionIO");
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") + "'的入库单据！");
@@ -196,7 +196,7 @@ public class SendMaterialTask extends AbstractAcsTask {
String next_point_code = form.getString("next_point_code");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject iosTable = WQLObject.getWQLObject("SCH_IVT_regionIO");
if (StrUtil.isEmpty(start_point_code)) {
@@ -230,7 +230,7 @@ public class SendMaterialTask extends AbstractAcsTask {
JSONObject taskObj = new JSONObject();
CodeUtil.getNewCode("TASK_CODE");
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
Long task_id = IdUtil.getSnowflake(1, 1).nextId();
taskObj.put("task_id", task_id);
taskObj.put("taskdtl_id", task_id);
taskObj.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
@@ -254,7 +254,7 @@ public class SendMaterialTask extends AbstractAcsTask {
taskObj.put("create_time", DateUtil.now());
taskObj.put("is_delete", "0");
taskTable.insert(taskObj);
return task_id;
return String.valueOf(task_id);
}

BIN
lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls
View File

Binary file not shown.

6
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java
View File

@@ -137,7 +137,7 @@ public class RegionioInServiceImpl implements RegionioInService {
dto.setCreate_time(now);
dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id"));
WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@@ -168,7 +168,7 @@ public class RegionioInServiceImpl implements RegionioInService {
dto.setUpdate_optname(nickName);
dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id"));
WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.update(json);
@@ -197,7 +197,7 @@ public class RegionioInServiceImpl implements RegionioInService {
public void createTask(JSONObject jsonObject) {
String iostorinv_id = jsonObject.getString("iostorinv_id");
WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO");
WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder");
JSONObject jsonIn = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);

2
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_REGION_IN_01.wql
View File

@@ -59,7 +59,7 @@
point1.point_name AS start_point_name,
point2.point_name AS end_point_name
FROM
ST_IVT_regionIO ios
SCH_IVT_regionIO ios
LEFT JOIN md_me_materialbase mater ON mater.material_id = ios.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ios.qty_unit_id
LEFT JOIN SCH_BASE_Region region1 ON region1.region_id = ios.start_region_id

6
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java
View File

@@ -128,7 +128,7 @@ public class RegionioOutServiceImpl implements RegionioOutService {
dto.setCreate_time(now);
dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id"));
WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@@ -159,7 +159,7 @@ public class RegionioOutServiceImpl implements RegionioOutService {
dto.setUpdate_optname(nickName);
dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id"));
WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.update(json);
@@ -187,7 +187,7 @@ public class RegionioOutServiceImpl implements RegionioOutService {
@Transactional(rollbackFor = Exception.class)
public void createTask(JSONObject jsonObject) {
String iostorinv_id = jsonObject.getString("iostorinv_id");
WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO");
JSONObject jsonIn = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
// 准备参数 并调用入库处理类中的创建任务方法

2
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_REGION_OUT_01.wql
View File

@@ -62,7 +62,7 @@
point1.point_name AS start_point_name,
point2.point_name AS end_point_name
FROM
ST_IVT_regionIO ios
SCH_IVT_regionIO ios
LEFT JOIN md_me_materialbase mater ON mater.material_id = ios.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ios.qty_unit_id
LEFT JOIN SCH_BASE_Region region1 ON region1.region_id = ios.start_region_id