diff --git a/heli-app/src/pages/index/index.vue b/heli-app/src/pages/index/index.vue index 7539463..34fea6b 100644 --- a/heli-app/src/pages/index/index.vue +++ b/heli-app/src/pages/index/index.vue @@ -18,7 +18,7 @@ const categoryList = ref([ }, { path: 'unqualifiedNotification', - name: '品质异常通知', + name: '品质异常审核', auth: false, imgUrl: '/static/images/unqualifiedNotification.png', defaultImgUrl: '/static/images/unqualifiedNotification-default.png', diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/BgMasterLineController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/BgMasterLineController.java index d283e4d..5dee2f7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/BgMasterLineController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/BgMasterLineController.java @@ -49,6 +49,7 @@ public class BgMasterLineController { } + @PostMapping("/create") @Operation(summary = "创建过程检报工") @PreAuthorize("@ss.hasPermission('heli:bg-master-line:create')") @@ -73,6 +74,8 @@ public class BgMasterLineController { return success(true); } + + @GetMapping("/get") @Operation(summary = "获得过程检报工") @Parameter(name = "id", description = "编号", required = true, example = "1024") @@ -81,7 +84,13 @@ public class BgMasterLineController { BgMasterLineDO bgMasterLine = bgMasterLineService.getBgMasterLine(id); return success(BeanUtils.toBean(bgMasterLine, BgMasterLineRespVO.class)); } - + @GetMapping("/validExceed") + @Operation(summary = "获得过程检报工") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:bg-master-line:query')") + public CommonResult validExceed(@RequestParam("id") Long id,@RequestParam("amount") Integer amount) { + return success(bgMasterLineService.validExceed(id,amount)); + } @GetMapping("/page") @Operation(summary = "获得过程检报工分页") @PreAuthorize("@ss.hasPermission('heli:bg-master-line:query')") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLinePageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLinePageReqVO.java index 9e2ba62..da06b5a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLinePageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLinePageReqVO.java @@ -38,6 +38,15 @@ public class BgMasterLinePageReqVO extends PageParam { @Schema(description = "工时") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private BigDecimal[] workTime; -} \ No newline at end of file + private BigDecimal[] workTime; + private String userName; + private Integer isRepre; + private Integer isQua; + private String remark; + private Integer notificationStatus; + private Integer conStatus; + private String auditOpinion; + private Integer auditor; + private LocalDateTime audit_time; +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLineRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLineRespVO.java index c66c51b..fe52779 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLineRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLineRespVO.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.bgmasterline.vo; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -53,5 +54,13 @@ public class BgMasterLineRespVO { @Schema(description = "报工人") @ExcelProperty("报工人") private String userName; - -} \ No newline at end of file + private Integer isRepre; + private Integer isQua; + private String remark; + private Integer notificationStatus; + private Integer conStatus; + private String auditOpinion; + private Integer auditor; + private LocalDateTime audit_time; + private List fileUrlList; +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLineSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLineSaveReqVO.java index 4ee2dc6..d138077 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLineSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bgmasterline/vo/BgMasterLineSaveReqVO.java @@ -1,37 +1,47 @@ -package com.chanko.yunxi.mes.module.heli.controller.admin.bgmasterline.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 过程检报工新增/修改 Request VO") -@Data -public class BgMasterLineSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "11518") - private Integer id; - - @Schema(description = "过程检ID", example = "1862") - private Integer zjId; - - @Schema(description = "过程检明细id", example = "10005") - private Integer zjMxId; - - @Schema(description = "报工人") - private String bgUser; - - @Schema(description = "报工数量") - private Integer amount; - - @Schema(description = "报工时间") - private LocalDateTime bgTime; - - @Schema(description = "工时") - private BigDecimal workTime; - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.controller.admin.bgmasterline.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 过程检报工新增/修改 Request VO") +@Data +public class BgMasterLineSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "11518") + private Integer id; + + @Schema(description = "过程检ID", example = "1862") + private Integer zjId; + + @Schema(description = "过程检明细id", example = "10005") + private Long zjMxId; + + @Schema(description = "报工人") + private String bgUser; + + @Schema(description = "报工数量") + private Integer amount; + + @Schema(description = "报工时间") + private LocalDateTime bgTime; + + @Schema(description = "工时") + private BigDecimal workTime; + + private Integer isRepre; + private Integer isQua; + private String remark; + private Integer type; + private String userName; + private Integer notificationStatus; + private Integer conStatus; + private String auditOpinion; + private Integer auditor; + private LocalDateTime audit_time; +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java index a1a75f6..cc5ade3 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java @@ -62,7 +62,7 @@ public class PgMasterController { @PostMapping("/zfPgMaster") @Operation(summary = "作废过程检验派工单") @PreAuthorize("@ss.hasPermission('heli:pg-master:create')") - public CommonResult zfPgMaster(@RequestParam("id") Integer id) { + public CommonResult zfPgMaster(@RequestParam("id") Long id) { return success(pgMasterService.zfPgMaster(id)); } @@ -104,6 +104,7 @@ public class PgMasterController { @PreAuthorize("@ss.hasPermission('heli:pg-master:query')") public CommonResult> getPgMasterPage(@Valid PgMasterPageReqVO pageReqVO) { PageResult pageResult = pgMasterService.getPgMasterPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, PgMasterRespVO.class)); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java index 7314a7c..09ca57c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java @@ -65,7 +65,7 @@ public class UnqualifiedNotificationController { @PostMapping("/createWx") @Operation(summary = "创建品质异常通知单审核Wx") @PreAuthorize("@ss.hasPermission('heli:unqualified-notification:create')") - public CommonResult uploadFile(@RequestParam("file") MultipartFile file,@RequestHeader("id") String id) { + public CommonResult uploadFile(@RequestParam("file") MultipartFile file,@RequestHeader("id") String id,@RequestHeader("type") String type) { if (file.isEmpty()) { System.out.println(file); return error(500,"The file is empty."); @@ -94,7 +94,9 @@ public class UnqualifiedNotificationController { fileDO.setUnqualifiedId(Long.valueOf(id)); fileDO.setFileName(fileName); fileDO.setFileUrl( HeliWebConfiguration.FILE_URL+id+"/"+fileName); - + if (type != null){ + fileDO.setType(Integer.valueOf(type)); + } fileDO.setFilePath(directory+id+"/" + fileName); unqualifiedNotificationFileService.createUnqualifiedNotificationFile(fileDO); return success("File uploaded successfully: " + fileName); @@ -148,7 +150,7 @@ public class UnqualifiedNotificationController { if(CollUtil.isNotEmpty(list)){ for (UnqualifiedNotificationDO unqualifiedNotificationDO : list) { List fileUrlList = new ArrayList<>(); - List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId()); + List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId(),0); if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){ for (UnqualifiedNotificationFileDO unqualifiedNotificationFileDO : unqualifiedNotificationFileDOS) { fileUrlList.add(unqualifiedNotificationFileDO.getFileUrl()); @@ -160,7 +162,29 @@ public class UnqualifiedNotificationController { return success(BeanUtils.toBean(unqualifiedNotificationPage, UnqualifiedNotificationRespVO.class)); } + @GetMapping("/pageWx") + @Operation(summary = "获得品质异常通知单审核分页") + @PreAuthorize("@ss.hasPermission('heli:unqualified-notification:query')") + public CommonResult> getUnqualifiedNotificationPageWx(@Valid UnqualifiedNotificationPageReqVO pageReqVO) { + int i = pageReqVO.getPageNo() * pageReqVO.getPageSize(); + pageReqVO.setPageNum(i); + PageResult unqualifiedNotificationPage = unqualifiedNotificationService.getUnqualifiedNotificationPageWx(pageReqVO); +// List list = unqualifiedNotificationPage.getList(); +// if(CollUtil.isNotEmpty(list)){ +// for (UnqualifiedNotificationDO unqualifiedNotificationDO : list) { +// List fileUrlList = new ArrayList<>(); +// List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId(),0); +// if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){ +// for (UnqualifiedNotificationFileDO unqualifiedNotificationFileDO : unqualifiedNotificationFileDOS) { +// fileUrlList.add(unqualifiedNotificationFileDO.getFileUrl()); +// } +// unqualifiedNotificationDO.setFileUrlList(fileUrlList); +// } +// } +// } + return success(unqualifiedNotificationPage); + } @GetMapping("/export-excel") @Operation(summary = "导出品质异常通知单审核 Excel") @PreAuthorize("@ss.hasPermission('heli:unqualified-notification:export')") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationPageReqVO.java index 1bcccd8..8a3346f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationPageReqVO.java @@ -82,6 +82,7 @@ public class UnqualifiedNotificationPageReqVO extends PageParam { @Schema(description = "创建人名称") private String creatorName; + private Integer pageNum; @Schema(description = "最小创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime minCreateTime; @@ -89,4 +90,6 @@ public class UnqualifiedNotificationPageReqVO extends PageParam { @Schema(description = "最大创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime maxCreateTime; + + private Integer queryType; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/ZjBgMasterLineController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/ZjBgMasterLineController.java index fa0040f..42d1c28 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/ZjBgMasterLineController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/ZjBgMasterLineController.java @@ -45,7 +45,13 @@ public class ZjBgMasterLineController { public CommonResult endBg(@Valid @RequestBody ZjBgMasterLineSaveReqVO createReqVO) { return success(zjBgMasterLineService.updateBgMasterLines(createReqVO)); } - + @GetMapping("/validExceed") + @Operation(summary = "获得过程检报工") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:bg-master-line:query')") + public CommonResult validExceed(@RequestParam("id") Long id,@RequestParam("amount") Integer amount) { + return success(zjBgMasterLineService.validExceed(id,amount)); + } @PostMapping("/create") @Operation(summary = "创建终检报工") @@ -69,7 +75,7 @@ public class ZjBgMasterLineController { @Operation(summary = "删除终检报工") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('heli:zj-bg-master-line:delete')") - public CommonResult deleteZjBgMasterLine(@RequestParam("id") Integer id) { + public CommonResult deleteZjBgMasterLine(@RequestParam("id") Long id) { zjBgMasterLineService.deleteZjBgMasterLine(id); return success(true); } @@ -78,7 +84,7 @@ public class ZjBgMasterLineController { @Operation(summary = "获得终检报工") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('heli:zj-bg-master-line:query')") - public CommonResult getZjBgMasterLine(@RequestParam("id") Integer id) { + public CommonResult getZjBgMasterLine(@RequestParam("id") Long id) { ZjBgMasterLineDO zjBgMasterLine = zjBgMasterLineService.getZjBgMasterLine(id); return success(BeanUtils.toBean(zjBgMasterLine, ZjBgMasterLineRespVO.class)); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/vo/ZjBgMasterLineRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/vo/ZjBgMasterLineRespVO.java index c1d6bf0..43222a0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/vo/ZjBgMasterLineRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/vo/ZjBgMasterLineRespVO.java @@ -53,5 +53,14 @@ public class ZjBgMasterLineRespVO { @Schema(description = "报工人") @ExcelProperty("报工人") private String userName; + private Integer isRepre; + private Integer isQua; + private String remark; + private Integer notificationStatus; + private Integer conStatus; + private String auditOpinion; + private Integer auditor; + private LocalDateTime audit_time; + private List fileUrlList; -} \ No newline at end of file +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/vo/ZjBgMasterLineSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/vo/ZjBgMasterLineSaveReqVO.java index 6259db0..62e2387 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/vo/ZjBgMasterLineSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjbgmasterline/vo/ZjBgMasterLineSaveReqVO.java @@ -1,37 +1,46 @@ -package com.chanko.yunxi.mes.module.heli.controller.admin.zjbgmasterline.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 终检报工新增/修改 Request VO") -@Data -public class ZjBgMasterLineSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24341") - private Integer id; - - @Schema(description = "终检ID", example = "30462") - private Integer zjId; - - @Schema(description = "终检检明细id", example = "21667") - private Integer zjMxId; - - @Schema(description = "报工人") - private String bgUser; - - @Schema(description = "报工数量") - private Integer amount; - - @Schema(description = "报工时间") - private LocalDateTime bgTime; - - @Schema(description = "工时") - private BigDecimal workTime; - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.controller.admin.zjbgmasterline.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 终检报工新增/修改 Request VO") +@Data +public class ZjBgMasterLineSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24341") + private Long id; + + @Schema(description = "终检ID", example = "30462") + private Integer zjId; + + @Schema(description = "终检检明细id", example = "21667") + private Long zjMxId; + + @Schema(description = "报工人") + private String bgUser; + + @Schema(description = "报工数量") + private Integer amount; + + @Schema(description = "报工时间") + private LocalDateTime bgTime; + + @Schema(description = "工时") + private BigDecimal workTime; + private Integer isRepre; + private Integer isQua; + private String remark; + private Integer type; + private String userName; + private Integer notificationStatus; + private Integer conStatus; + private String auditOpinion; + private Integer auditor; + private LocalDateTime audit_time; +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java index 5b85d60..ab55de0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java @@ -55,7 +55,7 @@ public class ZjPgMasterController { @PostMapping("/zfZjPgMaster") @Operation(summary = "作废终检派工单") @PreAuthorize("@ss.hasPermission('heli:zj-pg-master:create')") - public CommonResult zfZjPgMaster(@RequestParam("id") Integer id) { + public CommonResult zfZjPgMaster(@RequestParam("id") Long id) { return success(zjPgMasterService.zfZjPgMaster(id)); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/bgmasterline/BgMasterLineDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/bgmasterline/BgMasterLineDO.java index 0c2caba..463c819 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/bgmasterline/BgMasterLineDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/bgmasterline/BgMasterLineDO.java @@ -28,7 +28,7 @@ public class BgMasterLineDO extends BaseDO { * 主键 */ @TableId - private Integer id; + private Long id; /** * 过程检ID */ @@ -36,7 +36,7 @@ public class BgMasterLineDO extends BaseDO { /** * 过程检明细id */ - private Integer zjMxId; + private Long zjMxId; /** * 报工人 */ @@ -60,5 +60,14 @@ public class BgMasterLineDO extends BaseDO { @TableField(exist = false) private String userName; - -} \ No newline at end of file + private Integer isRepre; + private Integer isQua; + private String remark; + private Integer notificationStatus; + private Integer conStatus; + private String auditOpinion; + private Integer auditor; + private LocalDateTime audit_time; + @TableField(exist = false) + private List fileUrlList; +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java index d802c35..a432df9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java @@ -94,7 +94,6 @@ public class UnqualifiedNotificationDO extends BaseDO { * 审核时间 */ private LocalDateTime auditTime; - @TableField(exist = false) private String projectName; @@ -139,7 +138,10 @@ public class UnqualifiedNotificationDO extends BaseDO { @TableField(exist = false) private String creatorName; - + @TableField(exist = false) + private Integer totalAmount; + @TableField(exist = false) + private String typeName; @TableField(exist = false) private String statisticAmount; @TableField(exist = false) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotificationfile/UnqualifiedNotificationFileDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotificationfile/UnqualifiedNotificationFileDO.java index 1539f9c..9ec14d7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotificationfile/UnqualifiedNotificationFileDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotificationfile/UnqualifiedNotificationFileDO.java @@ -41,4 +41,5 @@ public class UnqualifiedNotificationFileDO extends BaseDO { private String fileName; private String filePath; private String fileUrl; + private Integer type; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjbgmasterline/ZjBgMasterLineDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjbgmasterline/ZjBgMasterLineDO.java index 6a400fa..a26024b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjbgmasterline/ZjBgMasterLineDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjbgmasterline/ZjBgMasterLineDO.java @@ -28,7 +28,7 @@ public class ZjBgMasterLineDO extends BaseDO { * 主键 */ @TableId - private Integer id; + private Long id; /** * 终检ID */ @@ -36,7 +36,7 @@ public class ZjBgMasterLineDO extends BaseDO { /** * 终检检明细id */ - private Integer zjMxId; + private Long zjMxId; /** * 报工人 */ @@ -61,6 +61,15 @@ public class ZjBgMasterLineDO extends BaseDO { @TableField(exist = false) private String userName; + private Integer isRepre; + private Integer isQua; + private String remark; + private Integer notificationStatus; + private Integer conStatus; + private String auditOpinion; + private Integer auditor; + private LocalDateTime audit_time; + @TableField(exist = false) + private List fileUrlList; - -} \ No newline at end of file +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bgmasterline/BgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bgmasterline/BgMasterLineMapper.java index 02619e0..553c427 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bgmasterline/BgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/bgmasterline/BgMasterLineMapper.java @@ -30,7 +30,8 @@ public interface BgMasterLineMapper extends BaseMapperX { .select("u2.username as userName") .leftJoin("system_users u2 on u2.id = t.bg_user") ; - query.eq(BgMasterLineDO::getZjMxId, reqVO.getZjMxId()); + query.eq(BgMasterLineDO::getZjMxId, reqVO.getZjMxId()) + .orderByDesc(BgMasterLineDO::getId); return selectPage(reqVO, query); @@ -46,7 +47,7 @@ public interface BgMasterLineMapper extends BaseMapperX { .orderByDesc(BgMasterLineDO::getId)) ;*/ } - default BgMasterLineDO selectSum(Integer zjMxId) { + default BgMasterLineDO selectSum(Long zjMxId) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.select("SUM(t.amount) as amount ,SUM(t.work_time) as workTime"); @@ -57,7 +58,19 @@ public interface BgMasterLineMapper extends BaseMapperX { return selectOne(query); } - default BgMasterLineDO selectEnd(Integer zjMxId) { + default BgMasterLineDO selectCountUn(Integer type) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.select("count(1) as amount"); + + + query + .eq(BgMasterLineDO::getNotificationStatus,type) + + ; + + return selectOne(query); + } + default BgMasterLineDO selectEnd(Long zjMxId) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); @@ -67,5 +80,15 @@ public interface BgMasterLineMapper extends BaseMapperX { return selectOne(query); } + default BgMasterLineDO selectLast(Long zjMxId) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); -} \ No newline at end of file + + query.eq( BgMasterLineDO::getZjMxId, zjMxId) + .orderByDesc(BgMasterLineDO::getId) + .last("limit 1"); + ; + + return selectOne(query); + } +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java index c321fc6..64a9eec 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java @@ -72,6 +72,13 @@ public interface UnqualifiedNotificationMapper extends BaseMapperX selectPageWx( @Param("queryType") Integer queryType, + @Param("offset") Integer offset, + @Param("limit") Integer limit); default UnqualifiedNotificationDO selectById(Long id) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotificationfile/UnqualifiedNotificationFileMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotificationfile/UnqualifiedNotificationFileMapper.java index 1f686e8..e38aeef 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotificationfile/UnqualifiedNotificationFileMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotificationfile/UnqualifiedNotificationFileMapper.java @@ -18,9 +18,10 @@ import java.util.List; @Mapper public interface UnqualifiedNotificationFileMapper extends BaseMapperX { - default List queryUnqualifiedNotificationFileBySuperId(Long unqualifiedId){ + default List queryUnqualifiedNotificationFileBySuperId(Long unqualifiedId,Integer type){ MPJLambdaWrapper query = new MPJLambdaWrapper<>(); - query.eq(UnqualifiedNotificationFileDO::getUnqualifiedId,unqualifiedId); + query.eq(UnqualifiedNotificationFileDO::getUnqualifiedId,unqualifiedId) + .eq(UnqualifiedNotificationFileDO::getType,type); return selectList(query); } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjbgmasterline/ZjBgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjbgmasterline/ZjBgMasterLineMapper.java index 8d3933c..3b19f1e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjbgmasterline/ZjBgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjbgmasterline/ZjBgMasterLineMapper.java @@ -42,7 +42,7 @@ public interface ZjBgMasterLineMapper extends BaseMapperX { .orderByDesc(ZjBgMasterLineDO::getId));*/ } - default ZjBgMasterLineDO selectSum(Integer zjMxId) { + default ZjBgMasterLineDO selectSum(Long zjMxId) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.select("SUM(t.amount) as amount ,SUM(t.work_time) as workTime"); @@ -54,15 +54,25 @@ public interface ZjBgMasterLineMapper extends BaseMapperX { return selectOne(query); } - default ZjBgMasterLineDO selectEnd(Integer zjMxId) { + default ZjBgMasterLineDO selectEnd(Long zjMxId) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); - query.eq( BgMasterLineDO::getZjMxId, zjMxId) - .isNull(BgMasterLineDO::getAmount) + query.eq( ZjBgMasterLineDO::getZjMxId, zjMxId) + .isNull(ZjBgMasterLineDO::getAmount) ; return selectOne(query); } + default ZjBgMasterLineDO selectLast(Long zjMxId) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); -} \ No newline at end of file + + query.eq( BgMasterLineDO::getZjMxId, zjMxId) + .orderByDesc(ZjBgMasterLineDO::getId) + .last("limit 1"); + ; + + return selectOne(query); + } +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineService.java index 84c2440..19d6fd0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineService.java @@ -51,7 +51,7 @@ public interface BgMasterLineService { * @return 过程检报工 */ BgMasterLineDO getBgMasterLine(Integer id); - + public boolean validExceed(Long zjmxId,Integer amount); /** * 获得过程检报工分页 * diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java index 92de164..005477f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java @@ -1,14 +1,18 @@ package com.chanko.yunxi.mes.module.heli.service.bgmasterline; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotification.UnqualifiedNotificationDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotificationfile.UnqualifiedNotificationFileDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterLineMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper; +import com.chanko.yunxi.mes.module.heli.service.unqualifiednotificationfile.UnqualifiedNotificationFileService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -43,39 +47,65 @@ public class BgMasterLineServiceImpl implements BgMasterLineService { private PgMasterLineMapper pgMasterLineMapper; @Resource private TaskDispatchDetailMapper taskDispatchDetailMapper; + @Resource + private UnqualifiedNotificationFileService unqualifiedNotificationFileService; - - //结束本次报工 @Override - public Integer updateBgMasterLines(BgMasterLineSaveReqVO createReqVO){ - if(createReqVO.getAmount() == null || createReqVO.getWorkTime() == null){ - throw exception(TASK_REPORT_PARAMS_ERROR); - } - + public boolean validExceed(Long zjmxId,Integer amount){ //先取出总的派工数量和预计工时 - PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectById(createReqVO.getZjMxId()); + PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectById(zjmxId); //然后再取出这条ID明细ID下的所有工时和报工数量相加 - BgMasterLineDO bgMasterLineDO = bgMasterLineMapper.selectSum(createReqVO.getZjMxId()); + BgMasterLineDO bgMasterLineDO = bgMasterLineMapper.selectSum(zjmxId); //然后加上用户传入的当前的工时和查出的工时进行相加，进行判断 int value1 = 0; if(bgMasterLineDO!=null){ //然后加上用户传入的当前的工时和查出的工时进行相加，进行判断 - value1 = bgMasterLineDO.getAmount()+createReqVO.getAmount(); + value1 = bgMasterLineDO.getAmount()+amount; }else{ - value1 = createReqVO.getAmount(); + value1 = amount; } - //先判断报工数量是否大于派工数量 - if(value1>pgMasterLineDO.getAmount()){ - //这个地方返回错误：报工数量不允许超过派工数量请检查 - throw exception(TASK_REPORT_PARAMS_ERRORS); - }else{ + return value1>pgMasterLineDO.getAmount(); + } + + //结束本次报工 + @Override + public Integer updateBgMasterLines(BgMasterLineSaveReqVO createReqVO){ + //非结束时判断 + if (createReqVO.getType() != null && createReqVO.getType() != 0){ + if(createReqVO.getAmount() == null || createReqVO.getWorkTime() == null){ + throw exception(TASK_REPORT_PARAMS_ERROR); + } + } + + +// +// //先取出总的派工数量和预计工时 + PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectById(createReqVO.getZjMxId()); +// //然后再取出这条ID明细ID下的所有工时和报工数量相加 +// BgMasterLineDO bgMasterLineDO = bgMasterLineMapper.selectSum(createReqVO.getZjMxId()); +// //然后加上用户传入的当前的工时和查出的工时进行相加，进行判断 +// int value1 = 0; +// if(bgMasterLineDO!=null){ +// //然后加上用户传入的当前的工时和查出的工时进行相加，进行判断 +// value1 = bgMasterLineDO.getAmount()+createReqVO.getAmount(); +// }else{ +// value1 = createReqVO.getAmount(); +// } +// //先判断报工数量是否大于派工数量 +// if(value1>pgMasterLineDO.getAmount()){ +// //这个地方返回错误：报工数量不允许超过派工数量请检查 + // throw exception(TASK_REPORT_PARAMS_ERRORS); +// }else{ //取出本派工单在报工明细中，有没有报 BgMasterLineDO bgMasterLineDOs = bgMasterLineMapper.selectEnd(createReqVO.getZjMxId()); + if (createReqVO.getType() != null && createReqVO.getType() == 0){ + bgMasterLineDOs = bgMasterLineMapper.selectLast(createReqVO.getZjMxId()); + } //判断报工user是否相等 if(bgMasterLineDOs.getBgUser().equals(createReqVO.getBgUser())){ //相同时判断报工数量和派工数量是否相等，相等设置为设置报工状态为1 已完成 LocalDateTime currentDateTime = LocalDateTime.now(); - if(value1 == pgMasterLineDO.getAmount()){ + if(createReqVO.getType() != null && createReqVO.getType() == 0){ //这个地方跟定是否完成状态 pgMasterLineDO.setPgType(1); pgMasterLineDO.setDetilUser(Long.parseLong(createReqVO.getBgUser())); @@ -86,44 +116,34 @@ public class BgMasterLineServiceImpl implements BgMasterLineService { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.eq(TaskDispatchDetailDO::getId,pgMasterLineDO.getDispatchDetailId()); wrapper.set(TaskDispatchDetailDO::getTestYn,"Y"); - taskDispatchDetailMapper.update(wrapper); -// TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(pgMasterLineDO.getDispatchDetailId()); -// if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ -// LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); -// wrapper1.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()); -// wrapper1.gt(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort()); -// wrapper1.eq(TaskDispatchDetailDO::getReportStatus, 0); -// wrapper1.eq(TaskDispatchDetailDO::getDeleted, 0); -// wrapper1.orderByAsc(TaskDispatchDetailDO::getSort); -// wrapper1.last("limit 1"); -// TaskDispatchDetailDO nextTaskDispatchDetailDO = taskDispatchDetailMapper.selectOne(wrapper1); -// if (ObjectUtil.isNotEmpty(nextTaskDispatchDetailDO)){ -// nextTaskDispatchDetailDO.setReportStatus(1); -// taskDispatchDetailMapper.updateById(nextTaskDispatchDetailDO); -// } -// } + return taskDispatchDetailMapper.update(wrapper); }else{ //不相等时只更新当前报工状态 pgMasterLineDO.setActive("END"); pgMasterLineDO.setEntTime(currentDateTime); pgMasterLineMapper.updateById(pgMasterLineDO); - } - //更新报工信息 - //结束时间 - bgMasterLineDOs.setEntTime(currentDateTime); - //报工工时 - bgMasterLineDOs.setWorkTime(createReqVO.getWorkTime()); - //报工数量 - bgMasterLineDOs.setAmount(createReqVO.getAmount()); + //更新报工信息 + //结束时间 + bgMasterLineDOs.setEntTime(currentDateTime); + //报工工时 + bgMasterLineDOs.setWorkTime(createReqVO.getWorkTime()); + bgMasterLineDOs.setIsQua(createReqVO.getIsQua()==null ?null :createReqVO.getIsQua()); + bgMasterLineDOs.setIsRepre(createReqVO.getIsRepre()==null ?null :createReqVO.getIsRepre()); + bgMasterLineDOs.setRemark(createReqVO.getRemark()!=null && !createReqVO.getRemark().trim().equals("")?createReqVO.getRemark() :null); + + bgMasterLineDOs.setNotificationStatus(1); + //报工数量 + bgMasterLineDOs.setAmount(createReqVO.getAmount()); + return bgMasterLineMapper.updateById(bgMasterLineDOs); + } - return bgMasterLineMapper.updateById(bgMasterLineDOs); }else{ //当创建人和报工人不一样时返回报错，不允许用户报工 throw exception(TASK_REPORT_PARAMS_ERRORBG); } // - } +// } } @Override @@ -179,7 +199,21 @@ public class BgMasterLineServiceImpl implements BgMasterLineService { @Override public PageResult getBgMasterLinePage(BgMasterLinePageReqVO pageReqVO) { - return bgMasterLineMapper.selectPage(pageReqVO); + PageResult pageResult = bgMasterLineMapper.selectPage(pageReqVO); + List list = pageResult.getList(); + if(CollUtil.isNotEmpty(list)){ + for (BgMasterLineDO bgMasterLineDO : list) { + List fileUrlList = new ArrayList<>(); + List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(bgMasterLineDO.getId(),1); + if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){ + for (UnqualifiedNotificationFileDO unqualifiedNotificationFileDO : unqualifiedNotificationFileDOS) { + fileUrlList.add(unqualifiedNotificationFileDO.getFileUrl()); + } + bgMasterLineDO.setFileUrlList(fileUrlList); + } + } + } + return pageResult; } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java index ce2ff7d..f9b44da 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java @@ -23,7 +23,7 @@ public interface PgMasterService { * @param id 创建信息 * @return 编号 */ - Integer zfPgMaster(Integer id); + Integer zfPgMaster(Long id); /** * 创建质量过程检派工单主 * diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java index 04b12e6..b2a1354 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java @@ -164,7 +164,7 @@ public class PgMasterServiceImpl implements PgMasterService { @Override - public Integer zfPgMaster(Integer id) { + public Integer zfPgMaster(Long id) { //作废先判断是否已经报工 BgMasterLineDO bgMasterLineDO = bgMasterLineMapper.selectSum(id); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java index f4ac46e..0a28955 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java @@ -5,6 +5,8 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotification.UnqualifiedNotificationDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import java.util.List; + /** * 品质异常通知单审核 Service 接口 * @@ -49,6 +51,7 @@ public interface UnqualifiedNotificationService { * @return 品质异常通知单审核分页 */ PageResult getUnqualifiedNotificationPage(UnqualifiedNotificationPageReqVO pageReqVO); + PageResult getUnqualifiedNotificationPageWx(UnqualifiedNotificationPageReqVO pageReqVO); void operate(UnqualifiedNotificationSaveReqVO operateReqVO); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java index bc223ed..2824c8a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java @@ -3,6 +3,7 @@ package com.chanko.yunxi.mes.module.heli.service.unqualifiednotification; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum; import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.QualityStatistics; @@ -10,11 +11,15 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.UnqualifiedNotificationSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.bgmasterline.BgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotification.UnqualifiedNotificationDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotificationfile.UnqualifiedNotificationFileDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjbgmasterline.ZjBgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.bgmasterline.BgMasterLineMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.unqualifiednotification.UnqualifiedNotificationMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.zjbgmasterline.ZjBgMasterLineMapper; import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.CodeEnum; import com.chanko.yunxi.mes.module.heli.enums.UnqualifiedNotificationStatusEnum; @@ -55,7 +60,10 @@ public class UnqualifiedNotificationServiceImpl implements UnqualifiedNotificati private com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper bdgzsomthingMapper; @Resource private AttentiontodoMapper attentiontodoMapper; - + @Resource + private ZjBgMasterLineMapper zjBgMasterLineMapper; + @Resource + private BgMasterLineMapper bgMasterLineMapper; @Resource private UnqualifiedNotificationMapper unqualifiedNotificationMapper; @Resource @@ -196,7 +204,7 @@ try { @Override public UnqualifiedNotificationDO getUnqualifiedNotification(Long id) { UnqualifiedNotificationDO unqualifiedNotificationDO = unqualifiedNotificationMapper.selectById(id); - List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId()); + List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId(),0); List fileUrlList = unqualifiedNotificationFileDOS.stream() .map(UnqualifiedNotificationFileDO::getFileUrl) .collect(Collectors.toList()); @@ -208,7 +216,19 @@ try { public PageResult getUnqualifiedNotificationPage(UnqualifiedNotificationPageReqVO pageReqVO) { return unqualifiedNotificationMapper.selectPage(pageReqVO); } + @Override + public PageResult getUnqualifiedNotificationPageWx(UnqualifiedNotificationPageReqVO pageReqVO) { + PageResult pageResult = new PageResult<>(); + Long total = unqualifiedNotificationMapper.selectCountPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize()); + pageResult.setTotal(total); + if (total > 0L){ + pageResult.setTotalPages(total.intValue()/ pageReqVO.getPageSize()); + } + List unqualifiedNotificationDOS = unqualifiedNotificationMapper.selectPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize()); + pageResult.setList(unqualifiedNotificationDOS); + return pageResult; + } @Override public void operate(UnqualifiedNotificationSaveReqVO operateReqVO) { if(operateReqVO.getId() == null){ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotificationfile/UnqualifiedNotificationFileService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotificationfile/UnqualifiedNotificationFileService.java index ca896bf..aed8c54 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotificationfile/UnqualifiedNotificationFileService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotificationfile/UnqualifiedNotificationFileService.java @@ -21,7 +21,7 @@ public interface UnqualifiedNotificationFileService { int createUnqualifiedNotificationFile(@Valid UnqualifiedNotificationFileDO unqualifiedNotificationFileDO); // void updateUnqualifiedNotificationFile(@Valid UnqualifiedNotificationFileDO unqualifiedNotificationFileDO); -List queryUnqualifiedNotificationFileBySuperId(@Valid Long unqualificationId); +List queryUnqualifiedNotificationFileBySuperId(@Valid Long unqualificationId,Integer type); /** * 删除品质异常通知单审核 * diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotificationfile/UnqualifiedNotificationFileServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotificationfile/UnqualifiedNotificationFileServiceImpl.java index 3f504be..75faf5e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotificationfile/UnqualifiedNotificationFileServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotificationfile/UnqualifiedNotificationFileServiceImpl.java @@ -33,8 +33,8 @@ public class UnqualifiedNotificationFileServiceImpl implements UnqualifiedNotifi // } @Override - public List queryUnqualifiedNotificationFileBySuperId(Long unqualificationId) { - return unqualifiedNotificationFileMapper.queryUnqualifiedNotificationFileBySuperId(unqualificationId); + public List queryUnqualifiedNotificationFileBySuperId(Long unqualificationId,Integer type) { + return unqualifiedNotificationFileMapper.queryUnqualifiedNotificationFileBySuperId(unqualificationId,type); } @Override diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineService.java index 6cc056f..5234c50 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineService.java @@ -22,7 +22,7 @@ public interface ZjBgMasterLineService { * @return 编号 */ Integer updateBgMasterLines(@Valid ZjBgMasterLineSaveReqVO createReqVO); - + public boolean validExceed(Long zjmxId,Integer amount); /** * 创建终检报工 @@ -44,7 +44,7 @@ public interface ZjBgMasterLineService { * * @param id 编号 */ - void deleteZjBgMasterLine(Integer id); + void deleteZjBgMasterLine(Long id); /** * 获得终检报工 @@ -52,7 +52,7 @@ public interface ZjBgMasterLineService { * @param id 编号 * @return 终检报工 */ - ZjBgMasterLineDO getZjBgMasterLine(Integer id); + ZjBgMasterLineDO getZjBgMasterLine(Long id); /** * 获得终检报工分页 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineServiceImpl.java index 1b28a26..515c2ee 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineServiceImpl.java @@ -1,12 +1,15 @@ package com.chanko.yunxi.mes.module.heli.service.zjbgmasterline; +import cn.hutool.core.collection.CollUtil; import com.chanko.yunxi.mes.module.heli.controller.admin.bgmasterline.vo.BgMasterLineSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bgmasterline.BgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotificationfile.UnqualifiedNotificationFileDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.zjpgmaster.ZjPgMasterLineMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.zjpgmaster.ZjPgMasterMapper; +import com.chanko.yunxi.mes.module.heli.service.unqualifiednotificationfile.UnqualifiedNotificationFileService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -43,46 +46,53 @@ public class ZjBgMasterLineServiceImpl implements ZjBgMasterLineService { @Resource private ZjPgMasterLineMapper zjPgMasterLineMapper; - - + @Resource + private UnqualifiedNotificationFileService unqualifiedNotificationFileService; + @Override + public boolean validExceed(Long zjmxId,Integer amount){ + //先取出总的派工数量和预计工时 + ZjPgMasterLineDO zjPgMasterLineDO = zjPgMasterLineMapper.selectById(zjmxId); + //然后再取出这条ID明细ID下的所有工时和报工数量相加 + ZjBgMasterLineDO zjBgMasterLineDO = zjBgMasterLineMapper.selectSum(zjmxId); + //然后加上用户传入的当前的工时和查出的工时进行相加，进行判断 + int value1 = 0; + if(zjBgMasterLineDO!=null){ + //然后加上用户传入的当前的工时和查出的工时进行相加，进行判断 + value1 = zjBgMasterLineDO.getAmount()+amount; + }else{ + value1 = amount; + } + return value1>zjPgMasterLineDO.getAmount(); + } //结束本次报工 @Override public Integer updateBgMasterLines(ZjBgMasterLineSaveReqVO createReqVO){ - if(createReqVO.getAmount() == null || createReqVO.getWorkTime() == null){ - throw exception(TASK_REPORT_PARAMS_ERROR); + if (createReqVO.getType() != null && createReqVO.getType() != 0){ + if(createReqVO.getAmount() == null || createReqVO.getWorkTime() == null){ + throw exception(TASK_REPORT_PARAMS_ERROR); + } } + //先取出总的派工数量和预计工时 ZjPgMasterLineDO zjPgMasterLineDO = zjPgMasterLineMapper.selectById(createReqVO.getZjMxId()); - //然后再取出这条ID明细ID下的所有工时和报工数量相加 - ZjBgMasterLineDO zjBgMasterLineDO = zjBgMasterLineMapper.selectSum(createReqVO.getZjMxId()); - //然后加上用户传入的当前的工时和查出的工时进行相加，进行判断 - int value1 = 0; - if(zjBgMasterLineDO!=null){ - //然后加上用户传入的当前的工时和查出的工时进行相加，进行判断 - value1 = zjBgMasterLineDO.getAmount()+createReqVO.getAmount(); - }else{ - value1 = createReqVO.getAmount(); - } - //先判断报工数量是否大于派工数量 - if(value1>zjPgMasterLineDO.getAmount()){ - //这个地方返回错误：报工数量不允许超过派工数量请检查 - throw exception(TASK_REPORT_PARAMS_ERRORS); - }else{ //取出本派工单在报工明细中，有没有报 ZjBgMasterLineDO zjBgMasterLineDO1 = zjBgMasterLineMapper.selectEnd(createReqVO.getZjMxId()); + if (createReqVO.getType() != null && createReqVO.getType() == 0){ + zjBgMasterLineDO1 = zjBgMasterLineMapper.selectLast(createReqVO.getZjMxId()); + } //判断报工user是否相等 if(zjBgMasterLineDO1.getBgUser().equals(createReqVO.getBgUser())){ //相同时判断报工数量和派工数量是否相等，相等设置为设置报工状态为1 已完成 LocalDateTime currentDateTime = LocalDateTime.now(); - if(value1 == zjPgMasterLineDO.getAmount()){ + if(createReqVO.getType() != null && createReqVO.getType() == 0){ //这个地方跟定是否完成状态 zjPgMasterLineDO.setPgType(1); zjPgMasterLineDO.setDetilUser(Long.parseLong(createReqVO.getBgUser())); zjPgMasterLineDO.setActive("END"); zjPgMasterLineDO.setEntTime(currentDateTime); - zjPgMasterLineMapper.updateById(zjPgMasterLineDO); + return zjPgMasterLineMapper.updateById(zjPgMasterLineDO); //更新工时 }else{ @@ -90,22 +100,23 @@ public class ZjBgMasterLineServiceImpl implements ZjBgMasterLineService { zjPgMasterLineDO.setActive("END"); zjPgMasterLineDO.setEntTime(currentDateTime); zjPgMasterLineMapper.updateById(zjPgMasterLineDO); + //更新报工信息 + //结束时间 + zjBgMasterLineDO1.setEntTime(currentDateTime); + //报工工时 + zjBgMasterLineDO1.setWorkTime(createReqVO.getWorkTime()); + //报工数量 + zjBgMasterLineDO1.setAmount(createReqVO.getAmount()); + zjBgMasterLineDO1.setIsQua(createReqVO.getIsQua()==null ?null :createReqVO.getIsQua()); + zjBgMasterLineDO1.setIsRepre(createReqVO.getIsRepre()==null ?null :createReqVO.getIsRepre()); + zjBgMasterLineDO1.setRemark(createReqVO.getRemark()!=null && !createReqVO.getRemark().trim().equals("")?createReqVO.getRemark() :null); + zjBgMasterLineDO1.setNotificationStatus(1); + return zjBgMasterLineMapper.updateById(zjBgMasterLineDO1); } - //更新报工信息 - //结束时间 - zjBgMasterLineDO1.setEntTime(currentDateTime); - //报工工时 - zjBgMasterLineDO1.setWorkTime(createReqVO.getWorkTime()); - //报工数量 - zjBgMasterLineDO1.setAmount(createReqVO.getAmount()); - - return zjBgMasterLineMapper.updateById(zjBgMasterLineDO1); }else{ //当创建人和报工人不一样时返回报错，不允许用户报工 throw exception(TASK_REPORT_PARAMS_ERRORBG); } - // - } } @@ -187,27 +198,41 @@ public class ZjBgMasterLineServiceImpl implements ZjBgMasterLineService { } @Override - public void deleteZjBgMasterLine(Integer id) { + public void deleteZjBgMasterLine(Long id) { // 校验存在 validateZjBgMasterLineExists(id); // 删除 zjBgMasterLineMapper.deleteById(id); } - private void validateZjBgMasterLineExists(Integer id) { + private void validateZjBgMasterLineExists(Long id) { if (zjBgMasterLineMapper.selectById(id) == null) { throw exception(ZJ_BG_MASTER_LINE_NOT_EXISTS); } } @Override - public ZjBgMasterLineDO getZjBgMasterLine(Integer id) { + public ZjBgMasterLineDO getZjBgMasterLine(Long id) { return zjBgMasterLineMapper.selectById(id); } @Override public PageResult getZjBgMasterLinePage(ZjBgMasterLinePageReqVO pageReqVO) { - return zjBgMasterLineMapper.selectPage(pageReqVO); + PageResult pageResult = zjBgMasterLineMapper.selectPage(pageReqVO); + List list = pageResult.getList(); + if(CollUtil.isNotEmpty(list)){ + for (ZjBgMasterLineDO bgMasterLineDO : list) { + List fileUrlList = new ArrayList<>(); + List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(bgMasterLineDO.getId(),1); + if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){ + for (UnqualifiedNotificationFileDO unqualifiedNotificationFileDO : unqualifiedNotificationFileDOS) { + fileUrlList.add(unqualifiedNotificationFileDO.getFileUrl()); + } + bgMasterLineDO.setFileUrlList(fileUrlList); + } + } + } + return pageResult; } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java index 0b36744..6eef704 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java @@ -26,7 +26,7 @@ public interface ZjPgMasterService { * @param createReqVO 作废 * @return 编号 */ - Integer zfZjPgMaster(Integer id); + Integer zfZjPgMaster(Long id); /** * 创建质量终检派工单主 * diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java index d790a47..3f1b1bd 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java @@ -208,7 +208,7 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService { @Override - public Integer zfZjPgMaster(Integer id) { + public Integer zfZjPgMaster(Long id) { //作废先判断是否已经报工 ZjBgMasterLineDO zjBgMasterLineDOS = zjBgMasterLineMapper.selectSum(id); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml index 799a0f7..0a42537 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml @@ -108,4 +108,67 @@ order by t.createTime desc - \ No newline at end of file + + + diff --git a/mes-ui/mini-app/src/pages.json b/mes-ui/mini-app/src/pages.json index 6461dba..ed056e0 100644 --- a/mes-ui/mini-app/src/pages.json +++ b/mes-ui/mini-app/src/pages.json @@ -96,6 +96,12 @@ "navigationBarTitleText": "过程检报工" } }, + { + "path": "pages/pgMaster/components/showpicture", + "style": { + "navigationBarTitleText": "过程检图片" + } + }, { "path": "pages/pgMaster/pgMaster-detail", "style": { @@ -104,7 +110,7 @@ },{ "path": "pages/moJuSheJiReport/moJuSheJiReport", "style": { - "navigationBarTitleText": "进度上报" + "navigationBarTitleText": "进度上报" } }, { @@ -136,7 +142,7 @@ }, { "path" : "pages/messageNotification/messageNotification", - "style" : + "style" : { "navigationBarTitleText" : "消息通知" } diff --git a/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue b/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue index 26bf8d6..e0a8d19 100644 --- a/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue +++ b/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue @@ -120,10 +120,10 @@ if (historyList.value.length) { id, } const data = await getTaskDetailAPI(params) - if (data.beforeProcedureStatus == 0) { - //如果上一道工序没结束 - isOverBeforeProcedure.value = true; - } + // if (data.beforeProcedureStatus == 0) { + // //如果上一道工序没结束 + // isOverBeforeProcedure.value = true; + // } data.startTime = formatDate(data.startTime, 'YYYY-MM-DD HH:mm'); data.endTime = formatDate(data.endTime, 'YYYY-MM-DD HH:mm'); // 去掉了末尾的空格 @@ -162,16 +162,13 @@ if (historyList.value.length) { try { const data = await postOperateAPI(params); console.log(data) - console.log('ai') } catch (error) { - console.log('meijinlai ') uni.showToast({ icon: 'none', duration: 3000, title: error.data.msg, }) } finally { - console.log('jie') await getDetailData(detailInfo.value.id) await getData() const obj = historyList.value[0] @@ -195,7 +192,7 @@ if (historyList.value.length) { workTime: workTime.value, } const data = await postOperateAPI(params) - const pages = getCurrentPages(); // 获取当前页面栈 + const pages = getCurrentPages(); // 获取当前页面栈 const currentPage = pages[pages.length - 1]; // 当前页面 const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`; uni.reLaunch({ url }); // 重新加载当前页面 @@ -246,7 +243,7 @@ if (historyList.value.length) {