add report

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java

@@ -147,7 +147,6 @@ public class ProduceReportController {
     //获取个人30天内生产报工单，以时间排序
     @GetMapping("/getMyList")
     @Operation(summary = "获得生产报工单")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
     public CommonResult<List<ProduceReportRespVO>> getMyList() {
         Long userId =  getLoginUserId();
         ProduceReportPageReqVO pageReqVO = new ProduceReportPageReqVO();
@@ -158,11 +157,12 @@ public class ProduceReportController {
         return success(produceReportService.buildVOList(reportDOList));
     }
     @GetMapping("/getOtherList")
-    @Operation(summary = "获得近两日的生产报工单")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @Operation(summary = "获得生产报工单")
     public CommonResult<List<ProduceReportRespVO>> getOtherList(ProduceReportPageReqVO pageReqVO) {
-        LocalDateTime[] dateTimes= {LocalDateTime.now().plusDays(-1),LocalDateTime.now()};
-        pageReqVO.setReportDate(dateTimes);
+        if(pageReqVO.getReportDate()==null || pageReqVO.getReportDate().length==0){
+            LocalDateTime[] dateTimes= {LocalDateTime.now().plusDays(-1),LocalDateTime.now()};
+            pageReqVO.setReportDate(dateTimes);
+        }
         List<ProduceReportDO> reportDOList = produceReportService.getList(pageReqVO);
         return success(produceReportService.buildVOList(reportDOList));
     }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportMapper.java

@@ -36,6 +36,7 @@ public interface ProduceReportMapper extends BaseMapperX<ProduceReportDO> {
     default List<ProduceReportDO> selectBy(ProduceReportPageReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProduceReportDO>()
                 .eqIfPresent(ProduceReportDO::getGroupType, reqVO.getGroupType())
+                .eqIfPresent(ProduceReportDO::getReportType, reqVO.getReportType())
                 .eqIfPresent(ProduceReportDO::getUserId, reqVO.getUserId())
                 .betweenIfPresent(ProduceReportDO::getReportDate, reqVO.getReportDate())
                 .eqIfPresent(ProduceReportDO::getOrgType, reqVO.getOrgType())

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/no/MesNoRedisDAO.java

@@ -58,6 +58,12 @@ public class MesNoRedisDAO {
      * 关键件编码
      */
     public static final String ORG_COMPONENT = "COM-";
+
+    /**
+     * 生产报工
+     */
+    public static final String REPORT_NO_PREFIX = "WR-";
+
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java

@@ -11,10 +11,12 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.producereport.ProduceReportDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.producereport.ProduceReportDetailDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.producereport.ProduceReportDetailMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.producereport.ProduceReportMapper;
+import cn.iocoder.yudao.module.mes.dal.redis.no.MesNoRedisDAO;
 import cn.iocoder.yudao.module.mes.service.changerecord.ProduceReportChangeRecordService;
 import cn.iocoder.yudao.module.mes.service.organization.OrganizationService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -49,6 +51,8 @@ public class ProduceReportServiceImpl implements ProduceReportService {
     private ProduceReportChangeRecordService produceReportChangeRecordService;
     @Resource
     private ProduceReportDetailService produceReportDetailService;
+    @Resource
+    private MesNoRedisDAO noRedisDAO;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -56,6 +60,11 @@ public class ProduceReportServiceImpl implements ProduceReportService {
         createReqVO.setReportStatus(ReportStatusEnum.草稿.getValue());
         // 插入
         ProduceReportDO produceReport = BeanUtils.toBean(createReqVO, ProduceReportDO.class);
+        if (StringUtils.isEmpty(createReqVO.getReportCode())) {
+            // 1.4 生成订单号，并校验唯一性
+            String no = noRedisDAO.generate3(MesNoRedisDAO.REPORT_NO_PREFIX);
+            produceReport.setReportCode(no);
+        }
         produceReportMapper.insert(produceReport);
 
         // 插入子表