diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java index 4a47fd517..4b3738e05 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java @@ -22,6 +22,7 @@ public enum MesApprovalRecordBizTypeEnum { BATCH_PLANNING_CATEGORY("槽液计划类/审核"), BATCH_PLANNING_TASK("槽液任务/审核"), PLATE_GOODS_RECORD("镀层物料需求申报/审核"), + PLATE_GOODS_APPLY("镀层物料添加量申报/审核"), ; private final String desc; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java index d5d84dbcf..6de6be0dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java @@ -10,6 +10,8 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; +import org.springblade.desk.common.service.IMesApprovalRecordService; import org.springblade.desk.order.mapper.PlateGoodsApplyMapper; import org.springblade.desk.order.pojo.entity.AssayContentDetail; import org.springblade.desk.order.pojo.entity.PlateGoodsApply; @@ -18,6 +20,7 @@ import org.springblade.desk.order.pojo.entity.PlateGoodsRecord; import org.springblade.desk.order.pojo.enums.AssayContentEnum; import org.springblade.desk.order.pojo.enums.PlateGoodsEnum; import org.springblade.desk.order.service.*; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +43,9 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl selectPage(IPage page, PlateGoodsApply entity) { List dataList = baseMapper.selectPage(page, entity); @@ -60,6 +66,14 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl goodsApplyDetailList = new ArrayList<>(); for (PlateGoodsRecord goodsRecord : addRecordList) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java index 938e1d697..24021f04c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java @@ -614,6 +614,14 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl