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

add:手持接口增加

Browse Source
This commit is contained in:
songxiaopeng
2024-04-08 09:25:07 +08:00
parent 0f7f57ff82
commit 95959bbd8e
15 changed files with 229 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
View File

@@ -50,11 +50,18 @@ public class PdaController {
// return new ResponseEntity<>(pdaService.orderFinish(req), HttpStatus.OK); // return new ResponseEntity<>(pdaService.orderFinish(req), HttpStatus.OK);
// } // }
@PostMapping("/shelfInfo") @PostMapping("/unpackShelfInfo")
@Log("查询货架上料盅信息") @Log("查询货架上未拆包料盅信息")
@ApiOperation("查询货架上料盅信息") @ApiOperation("查询货架上未拆包料盅信息")
public ResponseEntity<Object> shelfInfo() { public ResponseEntity<Object> unpackShelfInfo() {
return new ResponseEntity<>(pdaService.shelfInfo(), HttpStatus.OK); return new ResponseEntity<>(pdaService.unpackShelfInfo(), HttpStatus.OK);
}
@PostMapping("/getCbjPoint")
@Log("查询拆包机点位")
@ApiOperation("查询拆包机点位")
public ResponseEntity<Object> getCbjPoint() {
return new ResponseEntity<>(pdaService.getCbjPoint(), HttpStatus.OK);
} }
@PostMapping("/cbjqlTask") @PostMapping("/cbjqlTask")
@@ -78,6 +85,13 @@ public class PdaController {
return new ResponseEntity<>(pdaService.cbjqkTask(req), HttpStatus.OK); return new ResponseEntity<>(pdaService.cbjqkTask(req), HttpStatus.OK);
} }
@PostMapping("/packShelfInfo")
@Log("查询货架上已拆包料盅信息")
@ApiOperation("查询货架上已拆包料盅信息")
public ResponseEntity<Object> packShelfInfo() {
return new ResponseEntity<>(pdaService.packShelfInfo(), HttpStatus.OK);
}
@PostMapping("/yzqlTask") @PostMapping("/yzqlTask")
@Log("困料货架点对点到布料机上料位") @Log("困料货架点对点到布料机上料位")
@ApiOperation("困料货架点对点到布料机上料位") @ApiOperation("困料货架点对点到布料机上料位")

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
View File

@@ -67,8 +67,8 @@ public interface PdaService {
List<DropdownListVo> pressPointList(); List<DropdownListVo> pressPointList();
// PdaResponseVo orderFinish(TaskReq req); //查询货架上未拆包料盅信息
List<ShelfInfoVo> shelfInfo(); List<ShelfInfoVo> unpackShelfInfo();
PdaResponseVo cbjqlTask(TaskReq req); PdaResponseVo cbjqlTask(TaskReq req);
@@ -94,4 +94,7 @@ public interface PdaService {
List<DropdownListVo> getYjslwPointList(); List<DropdownListVo> getYjslwPointList();
List<DropdownListVo> getCbjPoint();
List<ShelfInfoVo> packShelfInfo();
} }

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java
View File

@@ -80,5 +80,9 @@ public interface PdaMapper {
List<DropdownListVo> getYjslwPointList(); List<DropdownListVo> getYjslwPointList();
List<ShelfInfoVo> selectShelfInfo(); List<ShelfInfoVo> selectUnpackShelfInfo();
List<DropdownListVo> getCbjPointList();
List<ShelfInfoVo> selectPackShelfInfo();
} }

160
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
View File

