root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt：调整换托组盘接口

Browse Source
This commit is contained in:
zhaoyf
2026-08-18 17:28:18 +08:00
parent 11592ab6b1
commit 1389507ede
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
View File

@@ -36,7 +36,6 @@ import org.nl.wms.pda_manage.outBound.dto.ContainerItemDto;
import org.nl.wms.pda_manage.outBound.dto.LineSideDto; import org.nl.wms.pda_manage.outBound.dto.LineSideDto;
import org.nl.wms.pda_manage.util.PdaResponse; import org.nl.wms.pda_manage.util.PdaResponse;
import org.nl.wms.pm_manage.demand.service.IPmDemandService; import org.nl.wms.pm_manage.demand.service.IPmDemandService;
import org.nl.wms.pm_manage.demand.service.dao.PmDemand;
import org.nl.wms.sch_manage.enums.StatusEnum; import org.nl.wms.sch_manage.enums.StatusEnum;
import org.nl.wms.sch_manage.enums.TaskEnum; import org.nl.wms.sch_manage.enums.TaskEnum;
import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBasePointService;
@@ -782,17 +781,20 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
if (StringUtils.isEmpty(code)){ if (StringUtils.isEmpty(code)){
throw new BadRequestException("请求条码内容为空"); throw new BadRequestException("请求条码内容为空");
} }
List<PmDemand> demandList = pmDemandService.list(new LambdaQueryWrapper<PmDemand>()
.ne(PmDemand::getIs_deleted, 1)
.eq(PmDemand::getLk_container, code));
List<ContainerItemDto> dtos = new ArrayList<>(); List<ContainerItemDto> dtos = new ArrayList<>();
for (PmDemand pmDemand : demandList) { if(code.startsWith("E5")){
ContainerItemDto containerItemDto = new ContainerItemDto(); //TODO 获取中鼎组盘信息
containerItemDto.setMaterial_name(pmDemand.getSku_name()); }else{
containerItemDto.setMaterial_code(pmDemand.getSku_code()); List<GroupPlate> groupPlateList = iMdPbGroupplateService.list(new LambdaQueryWrapper<GroupPlate>()
containerItemDto.setLoad_port(pmDemand.getTarget_area()); .eq(GroupPlate::getStoragevehicle_code, code)
containerItemDto.setQty(pmDemand.getQty()); .eq(GroupPlate::getStatus, GROUP_PLATE_STATUS.code("入库")));
dtos.add(containerItemDto); for (GroupPlate groupPlate : groupPlateList) {
MdMeMaterialbase material = iMdMeMaterialbaseService.getByCode(groupPlate.getMaterial_code());
ContainerItemDto containerItemDto = new ContainerItemDto();
containerItemDto.setMaterial_name(material.getMaterial_name());
containerItemDto.setMaterial_code(groupPlate.getMaterial_code());
dtos.add(containerItemDto);
}
} }
return dtos; return dtos;
} }

2
nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/PdaIosOutController.java
View File

@@ -136,7 +136,7 @@ public class PdaIosOutController {
} }
@GetMapping("/getContainerItem") @GetMapping("/getContainerItem")
@Log("根据容器编号获取立库托盘物料信息") @Log("根据容器编号获取托盘物料信息")
public ResponseEntity getContainerItemByCode(String code){ public ResponseEntity getContainerItemByCode(String code){
List<ContainerItemDto> list = pdaIosOutService.getContainerItemByCode(code); List<ContainerItemDto> list = pdaIosOutService.getContainerItemByCode(code);
return ResponseData.build(list, HttpStatus.OK); return ResponseData.build(list, HttpStatus.OK);

2
nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -442,7 +442,7 @@ export default {
const assQty = dtl.assign_qty || '' const assQty = dtl.assign_qty || ''
const vehicle_type = dtl.vehicle_type || '' const vehicle_type = dtl.vehicle_type || ''
const source_load_port = dtl.source_load_port || '' const source_load_port = dtl.source_load_port || ''
const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#' + source_load_port + '#' const qrText = orderNo + '#' + vehicle_type + '#' + skuCode + '#' + skuName + '##' + qty + '#' + source_load_port + '#'
const imgSrc = await QRCode.toDataURL(qrText, { const imgSrc = await QRCode.toDataURL(qrText, {
width: 300 width: 300
}) })