diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java index 694756f..be7abdf 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java @@ -434,9 +434,9 @@ public class InboundPdaServiceImpl implements InboundPdaService { jsonMst.put("biz_date", DateUtil.now()); // 组织明细数据 ArrayList tableData = new ArrayList<>(); - HashMap dtl = new HashMap<>(); // GroupPlate plateDao = plateDaoList.get(0); for (GroupPlate plateDao : plateDaoList) { + HashMap dtl = new HashMap<>(); MdMeMaterialbase materDao = iMdMeMaterialbaseService.getByCode(plateDao.getMaterial_code()); dtl.put("storagevehicle_code", plateDao.getStoragevehicle_code()); dtl.put("material_id", materDao.getMaterial_id()); @@ -467,10 +467,11 @@ public class InboundPdaServiceImpl implements InboundPdaService { jsonMst1.put("stor_code", storeDao.getStor_code()); jsonMst1.put("storagevehicle_code", dto.getVehicle_code()); // 组织明细数据 - IOStorInvDtl dtlDao = ioStorInvDtlMapper.selectOne( + List ioStorInvDtls = ioStorInvDtlMapper.selectList( new QueryWrapper().lambda() .eq(IOStorInvDtl::getIostorinv_id, iostorinv_id) ); + IOStorInvDtl dtlDao = ioStorInvDtls.get(0); // 查找分配明细 Map map = new HashMap<>(); map.put("iostorinvdtl_id", dtlDao.getIostorinvdtl_id()); diff --git a/nladmin-ui/src/views/wms/st/purchase/index.vue b/nladmin-ui/src/views/wms/st/purchase/index.vue index fdda189..3093b98 100644 --- a/nladmin-ui/src/views/wms/st/purchase/index.vue +++ b/nladmin-ui/src/views/wms/st/purchase/index.vue @@ -223,7 +223,7 @@ export default { return } const ids = selections.map(s => s.id) - const billIds = selections.map(s => s.bill_id).join('、') + const billIds = selections.map(s => s.order_no).join('、') this.$confirm('确认打印以下单据的物料标签?\n' + billIds, '提示', { confirmButtonText: '确定', cancelButtonText: '取消',