@@ -3,58 +3,54 @@
<mapper namespace="org.nl.wms.pda.service.dao.mapper.PdaMapper"> <mapper namespace="org.nl.wms.pda.service.dao.mapper.PdaMapper">
<select id="getDeviceInfo" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo"> <select id="getDeviceInfo" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT SELECT p.point_code AS `value`,
p.point_code AS `value`,
p.point_name AS text p.point_name AS text
FROM FROM `sch_base_point` p
`sch_base_point` p WHERE p.region_code = 'YZ'
WHERE p.region_code = 'YZ' AND p.point_type = '1' AND p.point_code = p.parent_point_code AND p.point_type = '1'
AND p.point_code = p.parent_point_code
</select> </select>
<select id="getDictByCode" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo"> <select id="getDictByCode" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT SELECT `value`,
`value`,
label AS text label AS text
FROM FROM `sys_dict`
`sys_dict`
WHERE `code` = #{code} WHERE `code` = #{code}
</select> </select>
<select id="getDeviceInfos" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo"> <select id="getDeviceInfos" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT SELECT p.point_code AS `value`,
p.point_code AS `value`,
p.point_name AS text p.point_name AS text
FROM FROM `sch_base_point` p
`sch_base_point` p WHERE p.region_code = #{device}
WHERE p.region_code = #{device} AND p.point_type = #{type} AND is_used = TRUE AND p.point_type = #{type}
AND is_used = TRUE
</select> </select>
<select id="findKLXPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint"> <select id="findKLXPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT SELECT p.*
p.* FROM `sch_base_point` p
FROM
`sch_base_point` p
LEFT JOIN sch_base_task t ON t.point_code2 = p.point_code AND t.task_status IN ('2', '3', '4') LEFT JOIN sch_base_task t ON t.point_code2 = p.point_code AND t.task_status IN ('2', '3', '4')
WHERE p.region_code = 'LZKLX' AND p.parent_point_code LIKE CONCAT('%', #{endPointCode}, '%') AND p.point_type = '5' WHERE p.region_code = 'LZKLX'
AND p.parent_point_code LIKE CONCAT('%', #{endPointCode}, '%')
AND p.point_type = '5'
AND t.task_code IS NULL AND t.task_code IS NULL
</select> </select>
<select id="forcedRestingShow" resultType="org.nl.wms.pda.service.dao.vo.StandTimeShowVo"> <select id="forcedRestingShow" resultType="org.nl.wms.pda.service.dao.vo.StandTimeShowVo">
SELECT SELECT vg.group_id,
vg.group_id,
vg.point_code, vg.point_code,
p2.point_name AS device_code, p2.point_name AS device_code,
vg.standing_time, vg.standing_time,
TIMESTAMPDIFF(MINUTE, NOW(), DATE_ADD(vg.instorage_time, INTERVAL vg.standing_time MINUTE)) AS timeDifferenceMinutes, TIMESTAMPDIFF(MINUTE, NOW(),
DATE_FORMAT(DATE_ADD(vg.instorage_time, INTERVAL vg.standing_time MINUTE), '%Y-%m-%d %H:%i:%s') AS estimatedCompletionTimeString DATE_ADD(vg.instorage_time, INTERVAL vg.standing_time MINUTE)) AS timeDifferenceMinutes,
FROM DATE_FORMAT(DATE_ADD(vg.instorage_time, INTERVAL vg.standing_time MINUTE),
`sch_base_vehiclematerialgroup` vg '%Y-%m-%d %H:%i:%s') AS estimatedCompletionTimeString
FROM `sch_base_vehiclematerialgroup` vg
LEFT JOIN sch_base_point p1 ON p1.point_code = vg.point_code LEFT JOIN sch_base_point p1 ON p1.point_code = vg.point_code
LEFT JOIN sch_base_point p2 ON p2.point_code = p1.parent_point_code LEFT JOIN sch_base_point p2 ON p2.point_code = p1.parent_point_code
WHERE vg.point_code IN ( WHERE vg.point_code IN
SELECT p.point_code FROM sch_base_point p WHERE p.region_code = 'LZKLX' AND p.point_type = '3' (SELECT p.point_code FROM sch_base_point p WHERE p.region_code = 'LZKLX' AND p.point_type = '3')
)
AND vg.group_bind_material_status = '2' AND vg.group_bind_material_status = '2'
</select> </select>
<select id="getManualOrders" resultType="org.nl.wms.pda.service.dao.vo.ManualWorkOrderVo"> <select id="getManualOrders" resultType="org.nl.wms.pda.service.dao.vo.ManualWorkOrderVo">
SELECT SELECT pw.workorder_code,
pw.workorder_code,
mm.material_code, mm.material_code,
mm.material_name, mm.material_name,
CASE pw.workorder_status CASE pw.workorder_status
@@ -67,14 +63,14 @@
pw.create_name, pw.create_name,
pw.plan_qty, pw.plan_qty,
pw.real_qty pw.real_qty
FROM FROM `pdm_bd_workorder` pw
`pdm_bd_workorder` pw
LEFT JOIN md_base_material mm ON mm.material_id = pw.material_id LEFT JOIN md_base_material mm ON mm.material_id = pw.material_id
WHERE pw.region_code = 'FJ' AND pw.point_code LIKE 'RG%' AND pw.workorder_status IN ('1','3','4') WHERE pw.region_code = 'FJ'
AND pw.point_code LIKE 'RG%'
AND pw.workorder_status IN ('1', '3', '4')
</select> </select>
<select id="getRunningTaskByStart" resultType="org.nl.wms.pda.service.dao.vo.TaskShowVo"> <select id="getRunningTaskByStart" resultType="org.nl.wms.pda.service.dao.vo.TaskShowVo">
SELECT SELECT t.task_code,
t.task_code,
p1.point_name AS point_name1, p1.point_name AS point_name1,
p2.point_name AS point_name2, p2.point_name AS point_name2,
p3.point_name AS point_name3, p3.point_name AS point_name3,
@@ -87,17 +83,17 @@
ELSE '-' ELSE '-'
END AS task_status, END AS task_status,
t.remark t.remark
FROM FROM `sch_base_task` t
`sch_base_task` t
LEFT JOIN sch_base_point p1 ON p1.point_code = t.point_code1 LEFT JOIN sch_base_point p1 ON p1.point_code = t.point_code1
LEFT JOIN sch_base_point p2 ON p2.point_code = t.point_code2 LEFT JOIN sch_base_point p2 ON p2.point_code = t.point_code2
LEFT JOIN sch_base_point p3 ON p3.point_code = t.point_code3 LEFT JOIN sch_base_point p3 ON p3.point_code = t.point_code3
LEFT JOIN sch_base_point p4 ON p4.point_code = t.point_code4 LEFT JOIN sch_base_point p4 ON p4.point_code = t.point_code4
WHERE task_status IN ('1','2','3','4') AND t.point_code1 = #{point_code} AND t.config_code = #{task_config} WHERE task_status IN ('1', '2', '3', '4')
AND t.point_code1 = #{point_code}
AND t.config_code = #{task_config}
</select> </select>
<select id="getRunningTaskByEnd" resultType="org.nl.wms.pda.service.dao.vo.TaskShowVo"> <select id="getRunningTaskByEnd" resultType="org.nl.wms.pda.service.dao.vo.TaskShowVo">
SELECT SELECT t.task_code,
t.task_code,
p1.point_name AS point_name1, p1.point_name AS point_name1,
p2.point_name AS point_name2, p2.point_name AS point_name2,
p3.point_name AS point_name3, p3.point_name AS point_name3,
@@ -110,43 +106,37 @@
ELSE '-' ELSE '-'
END AS task_status, END AS task_status,
t.remark t.remark
FROM FROM `sch_base_task` t
`sch_base_task` t
LEFT JOIN sch_base_point p1 ON p1.point_code = t.point_code1 LEFT JOIN sch_base_point p1 ON p1.point_code = t.point_code1
LEFT JOIN sch_base_point p2 ON p2.point_code = t.point_code2 LEFT JOIN sch_base_point p2 ON p2.point_code = t.point_code2
LEFT JOIN sch_base_point p3 ON p3.point_code = t.point_code3 LEFT JOIN sch_base_point p3 ON p3.point_code = t.point_code3
LEFT JOIN sch_base_point p4 ON p4.point_code = t.point_code4 LEFT JOIN sch_base_point p4 ON p4.point_code = t.point_code4
WHERE task_status IN ('1','2','3','4') AND t.point_code2 = #{point_code} AND t.config_code = #{task_config} WHERE task_status IN ('1', '2', '3', '4')
AND t.point_code2 = #{point_code}
AND t.config_code = #{task_config}
</select> </select>
<select id="getAllPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo"> <select id="getAllPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT SELECT p.point_code AS `value`,
p.point_code AS `value`,
p.point_name AS text p.point_name AS text
FROM FROM `sch_base_point` p
`sch_base_point` p WHERE p.is_used = TRUE
WHERE
p.is_used = TRUE
ORDER BY p.point_code ORDER BY p.point_code
</select> </select>
<select id="materialQuery" resultType="org.nl.wms.pda.service.dao.vo.MaterialInfoVo"> <select id="materialQuery" resultType="org.nl.wms.pda.service.dao.vo.MaterialInfoVo">
SELECT SELECT mm.material_id,
mm.material_id,
mm.material_code, mm.material_code,
mm.material_name, mm.material_name,
mm.material_spec, mm.material_spec,
mm.material_model mm.material_model
FROM FROM `md_base_material` mm
`md_base_material` mm WHERE mm.material_code LIKE '%${material_code}%'
WHERE mm.material_code LIKE '%${material_code}%' OR mm.material_name LIKE '%${material_code}%' OR mm.material_name LIKE '%${material_code}%'
</select> </select>
<select id="getAllPressPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo"> <select id="getAllPressPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT SELECT p.point_code AS `value`,
p.point_code AS `value`,
p.point_name AS text p.point_name AS text
FROM FROM `sch_base_point` p
`sch_base_point` p WHERE p.region_code = 'YZ'
WHERE
p.region_code = 'YZ'
AND p.point_type = '2' AND p.point_type = '2'
</select> </select>
<select id="getHnWorkOrder" resultType="org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder"> <select id="getHnWorkOrder" resultType="org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder">
@@ -156,34 +146,25 @@
and is_delete = '0' and is_delete = '0'
</select> </select>
<select id="getRgfjPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo"> <select id="getRgfjPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT SELECT p.point_code AS `value`,
p.point_code AS `value`,
p.point_name AS text p.point_name AS text
FROM FROM `sch_base_point` p
`sch_base_point` p WHERE p.region_code = 'RGFJ'
WHERE
p.region_code = 'RGFJ'
</select> </select>
<select id="getHchjPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo"> <select id="getHchjPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT SELECT p.point_code AS `value`,
p.point_code AS `value`,
p.point_name AS text p.point_name AS text
FROM FROM `sch_base_point` p
`sch_base_point` p WHERE p.region_code = 'HCHJ'
WHERE
p.region_code = 'HCHJ'
</select> </select>
<select id="getYjslwPointList" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo"> <select id="getYjslwPointList" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT SELECT p.point_code AS `value`,
p.point_code AS `value`,
p.point_name AS text p.point_name AS text
FROM FROM `sch_base_point` p
`sch_base_point` p WHERE p.region_code = 'YZ'
WHERE
p.region_code = 'YZ'
AND p.point_type in ('3', '4') AND p.point_type in ('3', '4')
</select> </select>
<select id="selectShelfInfo" resultType="org.nl.wms.pda.service.dao.vo.ShelfInfoVo"> <select id="selectUnpackShelfInfo" resultType="org.nl.wms.pda.service.dao.vo.ShelfInfoVo">
select p.point_code as pointCode, m.material_code as materialCode, g.instorage_time as instorageTime select p.point_code as pointCode, m.material_code as materialCode, g.instorage_time as instorageTime
from sch_base_point p from sch_base_point p
left join sch_base_vehiclematerialgroup g on p.point_code = g.point_code left join sch_base_vehiclematerialgroup g on p.point_code = g.point_code
@@ -192,6 +173,27 @@
and p.is_used = '1' and p.is_used = '1'
and p.point_status = '3' and p.point_status = '3'
and p.point_code not like 'CBJ%' and p.point_code not like 'CBJ%'
and g.unpack = '0'
order by g.point_code
</select>
<select id="getCbjPointList" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
select point_code as value, point_name as text
from sch_base_point
where region_code = 'KL'
and is_used = '1'
and point_code like 'CBJ%'
</select>
<select id="selectPackShelfInfo" resultType="org.nl.wms.pda.service.dao.vo.ShelfInfoVo">
select p.point_code as pointCode, m.material_code as materialCode, g.instorage_time as instorageTime
from sch_base_point p
left join sch_base_vehiclematerialgroup g on p.point_code = g.point_code
left join md_base_material m on g.material_id = m.material_id
where p.region_code = 'KL'
and p.is_used = '1'
and p.point_status = '3'
and p.point_code not like 'CBJ%'
and g.unpack = '1'
order by g.point_code order by g.point_code
</select> </select>

14
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
View File

@@ -391,8 +391,8 @@ public class PdaServiceImpl implements PdaService {
} }
@Override @Override
public List<ShelfInfoVo> shelfInfo() { public List<ShelfInfoVo> unpackShelfInfo() {
return pdaMapper.selectShelfInfo(); return pdaMapper.selectUnpackShelfInfo();
} }
// @Override // @Override
@@ -538,6 +538,16 @@ public class PdaServiceImpl implements PdaService {
return pdaMapper.getYjslwPointList(); return pdaMapper.getYjslwPointList();
} }
@Override
public List<DropdownListVo> getCbjPoint() {
return pdaMapper.getCbjPointList();
}
@Override
public List<ShelfInfoVo> packShelfInfo() {
return pdaMapper.selectPackShelfInfo();
}
/** /**
* 保存组盘信息 * 保存组盘信息
* @param shelfSaveDto * @param shelfSaveDto

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
View File

@@ -152,6 +152,8 @@ public class SchBaseVehiclematerialgroup implements Serializable {
private String out_kiln_time; private String out_kiln_time;
@ApiModelProperty(value = "入窑时间") @ApiModelProperty(value = "入窑时间")
private String into_kiln_time; private String into_kiln_time;
@ApiModelProperty(value = "是否已拆包(0 否,1 是)")
private String unpack;
@TableField(exist = false) @TableField(exist = false)

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
View File

@@ -37,8 +37,8 @@ import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
/** /**
* @description 服务实现
* @author lyd * @author lyd
* @description 服务实现
* @date 2023-05-16 * @date 2023-05-16
**/ **/
@Slf4j @Slf4j
@@ -164,8 +164,13 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
public SchBaseVehiclematerialgroup getByPointCode(String pointCode) { public SchBaseVehiclematerialgroup getByPointCode(String pointCode) {
LambdaQueryWrapper<SchBaseVehiclematerialgroup> lambda = new QueryWrapper<SchBaseVehiclematerialgroup>().lambda(); LambdaQueryWrapper<SchBaseVehiclematerialgroup> lambda = new QueryWrapper<SchBaseVehiclematerialgroup>().lambda();
lambda.eq(SchBaseVehiclematerialgroup::getPoint_code, pointCode) lambda.eq(SchBaseVehiclematerialgroup::getPoint_code, pointCode)
.eq(SchBaseVehiclematerialgroup::getIs_delete, false); .eq(SchBaseVehiclematerialgroup::getIs_delete, false)
return vehiclematerialgroupMapper.selectOne(lambda); .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.UNBOUND.getValue())
.orderByDesc(SchBaseVehiclematerialgroup::getUpdate_time);
List<SchBaseVehiclematerialgroup> schBaseVehiclematerialgroups = vehiclematerialgroupMapper.selectList(lambda);
if (schBaseVehiclematerialgroups.isEmpty()) {
return null;
}
return schBaseVehiclematerialgroups.get(0);
} }
} }

