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-06-26 16:48:51 +08:00
parent 5eb0522497
commit e34b778f12
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java
View File

@@ -434,9 +434,9 @@ public class InboundPdaServiceImpl implements InboundPdaService {
jsonMst.put("biz_date", DateUtil.now()); jsonMst.put("biz_date", DateUtil.now());
// 组织明细数据 // 组织明细数据
ArrayList<HashMap> tableData = new ArrayList<>(); ArrayList<HashMap> tableData = new ArrayList<>();
HashMap<String, Object> dtl = new HashMap<>();
// GroupPlate plateDao = plateDaoList.get(0); // GroupPlate plateDao = plateDaoList.get(0);
for (GroupPlate plateDao : plateDaoList) { for (GroupPlate plateDao : plateDaoList) {
HashMap<String, Object> dtl = new HashMap<>();
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getByCode(plateDao.getMaterial_code()); MdMeMaterialbase materDao = iMdMeMaterialbaseService.getByCode(plateDao.getMaterial_code());
dtl.put("storagevehicle_code", plateDao.getStoragevehicle_code()); dtl.put("storagevehicle_code", plateDao.getStoragevehicle_code());
dtl.put("material_id", materDao.getMaterial_id()); 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("stor_code", storeDao.getStor_code());
jsonMst1.put("storagevehicle_code", dto.getVehicle_code()); jsonMst1.put("storagevehicle_code", dto.getVehicle_code());
// 组织明细数据 // 组织明细数据
IOStorInvDtl dtlDao = ioStorInvDtlMapper.selectOne( List<IOStorInvDtl> ioStorInvDtls = ioStorInvDtlMapper.selectList(
new QueryWrapper<IOStorInvDtl>().lambda() new QueryWrapper<IOStorInvDtl>().lambda()
.eq(IOStorInvDtl::getIostorinv_id, iostorinv_id) .eq(IOStorInvDtl::getIostorinv_id, iostorinv_id)
); );
IOStorInvDtl dtlDao = ioStorInvDtls.get(0);
// 查找分配明细 // 查找分配明细
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("iostorinvdtl_id", dtlDao.getIostorinvdtl_id()); map.put("iostorinvdtl_id", dtlDao.getIostorinvdtl_id());

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

@@ -223,7 +223,7 @@ export default {
return return
} }
const ids = selections.map(s => s.id) 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, '提示', { this.$confirm('确认打印以下单据的物料标签？\n' + billIds, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',