diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWetMaterialPlanDetail.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWetMaterialPlanDetail.java index 6232b3b8..8de08b31 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWetMaterialPlanDetail.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWetMaterialPlanDetail.java @@ -97,6 +97,17 @@ public class ProWetMaterialPlanDetail extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private Date productDate; + // 料罐名称 + private String bucketName; + + public String getBucketName() { + return bucketName; + } + + public void setBucketName(String bucketName) { + this.bucketName = bucketName; + } + public String getId() { return id; } @@ -284,6 +295,7 @@ public class ProWetMaterialPlanDetail extends BaseEntity { .append("planTime",getPlanTime()) .append("workorderCode",getWorkorderCode()) .append("productDate",getProductDate()) + .append("bucketName",getBucketName()) .toString(); } } \ No newline at end of file diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWetMaterialPlanMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWetMaterialPlanMapper.java index 8943fab1..43e0876d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWetMaterialPlanMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWetMaterialPlanMapper.java @@ -120,4 +120,12 @@ public interface ProWetMaterialPlanMapper { * @return */ String selectWetMaterialPlanByPlanTime(Date planTime); + + /** + * 通过料罐id查询料罐名称 + * + * @param bucketId + * @return + */ + String selectBucketNameById(String bucketId); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java index 9b312dff..eb48daca 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java @@ -219,9 +219,10 @@ public class ProWetMaterialPlanServiceImpl implements IProWetMaterialPlanService @DS("#header.poolName") public AjaxResult getWetMaterialPlanDetailListById(String id) { List detailList = proWetMaterialPlanDetailMapper.selectProWetMaterialPlanDetailListById(id); - // 获取班次名称 + // 获取班次名称和料罐名称 for (int i = 0;i < detailList.size();i++){ detailList.get(i).setShiftDesc(proWetMaterialPlanMapper.selectShiftById(String.valueOf(detailList.get(i).getShiftId()))); + detailList.get(i).setBucketName(proWetMaterialPlanMapper.selectBucketNameById(detailList.get(i).getBucketId())); } return success(detailList); } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanDetailMapper.xml index 99660b51..59176350 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanDetailMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProWetMaterialPlanDetailMapper.xml @@ -65,7 +65,7 @@ - + + + insert into pro_wet_material_plan id,