diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index 3792b93..0456d1d 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -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.util.PdaResponse; 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.TaskEnum; import org.nl.wms.sch_manage.service.ISchBasePointService; @@ -782,17 +781,20 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { if (StringUtils.isEmpty(code)){ throw new BadRequestException("请求条码内容为空"); } - List demandList = pmDemandService.list(new LambdaQueryWrapper() - .ne(PmDemand::getIs_deleted, 1) - .eq(PmDemand::getLk_container, code)); List dtos = new ArrayList<>(); - for (PmDemand pmDemand : demandList) { - ContainerItemDto containerItemDto = new ContainerItemDto(); - containerItemDto.setMaterial_name(pmDemand.getSku_name()); - containerItemDto.setMaterial_code(pmDemand.getSku_code()); - containerItemDto.setLoad_port(pmDemand.getTarget_area()); - containerItemDto.setQty(pmDemand.getQty()); - dtos.add(containerItemDto); + if(code.startsWith("E5")){ + //TODO 获取中鼎组盘信息 + }else{ + List groupPlateList = iMdPbGroupplateService.list(new LambdaQueryWrapper() + .eq(GroupPlate::getStoragevehicle_code, code) + .eq(GroupPlate::getStatus, GROUP_PLATE_STATUS.code("入库"))); + 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; } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/PdaIosOutController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/PdaIosOutController.java index cca88cc..be32aa4 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/PdaIosOutController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/PdaIosOutController.java @@ -136,7 +136,7 @@ public class PdaIosOutController { } @GetMapping("/getContainerItem") - @Log("根据容器编号获取立库托盘物料信息") + @Log("根据容器编号获取托盘物料信息") public ResponseEntity getContainerItemByCode(String code){ List list = pdaIosOutService.getContainerItemByCode(code); return ResponseData.build(list, HttpStatus.OK); diff --git a/nladmin-ui/src/views/wms/st/outbill/index.vue b/nladmin-ui/src/views/wms/st/outbill/index.vue index aad1299..e58dd50 100644 --- a/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -442,7 +442,7 @@ export default { const assQty = dtl.assign_qty || '' const vehicle_type = dtl.vehicle_type || '' 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, { width: 300 })