DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-12-17 15:08:27 +08:00
parent 36d9883c32 773971080f
commit 156cd1831a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-wms/src/main/java/com/klp/mapper/WmsDeliveryPlanCoilOperateMapper.java
View File

@@ -22,7 +22,7 @@ public interface WmsDeliveryPlanCoilOperateMapper extends BaseMapperPlus<WmsDeli
* @param coilIds 钢卷ID数组
* @return 操作记录列表
*/
List<WmsDeliveryPlanCoilOperateVo> getCoilOperate(
List<WmsDeliveryPlanCoilOperate> getCoilOperate(
@Param("planId") Long planId,
@Param("coilIds") String[] coilIds
);

7
klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java
View File

@@ -126,7 +126,8 @@ public class WmsDeliveryPlanCoilOperateServiceImpl implements IWmsDeliveryPlanCo
if (coilIdArray.length == 0) {
return Collections.emptyList();
}
List<WmsDeliveryPlanCoilOperateVo> coilOperate = baseMapper.getCoilOperate(planId, coilIdArray);
List<WmsDeliveryPlanCoilOperate> coilOperate = baseMapper.getCoilOperate(planId, coilIdArray);
List<WmsDeliveryPlanCoilOperateVo> coilOperateVos = BeanUtil.copyToList(coilOperate, WmsDeliveryPlanCoilOperateVo.class);
//接着就是根据钢卷ids去查询钢卷list了 用分页查询的list就需要设置分页参数都设置为最大即可
WmsMaterialCoilBo bo = new WmsMaterialCoilBo();
bo.setCoilIds(coilIds);
@@ -139,10 +140,10 @@ public class WmsDeliveryPlanCoilOperateServiceImpl implements IWmsDeliveryPlanCo
Map<Long, WmsMaterialCoilVo> coilDetailMap = coilDetails.stream()
.collect(Collectors.toMap(WmsMaterialCoilVo::getCoilId, coil -> coil));
for (WmsDeliveryPlanCoilOperateVo operate : coilOperate) {
for (WmsDeliveryPlanCoilOperateVo operate : coilOperateVos) {
operate.setCoilDetail(coilDetailMap.get(operate.getCoilId()));
}
return coilOperate;
return coilOperateVos;
}
}