26
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java
View File

@@ -192,32 +192,10 @@ public class CBJMLTask extends AbstractTask {
groupEntity.setPoint_name(endPointObj.getPoint_name()); groupEntity.setPoint_name(endPointObj.getPoint_name());
groupEntity.setMove_way(groupEntity.getMove_way() + " -> " + endPointObj.getPoint_code()); groupEntity.setMove_way(groupEntity.getMove_way() + " -> " + endPointObj.getPoint_code());
groupEntity.setTask_code(taskObj.getTask_code()); groupEntity.setTask_code(taskObj.getTask_code());
//改为已拆包
groupEntity.setUnpack("1");
TaskUtils.setGroupUpdateByType(groupEntity, taskFinishedType); TaskUtils.setGroupUpdateByType(groupEntity, taskFinishedType);
vehiclematerialgroupService.updateById(groupEntity); vehiclematerialgroupService.updateById(groupEntity);
// 更新工单上的实际重量
// 更新混碾工单
PdmBdWorkorder workOrderObj = workorderService.getByCode(groupEntity.getWorkorder_code());
workOrderObj.setReal_weight(workOrderObj.getReal_weight().add(groupEntity.getMaterial_weight()));
TaskUtils.setWorkOrderUpdateByType(workOrderObj, taskFinishedType);
workorderService.updateById(workOrderObj);
// 如果终点是布料机，那就是需要将压机工单对应（新、旧）料的真实值相加
if (RegionConstant.PRESSED_AREA.equals(endPointObj.getRegion_code())) {
PdmBdWorkorder productionTask = workorderService.getDeviceDockingProductionTask(endPoint);
switch (endPointObj.getPoint_type()) {
case PointTypeConstant.NEW_MATERIAL_POINT:
productionTask.setReal_new_weight(productionTask.getReal_new_weight()
.add(groupEntity.getMaterial_weight()));
break;
case PointTypeConstant.OLD_MATERIAL_POINT:
productionTask.setReal_old_weight(productionTask.getReal_old_weight()
.add(groupEntity.getMaterial_weight()));
break;
default:
throw new BadRequestException("点位区域配置错误!");
}
TaskUtils.setWorkOrderUpdateByType(productionTask, taskFinishedType);
workorderService.updateById(productionTask);
}
// 清空起点 // 清空起点
PointUtils.setUpdateByType(startPointObj, taskFinishedType); PointUtils.setUpdateByType(startPointObj, taskFinishedType);
PointUtils.clearPoint(startPointObj); PointUtils.clearPoint(startPointObj);

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQLTask.java
View File

@@ -104,15 +104,8 @@ public class CBJQLTask extends AbstractTask {
@Override @Override
protected void createCompletion(SchBaseTask task) { protected void createCompletion(SchBaseTask task) {
// 配置信息
// SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
// .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
TaskUtils.setUpdateByAcs(task); TaskUtils.setUpdateByAcs(task);
// 料盅
task.setVehicle_type(GeneralDefinition.MATERIAL_CUP); task.setVehicle_type(GeneralDefinition.MATERIAL_CUP);
// List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
// .collect(Collectors.toList());
// 找起点
String requestParam = task.getRequest_param(); String requestParam = task.getRequest_param();
JSONObject extGroupData = JSONObject.parseObject(requestParam); JSONObject extGroupData = JSONObject.parseObject(requestParam);
SchBasePoint point = pointService.selectById(extGroupData.getString("start_point")); SchBasePoint point = pointService.selectById(extGroupData.getString("start_point"));
@@ -122,15 +115,12 @@ public class CBJQLTask extends AbstractTask {
TASK_CONFIG_CODE + task.getPoint_code2(), NoticeTypeEnum.WARN.getCode()); TASK_CONFIG_CODE + task.getPoint_code2(), NoticeTypeEnum.WARN.getCode());
throw new BadRequestException(ExceptionConstant.NEED_POINT_NOT_FOUND); throw new BadRequestException(ExceptionConstant.NEED_POINT_NOT_FOUND);
} }
// 找到了会把组盘标识传过来
// 设置起点并修改创建成功状态
task.setPoint_code1(point.getPoint_code()); task.setPoint_code1(point.getPoint_code());
task.setTask_status(TaskStatus.CREATED.getCode()); task.setTask_status(TaskStatus.CREATED.getCode());
task.setVehicle_code(point.getVehicle_code()); task.setVehicle_code(point.getVehicle_code());
task.setGroup_id(point.getGroup_id()); task.setGroup_id(point.getGroup_id());
task.setRemark(""); task.setRemark("");
taskService.save(task); taskService.save(task);
point.setIng_task_code(task.getTask_code()); point.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(point); PointUtils.setUpdateByAcs(point);
pointService.updateById(point); pointService.updateById(point);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
View File

@@ -159,6 +159,7 @@ public class HNMLTask extends AbstractTask {
.eq(SchBasePoint::getIng_task_code, "")) .eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode()) .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
.eq(SchBasePoint::getIs_used, true) .eq(SchBasePoint::getIs_used, true)
.notLike(SchBasePoint::getPoint_code,"CBJ%")
.orderByAsc(SchBasePoint::getUpdate_time) .orderByAsc(SchBasePoint::getUpdate_time)
.orderByAsc(SchBasePoint::getIn_order_seq) .orderByAsc(SchBasePoint::getIn_order_seq)
.orderByAsc(SchBasePoint::getPoint_code)); .orderByAsc(SchBasePoint::getPoint_code));
@@ -315,6 +316,7 @@ public class HNMLTask extends AbstractTask {
groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
groupEntity.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); groupEntity.setGroup_status(GroupStatusEnum.IN_STORAGE.getType());
groupEntity.setIs_delete(false); groupEntity.setIs_delete(false);
groupEntity.setUnpack("0");//未拆包
vehiclematerialgroupService.save(groupEntity); vehiclematerialgroupService.save(groupEntity);
return groupEntity.getGroup_id(); return groupEntity.getGroup_id();
} }

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
View File

