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

代码更新

Browse Source
This commit is contained in:
lyd
2022-10-19 17:17:45 +08:00
parent ffc0c80aa6
commit 5fdc432cc2
8 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("点位不能为空"); if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("点位不能为空");
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");// WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");//
WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); // 区域出入库表 WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO"); // 区域出入库表
// WQLObject veQtyTab = WQLObject.getWQLObject("PDM_BI_vehicleQty"); // 托盘对应数量表 // WQLObject veQtyTab = WQLObject.getWQLObject("PDM_BI_vehicleQty"); // 托盘对应数量表
@@ -199,6 +199,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("point_code1", point_code); // 满料位 param.put("point_code1", point_code); // 满料位
param.put("task_type", "gjxl"); // 任务类型 - 共挤下料
SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class); SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class);
String task_id = taskBean.createTask(param); // 创建任务 String task_id = taskBean.createTask(param); // 创建任务
@@ -373,7 +374,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
Long task_id = json.getLongValue("task_id"); Long task_id = json.getLongValue("task_id");
String io_type = json.getString("io_type"); String io_type = json.getString("io_type");
WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase");
@@ -423,7 +424,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String point_code2 = json.getString("point_code2"); String point_code2 = json.getString("point_code2");
String io_type = json.getString("io_type"); String io_type = json.getString("io_type");
WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_regionIO");
WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase");

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

@@ -53,7 +53,7 @@ public class CallMaterialTask extends AbstractAcsTask {
map.put("update_optid", SecurityUtils.getCurrentUserId()); map.put("update_optid", SecurityUtils.getCurrentUserId());
map.put("update_optname", SecurityUtils.getCurrentNickName()); map.put("update_optname", SecurityUtils.getCurrentNickName());
map.put("update_time", DateUtil.now()); map.put("update_time", DateUtil.now());
WQLObject.getWQLObject("SCH_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'"); WQLObject.getWQLObject("ST_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
} }
@@ -64,7 +64,7 @@ public class CallMaterialTask extends AbstractAcsTask {
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
jsonTask.put("remark", "任务执行完成"); jsonTask.put("remark", "任务执行完成");
///审核单据 增加库存 改变出入库表的状态 ///审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0); JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
//解锁仓位，托盘信息，回写到点位上去 //解锁仓位，托盘信息，回写到点位上去
@@ -91,7 +91,7 @@ public class CallMaterialTask extends AbstractAcsTask {
String task_id = taskObj.getString("task_id"); String task_id = taskObj.getString("task_id");
//1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位 //1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位
//找一个合适的仓位 //找一个合适的仓位
WQLObject ProcedureIOStable = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject IosObj = ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0); JSONObject IosObj = ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0);
if (ObjectUtil.isEmpty(IosObj)) { if (ObjectUtil.isEmpty(IosObj)) {
throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的入库单据！"); throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的入库单据！");
@@ -138,7 +138,7 @@ public class CallMaterialTask extends AbstractAcsTask {
String iostorinv_id = form.getString("iostorinv_id"); String iostorinv_id = form.getString("iostorinv_id");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject regionTable = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject regionTable = WQLObject.getWQLObject("ST_IVT_regionIO");
if (StrUtil.isEmpty(point_code2)) { if (StrUtil.isEmpty(point_code2)) {
throw new BadRequestException("终点不能为空！"); throw new BadRequestException("终点不能为空！");

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

@@ -58,7 +58,7 @@ public class SendMaterialTask extends AbstractAcsTask {
map.put("update_optname", SecurityUtils.getCurrentNickName()); map.put("update_optname", SecurityUtils.getCurrentNickName());
map.put("update_time", DateUtil.now()); map.put("update_time", DateUtil.now());
map.put("bill_status", "40"); map.put("bill_status", "40");
WQLObject.getWQLObject("SCH_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'"); WQLObject.getWQLObject("ST_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
} }
if (TaskStatusEnum.FINISHED.getCode().equals(status)) { if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
@@ -68,7 +68,7 @@ public class SendMaterialTask extends AbstractAcsTask {
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
jsonTask.put("remark", "任务执行完成"); jsonTask.put("remark", "任务执行完成");
///审核单据 增加库存 改变出入库表的状态 ///审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0); JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
//审核 加库存可和用数量 //审核 加库存可和用数量
mstObj.put("bill_status", "50"); mstObj.put("bill_status", "50");
@@ -124,7 +124,7 @@ public class SendMaterialTask extends AbstractAcsTask {
String task_id = taskObj.getString("task_id"); String task_id = taskObj.getString("task_id");
//1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位 //1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位
//找一个合适的仓位 //找一个合适的仓位
WQLObject ProcedureIOStable = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject IosObj = ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0); JSONObject IosObj = ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0);
if (ObjectUtil.isEmpty(IosObj)) { if (ObjectUtil.isEmpty(IosObj)) {
throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的入库单据！"); throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的入库单据！");
@@ -164,7 +164,7 @@ public class SendMaterialTask extends AbstractAcsTask {
String point_code2 = form.getString("point_code2"); String point_code2 = form.getString("point_code2");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject iosTable = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_regionIO");
if (StrUtil.isEmpty(point_code1)) { if (StrUtil.isEmpty(point_code1)) {

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

@@ -51,9 +51,11 @@
IF 输入.flag = "1" IF 输入.flag = "1"
PAGEQUERY PAGEQUERY
SELECT SELECT
task.* task.*,
md.class_name task_type_name
FROM FROM
sch_base_task task sch_base_task task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
WHERE WHERE
task.is_delete = '0' task.is_delete = '0'
OPTION 输入.task_type <> "" OPTION 输入.task_type <> ""

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

4
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, point1.point_name AS start_point_name,
point2.point_name AS end_point_name point2.point_name AS end_point_name
FROM FROM
SCH_IVT_regionIO ios ST_IVT_regionIO ios
LEFT JOIN md_me_materialbase mater ON mater.material_id = ios.material_id 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 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 LEFT JOIN SCH_BASE_Region region1 ON region1.region_id = ios.start_region_id
@@ -123,7 +123,7 @@
sch_base_point point sch_base_point point
LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id
WHERE WHERE
point.point_status = '00' point.point_status = '1'
AND point.lock_type = '00' AND point.lock_type = '00'
AND point.is_used = '1' AND point.is_used = '1'
AND point.is_delete = '0' AND point.is_delete = '0'

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.setCreate_time(now);
dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id")); dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id"));
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json); wo.insert(json);
} }
@@ -159,7 +159,7 @@ public class RegionioOutServiceImpl implements RegionioOutService {
dto.setUpdate_optname(nickName); dto.setUpdate_optname(nickName);
dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id")); dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id"));
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.update(json); wo.update(json);
@@ -187,7 +187,7 @@ public class RegionioOutServiceImpl implements RegionioOutService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void createTask(JSONObject jsonObject) { public void createTask(JSONObject jsonObject) {
String iostorinv_id = jsonObject.getString("iostorinv_id"); String iostorinv_id = jsonObject.getString("iostorinv_id");
WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject jsonIn = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); 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, point1.point_name AS start_point_name,
point2.point_name AS end_point_name point2.point_name AS end_point_name
FROM FROM
SCH_IVT_regionIO ios ST_IVT_regionIO ios
LEFT JOIN md_me_materialbase mater ON mater.material_id = ios.material_id 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 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 LEFT JOIN SCH_BASE_Region region1 ON region1.region_id = ios.start_region_id