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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-08 19:33:36 +08:00
parent 289a98d69f c5260fdd89
commit fdb4a846c3
2 changed files with 68 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,9 +100,9 @@ public class OutTask extends AbstractAcsTask {
} }
// 更新任务为下发 // 更新任务为下发
JSONObject paramMap = new JSONObject(); /* JSONObject paramMap = new JSONObject();
paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode()); paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode());
wo_Task.update(paramMap,"task_group_id ='"+json.getString("task_group_id")+"'"); wo_Task.update(paramMap,"task_group_id ='"+json.getString("task_group_id")+"'");*/
} }
} }
return resultList; return resultList;
@@ -115,12 +115,13 @@ public class OutTask extends AbstractAcsTask {
WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配表 WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配表
String task_id = taskObj.getString("task_id"); String task_id = taskObj.getString("task_id");
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "' and task_status < '07'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonTask)) {
if (StrUtil.equals(status, "0")) { if (StrUtil.equals(status, "0")) {
// 任务为执行中之后就不允许取消 // 任务为下发之后就不允许取消
if (StrUtil.equals(TaskStatusEnum.EXECUTING.getCode(), jsonTask.getString("task_status"))) { if (jsonTask.getIntValue("task_status") > Integer.valueOf(TaskStatusEnum.START_AND_POINT.getCode())) {
throw new BadRequestException("任务:"+jsonTask.getString("task_code")+"正在执行中，不可取消"); throw new BadRequestException("任务:"+jsonTask.getString("task_code")+"已下发，不可取消");
} }
// 更新删除字段 // 更新删除字段
@@ -172,6 +173,8 @@ public class OutTask extends AbstractAcsTask {
} }
} }
}
@Override @Override
public void findStartPoint() { public void findStartPoint() {

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

@@ -619,6 +619,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表 WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表
String task_id = whereJson.getString("task_id"); String task_id = whereJson.getString("task_id");
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
// 任务为下发之后就不允许取消
if (jsonTask.getIntValue("task_status") > Integer.valueOf(TaskStatusEnum.START_AND_POINT.getCode())) {
throw new BadRequestException("任务:"+jsonTask.getString("task_code")+"已下发，不可取消");
}
// 更新分配明细 任务状态、清空任务id // 更新分配明细 任务状态、清空任务id
JSONObject paramMap = new JSONObject(); JSONObject paramMap = new JSONObject();
paramMap.put("task_id", ""); paramMap.put("task_id", "");
@@ -2552,7 +2559,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
+ "' and row_num = '" + jsonRow.getString("row_num") + "' and is_used = '1' and is_delete = '0' and lock_type not in ('1','6','3')").getResultJSONArray(0); + "' and row_num = '" + jsonRow.getString("row_num") + "' and is_used = '1' and is_delete = '0' and lock_type not in ('1','6','3')").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(structArr)) { if (ObjectUtil.isNotEmpty(structArr)) {
throw new BadRequestException(jsonRow.getString("block_num")+"区-"+jsonRow.getString("row_num")+"排有未完成的任务的入库任务！"); throw new BadRequestException(jsonRow.getString("block_num")+"区-"+jsonRow.getString("row_num")+"排有未完成的入库任务！");
} }
} }
@@ -3844,6 +3851,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv");
// 物料表 // 物料表
WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase");
// 任务表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
// 库区表 // 库区表
WQLObject sectTab = WQLObject.getWQLObject("st_ivt_sectattr"); WQLObject sectTab = WQLObject.getWQLObject("st_ivt_sectattr");
// 子卷包装关系表 // 子卷包装关系表
@@ -3955,6 +3964,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject jsonDis = wo_dis.query("iostorinvdis_id = '" + dis.getString("iostorinvdis_id") + "'").uniqueResult(0); JSONObject jsonDis = wo_dis.query("iostorinvdis_id = '" + dis.getString("iostorinvdis_id") + "'").uniqueResult(0);
jsonDis.put("work_status", "99"); jsonDis.put("work_status", "99");
wo_dis.update(jsonDis); wo_dis.update(jsonDis);
// 更新对应任务为完成
JSONObject jsonTask = taskTab.query("task_id = '" + jsonDis.getString("task_id") + "' and task_status < '07'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonTask)) {
jsonTask.put("task_status",TaskStatusEnum.FINISHED.getCode());
taskTab.update(jsonTask);
}
} }
JSONObject out_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); JSONObject out_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);