@@ -133,6 +133,7 @@ public class HNQKTask extends AbstractTask {
.and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住 .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
.or() .or()
.eq(SchBasePoint::getIng_task_code, "")) .eq(SchBasePoint::getIng_task_code, ""))
.notLike(SchBasePoint::getPoint_code,"CBJ%")
.orderByAsc(SchBasePoint::getUpdate_time) .orderByAsc(SchBasePoint::getUpdate_time)
.orderByAsc(SchBasePoint::getIn_order_seq); .orderByAsc(SchBasePoint::getIn_order_seq);
List<SchBasePoint> schBasePoints = pointService.list(lam); List<SchBasePoint> schBasePoints = pointService.list(lam);

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java
View File

@@ -236,11 +236,14 @@ public class YZQLTask extends AbstractTask {
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
String startPoint = taskObj.getPoint_code1(); String startPoint = taskObj.getPoint_code1();
SchBasePoint startPointObj = pointService.getById(startPoint); SchBasePoint startPointObj = pointService.getById(startPoint);
SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2());
// 除了解锁需要将组盘表中的物料绑定载具设置为已解绑 // 除了解锁需要将组盘表中的物料绑定载具设置为已解绑
// 起点设置空位 // 起点设置空位
// 任务上有载具编码 -> 获取当前载具编码的组盘信息 // 任务上有载具编码 -> 获取当前载具编码的组盘信息
SchBaseVehiclematerialgroup groupObj = vehiclematerialgroupService.getById(taskObj.getGroup_id()); SchBaseVehiclematerialgroup groupObj = vehiclematerialgroupService.getById(taskObj.getGroup_id());
// 将载具设置为已解绑 // 将载具设置为已解绑 修改点位未
groupObj.setPoint_code(endPointObj.getPoint_code());
groupObj.setPoint_name(endPointObj.getPoint_name());
groupObj.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); groupObj.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
TaskUtils.setGroupUpdateByType(groupObj, taskFinishedType); TaskUtils.setGroupUpdateByType(groupObj, taskFinishedType);
vehiclematerialgroupService.update(groupObj); vehiclematerialgroupService.update(groupObj);

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java
View File

@@ -195,6 +195,7 @@ public class YZSLWHKTask extends AbstractTask {
PointUtils.clearPoint(startPoint); PointUtils.clearPoint(startPoint);
String endPoint = taskObj.getPoint_code2(); // 获取终点 String endPoint = taskObj.getPoint_code2(); // 获取终点
SchBasePoint endPointObj = pointService.getById(endPoint); SchBasePoint endPointObj = pointService.getById(endPoint);
//查询该点位已解绑的组盘信息
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getByPointCode(pointCode1); SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getByPointCode(pointCode1);
if (null == groupInfo) { if (null == groupInfo) {
throw new BadRequestException("未查询到上料位组盘信息"); throw new BadRequestException("未查询到上料位组盘信息");
@@ -203,7 +204,9 @@ public class YZSLWHKTask extends AbstractTask {
if (ObjectUtil.isNotEmpty(endPoint)) { if (ObjectUtil.isNotEmpty(endPoint)) {
// SimpleDateFormat dateFormat = new SimpleDateFormat("yy-"); // SimpleDateFormat dateFormat = new SimpleDateFormat("yy-");
// String format = dateFormat.format(DateUtil.now()); // String format = dateFormat.format(DateUtil.now());
groupInfo.setInstorage_time(DateUtil.now()); // groupInfo.setInstorage_time(DateUtil.now());
groupInfo.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
groupInfo.setSource_vehicle_code(pointCode1);
groupInfo.setPoint_code(endPoint); groupInfo.setPoint_code(endPoint);
groupInfo.setMove_way(groupInfo.getMove_way() + "->" + startPoint.getPoint_code()+"->"+ endPoint); groupInfo.setMove_way(groupInfo.getMove_way() + "->" + startPoint.getPoint_code()+"->"+ endPoint);
groupInfo.setPoint_name(endPointObj.getPoint_name()); groupInfo.setPoint_name(endPointObj.getPoint_name());

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml
View File

@@ -22,6 +22,7 @@
WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL) AND p.point_status = '3' WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL) AND p.point_status = '3'
AND vg.group_id IS NOT NULL AND vg.redundance_material_code = #{materialCode} AND vg.group_id IS NOT NULL AND vg.redundance_material_code = #{materialCode}
AND TIMESTAMPDIFF(MINUTE, vg.instorage_time, NOW()) >= vg.standing_time AND TIMESTAMPDIFF(MINUTE, vg.instorage_time, NOW()) >= vg.standing_time
and vg.unpack='1'
AND p.region_code IN AND p.region_code IN
<foreach collection="regionCode" item="code" separator="," open="(" close=")"> <foreach collection="regionCode" item="code" separator="," open="(" close=")">
#{code} #{code}

22
lms/nladmin-ui/src/views/wms/pdm/workerorder/mixedOrder.vue
View File

@@ -72,17 +72,17 @@
> >
开工 开工
</el-button> </el-button>
<el-button <!-- <el-button-->
slot="right" <!-- slot="right"-->
class="filter-item" <!-- class="filter-item"-->
type="success" <!-- type="success"-->
icon="el-icon-position" <!-- icon="el-icon-position"-->
size="mini" <!-- size="mini"-->
:disabled="!(crud.selections[0]) || crud.selections[1]" <!-- :disabled="!(crud.selections[0]) || crud.selections[1]"-->
@click="hnmlTask(crud.selections[0])" <!-- @click="hnmlTask(crud.selections[0])"-->
> <!-- >-->
任务下发 <!-- 任务下发-->
</el-button> <!-- </el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- slot="right"--> <!-- slot="right"-->
<!-- class="filter-item"--> <!-- class="filter-item"-->