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-03-29 18:01:24 +08:00
parent 174436aec0
commit 098c1b2ea6
7 changed files with 113 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,28 +261,41 @@ public class PdaController {
return new ResponseEntity<>(pdaService.updateData(shelfSaveDto), HttpStatus.OK);
}
//华弘手持接口
@PostMapping("/hnWorkOrder")
@Log("查询混碾工单")
@ApiOperation("查询混碾工单")
public ResponseEntity<Object> rgfjskTask() {
return new ResponseEntity<>(pdaService.getHnWorkOrder(), HttpStatus.OK);
}
@PostMapping("/orderFinish")
@Log("工单完成")
@ApiOperation("工单完成")
@Log("混碾工单完成")
@ApiOperation("混碾工单完成")
public ResponseEntity<Object> orderFinish(@RequestBody OrderFinishReq req) {
return new ResponseEntity<>(pdaService.orderFinish(req), HttpStatus.OK);
}
@PostMapping("/hnmlTask")
@Log("拆包机->混碾货架任务下发")
@ApiOperation("拆包机->混碾货架任务下发")
@Log("拆包机料盅入库")
@ApiOperation("拆包机料盅入库")
public ResponseEntity<Object> hnmlTask(@RequestBody OrderFinishReq req) {
return new ResponseEntity<>(pdaService.hnmlTask(req), HttpStatus.OK);
}
@PostMapping("/hnqkTask")
@Log("混碾货架->拆包机任务下发")
@ApiOperation("混碾货架->拆包机任务下发")
@Log("拆包机叫空蛊")
@ApiOperation("拆包机叫空蛊")
public ResponseEntity<Object> hnqkTask() {
return new ResponseEntity<>(pdaService.hnqkTask(), HttpStatus.OK);
}
@PostMapping("/yjslwPointList")
@Log("压机上料位下拉框")
@ApiOperation("压机上料位下拉框")
public ResponseEntity<Object> yjslwPointList(){
return new ResponseEntity<>(pdaService.getYjslwPointList(), HttpStatus.OK);
}
@PostMapping("/qzhhjTask")
@Log("压机上料位强制回货架")
@ApiOperation("压机上料位强制回货架")
@@ -297,9 +310,23 @@ public class PdaController {
return new ResponseEntity<>(pdaService.materialScrap(req), HttpStatus.OK);
}
@PostMapping("/rgfjPoint")
@Log("查询人工分拣点位")
@ApiOperation("查询人工分拣点位")
public ResponseEntity<Object> rgfjPoint() {
return new ResponseEntity<>(pdaService.getRgfjPoint(), HttpStatus.OK);
}
@PostMapping("/hchjPoint")
@Log("查询缓存货架点位")
@ApiOperation("查询缓存货架点位")
public ResponseEntity<Object> hchjPoint() {
return new ResponseEntity<>(pdaService.getHchjPoint(), HttpStatus.OK);
}
@PostMapping("/rgfjqlTask")
@Log("人工分拣 出窑缓存货架->人工分拣位")
@ApiOperation("人工分拣")
@Log("人工分拣叫料")
@ApiOperation("人工分拣叫料")
public ResponseEntity<Object> rgfjqlTask(@RequestBody FjReq req) {
return new ResponseEntity<>(pdaService.rgfjqlTask(req), HttpStatus.OK);
}
@@ -310,4 +337,5 @@ public class PdaController {
public ResponseEntity<Object> rgfjskTask(@RequestBody FjReq req) {
return new ResponseEntity<>(pdaService.rgfjskTask(req), HttpStatus.OK);
}
}

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

@@ -2,6 +2,7 @@ package org.nl.wms.pda.service;
import org.nl.wms.pda.service.dao.dto.*;
import org.nl.wms.pda.service.dao.vo.*;
import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
import java.util.List;
@@ -79,4 +80,13 @@ public interface PdaService {
PdaResponseVo rgfjqlTask(FjReq req);
PdaResponseVo rgfjskTask(FjReq req);
List<PdmBdWorkorder> getHnWorkOrder();
List<DropdownListVo> getRgfjPoint();
List<DropdownListVo> getHchjPoint();
List<DropdownListVo> getYjslwPointList();
}

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

@@ -2,6 +2,7 @@ package org.nl.wms.pda.service.dao.mapper;
import org.nl.wms.pda.service.dao.dto.CommonQueryDto;
import org.nl.wms.pda.service.dao.vo.*;
import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import java.util.List;
@@ -71,4 +72,12 @@ public interface PdaMapper {
* @return
*/
List<DropdownListVo> getAllPressPoint();
List<PdmBdWorkorder> getHnWorkOrder();
List<DropdownListVo> getRgfjPoint();
List<DropdownListVo> getHchjPoint();
List<DropdownListVo> getYjslwPointList();
}

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

@@ -149,4 +149,39 @@
p.region_code = 'YZ'
AND p.point_type = '2'
</select>
<select id="getHnWorkOrder" resultType="org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder">
select *
from pdm_bd_workorder
where region_code = 'HN'
and is_delete='0'
</select>
<select id="getRgfjPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT
p.point_code AS `value`,
p.point_name AS text
FROM
`sch_base_point` p
WHERE
p.region_code = 'RGFJ'
</select>
<select id="getHchjPoint" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT
p.point_code AS `value`,
p.point_name AS text
FROM
`sch_base_point` p
WHERE
p.region_code = 'HCHJ'
</select>
<select id="getYjslwPointList" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT
p.point_code AS `value`,
p.point_name AS text
FROM
`sch_base_point` p
WHERE
p.region_code = 'YZ'
AND p.point_type in ('3','4')
</select>
</mapper>

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

@@ -485,6 +485,26 @@ public class PdaServiceImpl implements PdaService {
return PdaResponseVo.pdaResultOk("人工分拣送空请求成功");
}
@Override
public List<PdmBdWorkorder> getHnWorkOrder() {
return pdaMapper.getHnWorkOrder();
}
@Override
public List<DropdownListVo> getRgfjPoint() {
return pdaMapper.getRgfjPoint();
}
@Override
public List<DropdownListVo> getHchjPoint() {
return pdaMapper.getHchjPoint();
}
@Override
public List<DropdownListVo> getYjslwPointList() {
return pdaMapper.getYjslwPointList();
}
/**
* 保存组盘信息
* @param shelfSaveDto

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

@@ -111,6 +111,7 @@ public class DTSKTask extends AbstractTask {
}
private SchBasePoint findNextPoint(List<String> nextRegionStr) {
//固定缓存货架25-28存托盘
List<SchBasePoint> points = dtkMapper.findPointForDTSK(nextRegionStr);
return ObjectUtil.isNotEmpty(points) ? points.get(0) : null;
}

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

@@ -8,6 +8,7 @@
`sch_base_point` p
WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL)
AND p.point_status = '1'
AND p.point_code in ('HCHJ25','HCHJ26','HCHJ27','HCHJ28')
AND p.is_used = 1
AND p.region_code IN
<foreach collection="regionCode" item="code" separator="," open="(" close=")">