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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-11-07 09:07:23 +08:00
parent 1a2f678042
commit 3f50a8b48d
5 changed files with 83 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.TaskService;
import org.nl.wms.st.inbill.service.impl.InbillServiceImpl;
import org.nl.wms.st.inbill.service.impl.RawAssistIStorServiceImpl;
import org.nl.wms.st.outbill.service.impl.CheckOutBillServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -33,7 +34,7 @@ public class OutTask extends AbstractAcsTask {
/*
* 下发给ACS时需要特殊处理
*/
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' order by sort_seq ASC").getResultJSONArray(0);
ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) {
@@ -68,10 +69,26 @@ public class OutTask extends AbstractAcsTask {
if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
// 更新任务状态为执行中
jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
jsonTask.put("update_time", DateUtil.now());
taskTab.update(jsonTask);
}
if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();
// 更改任务状态为完成
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("update_optid", currentUserId);
jsonTask.put("update_optname", currentUsername);
jsonTask.put("update_time", DateUtil.now());
taskTab.update(jsonTask);
// 调用标识完成
CheckOutBillServiceImpl checkOutBillService = new CheckOutBillServiceImpl(null);
checkOutBillService.finishTask(jsonTask);
}
}
@@ -116,17 +133,9 @@ public class OutTask extends AbstractAcsTask {
@Override
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String taskdtl_id) {
//任务表
WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject task = wo_Task.query("task_status<>'99' and taskdtl_id='" + taskdtl_id + "'").uniqueResult(0);
if (task == null) {
throw new BadRequestException("查询不到操作的任务记录！");
}
Map whereJson = new HashMap<String, String>();
whereJson.put("task_code", task.getString("task_code"));
RawAssistIStorServiceImpl inbillService = SpringContextHolder.getBean(RawAssistIStorServiceImpl.class);
inbillService.confirmTask(whereJson);
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override

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

@@ -458,33 +458,8 @@ public class StorPublicServiceImpl implements StorPublicService {
map.put("inv_type","");
map.put("inv_id","");
map.put("inv_code","");
map.put("point_status","00");
//是否清空载具
if("1".equals(from.getString("is_free"))){
map.put("storagevehicle_code","");
map.put("vehicle_code","");
map.put("point_status","00");
map.put("storagevehicle_qty","0");
map.put("storagevehicle_type","");
map.put("storagevehicle_id","");
map.put("is_emptyvehicle","0");
}else{
if (StrUtil.isNotEmpty(storagevehicle_code)) {
JSONObject Storage = wo_Storage.query("storagevehicle_code='"+storagevehicle_code+"'").uniqueResult(0);
if(ObjectUtil.isEmpty(Storage)){
throw new BadRequestException(storagevehicle_code+"载具参数异常！");
}
map.put("storagevehicle_code",Storage.getString("storagevehicle_code"));
map.put("storagevehicle_qty","1");
map.put("vehicle_code",Storage.getString("storagevehicle_code"));
map.put("point_status","01");
}else{
map.put("is_emptyvehicle","0");
if(StrUtil.isNotEmpty(jo.getString("storagevehicle_code"))){
}
}
}
map.put("point_status","1");
map.put("storagevehicle_code","");
wo_Struct.update(map,"struct_id = '"+jo.getString("struct_id")+"'");
wo_Point.update(map,"point_id = '"+jo.getString("point_id")+"'");
}else{//锁定

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

@@ -1127,6 +1127,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
param2.put("sort_seq", jsonTask.getIntValue("sort_seq") + i + 1); // 任务组顺序号
outTask.createTask(param2);
}
}
} else {
JSONObject map = new JSONObject();
@@ -1159,6 +1160,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
map.put("flag", "1");
JSONObject jsonIsBlockR = WQL.getWO("ST_OUTIVT03").addParamMap(map).process().uniqueResult(0);
// 判断左边是否被挡住
if (ObjectUtil.isNotEmpty(jsonIsBlockR)) {
// 更新第一个任务 任务组、任务顺序号
jsonTask.put("task_group_id", IdUtil.getSnowflake(1,1).nextId());
@@ -1185,9 +1187,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
param2.put("sort_seq", jsonTask.getIntValue("sort_seq") + i + 1); // 任务组顺序号
outTask.createTask(param2);
}
}
// 下发
outTask.immediateNotifyAcs();
}
@@ -1395,13 +1397,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
String iostorinv_id = form.getString("iostorinv_id");
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
//查询主表信息
JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jo_mst)) {
throw new BadRequestException("未查到相关出库单");
}
//判断是否存在未确认状态的分配记录
JSONObject task = wo_dis.query("work_status <>'99' and iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task)) {
@@ -1413,6 +1416,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("存在未确认状态的出库分配记录，不允许强制确认！");
}
}
//查询生成和未分配完的明细
JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
.addParam("flag", "2")
@@ -1420,6 +1424,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
.addParam("iostorinv_id", iostorinv_id)
.process()
.getResultJSONArray(0);
if (dtls.size() != 0) {
for (int i = 0; i < dtls.size(); i++) {
JSONObject dtl = dtls.getJSONObject(i);
@@ -1429,6 +1434,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
wo_dtl.update(map_dtl, "iostorinvdtl_id='" + dtl.getString("iostorinvdtl_id") + "'");
}
}
HashMap<String, String> map_mst = new HashMap<>();
map_mst.put("bill_status", "99");
map_mst.put("confirm_optid", currentUserId + "");
@@ -1475,17 +1481,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
from_start.put("struct_id", dis.getString("struct_id"));
from_start.put("lock_type", "1");
from_start.put("storagevehicle_code", "");
// from_start.put("vehicle_code", "");
if ("02".equals(dis.getString("taskdtl_type"))) {
from_start.put("is_free", "1");
}
storPublicService.updateStructAndPoint(from_start);
//解锁终点
/* JSONObject from_end = new JSONObject();
from_end.put("point_code", dis.getString("point_code"));
from_end.put("struct_id", dis.getString("source_id"));
from_end.put("lock_type", "00");
storPublicService.updateStructAndPoint(from_end);*/
}
}
@@ -1501,29 +1497,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
TaskDto checkOutBillAcsTask = null;
String task_id = whereJson.getString("task_id");
String taskdtl_id = whereJson.getString("taskdtl_id");
JSONObject result = null;
if (ObjectUtil.isNotEmpty(result)) {
String status = result.getString("status");
if ("200".equals(status)) {
HashMap<String, String> map = new HashMap<>();
//更新分配表
map.put("is_issued", "1");
wo_dis.update(map, "task_id='" + task_id + "'");
//更新任务为已下发
map.put("task_status", "02");
map.put("update_optid", currentUserId + "");
map.put("update_optname", nickName);
map.put("update_time", now);
wo_Task.update(map, "taskdtl_id='" + taskdtl_id + "'");
} else {
throw new BadRequestException("任务下发失败，请稍后重试！");
}
} else {
throw new BadRequestException("任务下发失败，请稍后重试！");
}
}
@Override
@@ -1541,51 +1515,38 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
JSONObject task = wo_Task.query("task_status<>'99' and task_id='" + task_id + "'").uniqueResult(0);
JSONObject task = wo_Task.query("task_status<>'07' and task_id='" + task_id + "'").uniqueResult(0);
if (task == null) {
throw new BadRequestException("查询不到操作的任务记录！");
}
String task_type = task.getString("task_type");
JSONObject dtljo = wo_dis.query("task_id='" + task_id + "'").uniqueResult(0);
whereJson.put("iostorinv_id", dtljo.getString("iostorinv_id"));
HashMap<String, String> map = new HashMap<>();
//更新任务为完成
map.put("task_status", TaskStatusEnum.FINISHED.getCode());
map.put("finished_type", "01");
map.put("update_optid", currentUserId + "");
map.put("update_optname", nickName);
map.put("update_time", now);
wo_Task.update(map, "task_id='" + task_id + "'");
/* if ("05".equals(task_type)) {//拣选出库
//更新分配表
map.put("work_status", "02");
wo_dis.update(map, "task_id='" + task_id + "'");
} else if ("06".equals(task_type)) {//拣选回库
map.put("work_status", "99");
wo_dis.update(map, "task_id='" + task_id + "'");
//判断是否还有未完成的明细
JSONArray ja = wo_dtl.query("bill_status<>'99' and iostorinv_id='" + whereJson.getString("iostorinv_id") + "'").getResultJSONArray(0);
if (ja.size() == 0) {
this.confirm(whereJson);
}
} else {//全出
map.put("work_status", "99");
wo_dis.update(map, "task_id='" + task_id + "'");
//判断是否还有未完成的明细
JSONArray ja = wo_dtl.query("bill_status<>'99' and iostorinv_id='" + whereJson.getString("iostorinv_id") + "'").getResultJSONArray(0);
if (ja.size() == 0) {
this.confirm(whereJson);
}
}*/
map.put("work_status", "99");
wo_dis.update(map, "task_id='" + task_id + "'");
// 更新明细为完成
JSONObject jsonDtl = wo_dtl.query("iostorinvdtl_id = '" + whereJson.getString("iostorinvdtl_id") + "'").uniqueResult(0);
jsonDtl.put("bill_status", "99");
wo_dtl.update(jsonDtl);
//更新任务为完成
wo_Task.update(map, "task_id='" + task_id + "'");
// 查询此任务下所有的分配明细
JSONArray disArr = wo_dis.query("task_id='" + task_id + "'").getResultJSONArray(0);
for (int i = 0; i < disArr.size(); i++) {
JSONObject jsonDis = disArr.getJSONObject(i);
// 更新分配明细为完成
jsonDis.put("work_status","99");
wo_dis.update(jsonDis);
// 更新明细为完成
JSONObject jsonDtl = wo_dtl.query("iostorinvdtl_id = '" + jsonDis.getString("iostorinvdtl_id") + "'").uniqueResult(0);
jsonDtl.put("bill_status", "99");
wo_dtl.update(jsonDtl);
}
//判断是否还有未完成的明细
JSONArray ja = wo_dtl.query("bill_status<>'99' and iostorinv_id='" + whereJson.getString("iostorinv_id") + "'").getResultJSONArray(0);
@@ -1601,114 +1562,49 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl");
//出库分配表
WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
//出库分配明细表
WQLObject wo_DisDtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl");
//任务表
WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
//出库主表
WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv");
//桶物料变动记录表
WQLObject wo_BucketChangeFlow = WQLObject.getWQLObject("MD_PB_BucketChangeFlow");
//桶记录表
WQLObject wo_BucketRecord = WQLObject.getWQLObject("MD_PB_BucketRecord");
String iostorinv_id = whereJson.getString("iostorinv_id");
String taskdtl_id = whereJson.getString("taskdtl_id");
HashMap<String, String> map = new HashMap<String, String>();
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
String iostorinv_id = whereJson.getString("iostorinv_id");
String task_id = whereJson.getString("task_id");
// 更新任务状态
JSONObject jsonTask = wo_Task.query("task_id ='" + task_id + "'").uniqueResult(0);
jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
jsonTask.put("update_optid", currentUserId);
jsonTask.put("update_optname", nickName);
jsonTask.put("update_time", now);
wo_Task.update(jsonTask);
//查询主表信息
JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jo_mst)) {
throw new BadRequestException("未查到相关出库单");
}
if (jo_mst.getString("bill_status").equals("99")) {
throw new BadRequestException("已审核单据不允许取消完成！");
}
JSONObject task = wo_Task.query("taskdtl_id='" + taskdtl_id + "'").uniqueResult(0);
String taskdtl_type = task.getString("taskdtl_type");
String task_id = task.getString("task_id");
if ("05".contains(taskdtl_type)) {
//查询拣选出库对应的拣选回库有没有先取消完成
JSONObject task06 = wo_Task.query("task_status='99' and taskdtl_type='06' and task_id='" + task_id + "'").uniqueResult(0);
if (task06 != null) {
throw new BadRequestException("请先取消拣选出库对应的拣选回库指令！");
}
}
//如果为拣选出库05
if ("05,02".contains(taskdtl_type)) {
//更新任务为已下发
map.put("task_status", "01");
map.put("finished_type", "");
map.put("update_optid", currentUserId + "");
map.put("update_optname", nickName);
map.put("update_time", now);
wo_Task.update(map, "taskdtl_type='" + taskdtl_type + "' and task_id='" + task_id + "'");
//查询生成和未分配完的明细
JSONArray disdtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
.addParam("flag", "8")
.addParam("task_id", task_id)
.process()
.getResultJSONArray(0);
if (disdtls.size() != 0) {
for (int i = 0; i < disdtls.size(); i++) {
JSONObject disdtl = disdtls.getJSONObject(i);
//更新桶记录相关表
double real_qty_disDtl = disdtl.getDoubleValue("real_qty");
String bucketunique = disdtl.getString("bucketunique");
//查询桶记录
JSONObject bucket = wo_BucketRecord.query("status='04' and bucketunique='" + bucketunique + "'").uniqueResult(0);
double storage_qty = bucket.getDoubleValue("storage_qty");
//重量加回去
storage_qty = storage_qty + real_qty_disDtl;
bucket.put("storage_qty", storage_qty);
bucket.put("outstor_optid", currentUserId);
bucket.put("outstor_optname", nickName);
bucket.put("outstor_time", now);
//更新桶记录表
wo_BucketRecord.update(bucket);
//插入一条变动记录
bucket.put("change_id", IdUtil.getSnowflake(1, 1).nextId() + "");
bucket.put("bucket_code", bucketunique);
bucket.put("change_type_scode", "01");
bucket.put("change_time", now);
bucket.put("rec_person", currentUserId);
bucket.put("change_qty", real_qty_disDtl);
bucket.put("result_qty", storage_qty);
wo_BucketChangeFlow.insert(bucket);
//清空分配明细表
wo_DisDtl.delete("iostorinvdisdtl_id='" + disdtl.getString("iostorinvdisdtl_id") + "'");
//倒推明细表、分配表实际数量
JSONObject dis = wo_dis.query("iostorinvdis_id='" + disdtl.getString("iostorinvdis_id") + "'").uniqueResult(0);
dis.put("real_qty", dis.getDoubleValue("real_qty") - real_qty_disDtl);
dis.put("work_status", "01");
dis.put("is_issued", "0");
wo_dis.update(dis);
JSONObject dtl = wo_dtl.query("iostorinvdtl_id='" + disdtl.getString("iostorinvdtl_id") + "'").uniqueResult(0);
double real_qty = dtl.getDoubleValue("real_qty") - real_qty_disDtl;
if (real_qty == 0) {
dtl.put("bill_status", "40");
}
wo_dtl.update(dtl);
}
} else {
map.put("work_status", "01");
map.put("is_issued", "0");
wo_dis.update(map, "task_id='" + task_id + "'");
}
//更新主表状态
this.updateMststatus(whereJson.getString("iostorinv_id"));
} else if ("06".equals(taskdtl_type)) {//如果为拣选回库
//更新任务为已下发
map.put("task_status", "01");
map.put("finished_type", "");
map.put("update_optid", currentUserId + "");
map.put("update_optname", nickName);
map.put("update_time", now);
wo_Task.update(map, "taskdtl_type='06' and task_id='" + task_id + "'");
if (jo_mst.getString("bill_status").equals("99")) {
throw new BadRequestException("已完成单据不允许取消完成！");
}
// 查询此任务下的所有分配明细
JSONArray disArr = wo_dis.query("task_id ='" + task_id + "'").getResultJSONArray(0);
for (int i = 0; i < disArr.size(); i++) {
JSONObject jsonDis = disArr.getJSONObject(i);
// 更新分配明细状态
jsonDis.put("work_status", "01");
wo_dis.update(jsonDis);
// 更新明细状态
JSONObject jsonDtl = wo_dtl.query("iostorinvdtl_id = '" + jsonDis.getString("iostorinvdtl_id") + "'").uniqueResult(0);
jsonDtl.put("bill_status","40");
}
}

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

@@ -148,7 +148,6 @@
FROM
ST_IVT_StructIvt ivt
LEFT JOIN ST_IVT_StructAttr attr ON attr.struct_id = ivt.struct_id
LEFT JOIN PDM_BI_SubPackageRelation sub ON attr.storagevehicle_code = sub.package_box_SN
WHERE
ivt.quality_scode = '01'
AND attr.lock_type = '1'