生产管理修改

liweidong
李涛 1 month ago
parent 5cfe04402a
commit 0c2487ef0a
  1. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/PostHandleServiceImpl.java
  2. 21
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
  3. 6
      blade-service/blade-desk/src/main/resources/application-dev.yml

@ -1,9 +1,8 @@
package org.springblade.desk.jobtransfer.service.impl; package org.springblade.desk.jobtransfer.service.impl;
import com.alibaba.csp.sentinel.util.StringUtil;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.desk.basic.pojo.entity.RelTeamSetUser;
import org.springblade.desk.basic.service.IRelTeamSetUserService; import org.springblade.desk.basic.service.IRelTeamSetUserService;
import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity;
import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity;
@ -283,12 +282,12 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
} }
user.setId(postHandle.getUserId()); user.setId(postHandle.getUserId());
// 设置手机号 // 设置手机号
if (StringUtil.isNotBlank(postHandle.getMobile())) { if (StringUtils.isNotBlank(postHandle.getMobile())) {
user.setPhone(postHandle.getMobile()); user.setPhone(postHandle.getMobile());
} }
// 设置岗位 // 设置岗位
if (StringUtil.isNotBlank(postHandle.getStation())) { if (StringUtils.isNotBlank(postHandle.getStation())) {
// 这里可能需要根据岗位名称获取岗位ID // 这里可能需要根据岗位名称获取岗位ID
user.setPostId(postHandle.getStation()); user.setPostId(postHandle.getStation());
} }

@ -1563,27 +1563,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
} }
} }
} }
// 测试数据
ProduceMonitorFileSlotVO fileSlotVO = new ProduceMonitorFileSlotVO();
List<MesRbFilePreserveDetailEntity> childrenList = new ArrayList<>();
MesRbFilePreserveDetailEntity detailEntity = new MesRbFilePreserveDetailEntity();
fileSlotVO.setRfpsType((short) 1);
fileSlotVO.setInsertIndex("1");
fileSlotVO.setSlotIndex("1");
fileSlotVO.setSlotName("测试槽位001");
// detailEntity.setRfpsId(BigDecimal.valueOf(1L));
detailEntity.setRfpsId(1L);
detailEntity.setDetailName("明细名称1");
detailEntity.setDetailIndex("1");
detailEntity.setAsk("工艺要求1");
detailEntity.setRfpdTime("2026-3-6 18:36:44");
detailEntity.setQualified("合格");
detailEntity.setParamName("参数名称1");
detailEntity.setParamValue("参数值1");
childrenList.add(detailEntity);
fileSlotVO.setChildrenList(childrenList);
dsRbFilePreserveSlotList.add(fileSlotVO);
planDataVO.setDsRbFilePreserveSlotList(dsRbFilePreserveSlotList); planDataVO.setDsRbFilePreserveSlotList(dsRbFilePreserveSlotList);
} }
} }

@ -71,6 +71,6 @@ request:
logging: logging:
config: classpath:logback.xml config: classpath:logback.xml
mybatis-plus: #mybatis-plus:
configuration: # configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
Loading…
Cancel
Save