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

rev：任务类修改

Browse Source
This commit is contained in:
liuxy
2025-09-02 14:30:53 +08:00
parent 21c7360381
commit ee523f576c
18 changed files with 114 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java
View File

@@ -7,6 +7,7 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.dto.SchBaseTaskQuery;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -68,4 +69,11 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
* @return /
*/
SchBaseTask getByCode(String taskCode);
/**
* 根据配置编码货位未完成的任务
* @param config_code 配置编码
* @return List<SchBaseTask>
*/
List<SchBaseTask> getTaskConfigList(String config_code);
}

10
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -160,4 +160,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
return this.getOne(lam);
}
@Override
public List<SchBaseTask> getTaskConfigList(String config_code) {
return this.list(
new QueryWrapper<SchBaseTask>().lambda()
.eq(SchBaseTask::getConfig_code, config_code)
.lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
.eq(SchBaseTask::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否"))
);
}
}

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java
View File

@@ -158,8 +158,8 @@ public class BackInTask extends AbstractTask {
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getIng_task_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java
View File

@@ -200,8 +200,8 @@ public class CheckBackMoveTask extends AbstractTask {
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getIng_task_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
);

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java
View File

@@ -178,8 +178,8 @@ public class CombinedBoxInTask extends AbstractTask {
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getIng_task_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java
View File

@@ -159,8 +159,8 @@ public class DetainInTask extends AbstractTask {
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getIng_task_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())

6
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java
View File

@@ -152,9 +152,9 @@ public class EmpVehicleInTask extends AbstractTask {
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getIos_id, null)
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getIos_id, "")
.set(SchBasePoint::getIng_task_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
);
// 更新终点

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java
View File

@@ -158,10 +158,10 @@ public class HandInTask extends AbstractTask {
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getIng_task_code, "")
);
}

6
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
View File

@@ -155,14 +155,14 @@ public class PdaPointTask extends AbstractTask {
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getIng_task_code, "")
);
iStructattrService.update(
new UpdateWrapper<Structattr>().lambda()
.eq(Structattr::getStruct_code, taskObj.getPoint_code1())
.set(Structattr::getStoragevehicle_code, null)
.set(Structattr::getStoragevehicle_code, "")
.set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
);
// 更新终点

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java
View File

@@ -185,8 +185,8 @@ public class PieceBoxInTask extends AbstractTask {
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getIng_task_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java
View File

@@ -209,10 +209,10 @@ public class SelectBackInTask extends AbstractTask {
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getVehicle_code, "")
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位"))
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getIng_task_code, "")
);
}
}

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/PieceBoxController.java
View File

@@ -56,7 +56,7 @@ public class PieceBoxController {
}
@DeleteMapping
@Log("删除合箱")
@Log("删除拼箱")
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
iStIvtPieceBoxMstService.delete(ids);
return new ResponseEntity<>(HttpStatus.OK);

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
View File

@@ -52,7 +52,7 @@ public enum IOSEnum {
// 移库任务配置类编码
MOVE_CONFIG_CODE(MapOf.of("2001","InsideMoveTask", "2002", "CombinedBoxMoveTask",
"2003", "PieceBoxMoveTask", "CheckMoveTask", "2004"
"2003", "PieceBoxMoveTask", "2004", "CheckMoveTask"
)),
//入库分配明细状态

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtPieceBoxMst.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.warehouse_management.service.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -94,4 +95,10 @@ public class StIvtPieceBoxMst implements Serializable {
*/
private String create_time;
/**
* 拼箱明细
*/
@TableField(exist = false)
private String piece_dtl_id;
}

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtPieceBoxMstServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.warehouse_management.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -211,12 +212,18 @@ public class StIvtPieceBoxMstServiceImpl extends ServiceImpl<StIvtPieceBoxMstMap
@Override
@Transactional
public void pieceMove(StIvtPieceBoxMst dao) {
// 判断当前是否有正在拼箱移库的任务
List<SchBaseTask> taskConfigList = iSchBaseTaskService.getTaskConfigList(IOSEnum.MOVE_CONFIG_CODE.code("2003"));
if (ObjectUtil.isNotEmpty(taskConfigList)) {
throw new BadRequestException("当前有正在执行的拼箱移库任务，不允许下发任务!");
}
StIvtPieceBoxMst mstDao = this.getById(dao.getId());
// 查询明细
List<StIvtPieceBoxDtl> dtlDaoList = iStIvtPieceBoxDtlService.list(
new QueryWrapper<StIvtPieceBoxDtl>().lambda()
.eq(StIvtPieceBoxDtl::getPiece_id, mstDao.getId())
.eq(ObjectUtil.isNotEmpty(dao.getPiece_dtl_id()), StIvtPieceBoxDtl::getId, dao.getPiece_dtl_id())
.eq(StIvtPieceBoxDtl::getBill_status, IOSEnum.PIECE_DTL_STATUS.code("生成"))
);