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

opt: 优化刻字、包装任务的代码

Browse Source
This commit is contained in:
liyongde
2023-04-06 09:42:46 +08:00
parent 13fffc8c97
commit cf51e231a2
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java
View File

@@ -55,9 +55,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask {
taskTab.update(taskObj);
} else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
// 完成
if (ObjectUtil.isNotEmpty(pointCode1)) {
if (ObjectUtil.isNotEmpty(pointObj)) {
// 释放点位并赋值
pointTab.query("point_code = '" + pointCode1 + "'").uniqueResult(0);
pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode());
pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY.getCode());
pointObj.put("material_id", "");
@@ -78,9 +77,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask {
* 2、任务状态修改
*/
// 2点位恢复
if (ObjectUtil.isNotEmpty(pointCode1)) {
if (ObjectUtil.isNotEmpty(pointObj)) {
// 释放点位
pointTab.query("point_code = '" + pointCode1 + "'").uniqueResult(0);
pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode());
pointObj.put("update_time", DateUtil.now());
pointTab.update(pointObj);

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java
View File

@@ -55,9 +55,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask {
taskTab.update(taskObj);
} else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
// 完成
if (ObjectUtil.isNotEmpty(pointCode1)) {
if (ObjectUtil.isNotEmpty(pointObj)) {
// 释放点位并赋值
pointTab.query("point_code = '" + pointCode1 + "'").uniqueResult(0);
pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode());
pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY.getCode());
pointObj.put("material_id", "");
@@ -77,9 +76,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask {
* 2、任务状态修改
*/
// 2点位恢复
if (ObjectUtil.isNotEmpty(pointCode1)) {
if (ObjectUtil.isNotEmpty(pointObj)) {
// 释放点位
pointTab.query("point_code = '" + pointCode1 + "'").uniqueResult(0);
pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode());
pointObj.put("update_time", DateUtil.now());
pointTab.update(pointObj);

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java
View File

@@ -55,9 +55,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
taskTab.update(taskObj);
} else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
// 完成
if (ObjectUtil.isNotEmpty(pointCode2)) {
if (ObjectUtil.isNotEmpty(pointObj)) {
// 释放点位并赋值
pointTab.query("point_code = '" + pointCode2 + "'").uniqueResult(0);
pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode());
pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode());
pointObj.put("update_time", DateUtil.now());
@@ -76,9 +75,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
* 2、任务状态修改
*/
// 2点位恢复
if (ObjectUtil.isNotEmpty(pointCode2)) {
if (ObjectUtil.isNotEmpty(pointObj)) {
// 释放点位
pointTab.query("point_code = '" + pointCode2 + "'").uniqueResult(0);
pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode());
pointObj.put("update_time", DateUtil.now());
pointTab.update(pointObj);

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java
View File

@@ -55,9 +55,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask {
taskTab.update(taskObj);
} else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
// 完成
if (ObjectUtil.isNotEmpty(pointCode2)) {
if (ObjectUtil.isNotEmpty(pointObj)) {
// 释放点位并赋值
pointTab.query("point_code = '" + pointCode2 + "'").uniqueResult(0);
pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode());
pointObj.put("point_status", StatusEnum.POINT_STATUS_FULL.getCode());
pointObj.put("material_id", taskObj.getString("material_id"));
@@ -78,9 +77,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask {
* 2、任务状态修改
*/
// 2点位恢复
if (ObjectUtil.isNotEmpty(pointCode2)) {
if (ObjectUtil.isNotEmpty(pointObj)) {
// 释放点位
pointTab.query("point_code = '" + pointCode2 + "'").uniqueResult(0);
pointObj.put("lock_type", StatusEnum.LOCK_OFF.getCode());
pointObj.put("update_time", DateUtil.now());
pointTab.update(pointObj);