diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesMacToolUseDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesMacToolUseDTO.java new file mode 100644 index 00000000..4cedcb0e --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesMacToolUseDTO.java @@ -0,0 +1,44 @@ +package org.springblade.desk.produce.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * 同炉（槽）查询 数据传输对象实体类 + * + * @author BladeX + * @since 2026-02-04 + */ +@Data +public class MesMacToolUseDTO { + + @Schema(description = "绑定编号") + private String code; + + @Schema(description = "车间订单号") + private String woCode; + + @Schema(description = "物料号") + private String partCode; + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "设备编号") + private String deviceCode; + + @Schema(description = "挂具编号") + private String rsCode; + + @Schema(description = "飞靶编号") + private String fsCode; + + @Schema(description = "开始时间") + private Date startTime; + + @Schema(description = "结束时间") + private Date endTime; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java new file mode 100644 index 00000000..c1430e15 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java @@ -0,0 +1,45 @@ +package org.springblade.desk.produce.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 同炉（槽）查询 视图实体类 + * + * @author BladeX + * @since 2026-02-04 + */ +@Data +public class MesMacToolUseVO { + + @Schema(description = "绑定编号") + private String code; + + @Schema(description = "车间订单号") + private String woCode; + + @Schema(description = "物料号") + private String partCode; + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "数量") + private String makeQty; + + @Schema(description = "设备编号") + private String deviceCode; + + @Schema(description = "挂具编号") + private String rsCode; + + @Schema(description = "飞靶编号") + private String fsCode; + + @Schema(description = "绑定时间") + private String bindTime; + + @Schema(description = "绑定人员") + private String name; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java index 55a13f22..804412db 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java @@ -104,7 +104,7 @@ public class InspectionItem extends BaseEntity { * [检验项目]类型 */ @Schema(description = "[检验项目]类型") - private Long itemType; + private String itemType; /** * [检验项目]名称 */ diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java index a879a1ea..b257dc98 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java @@ -25,6 +25,7 @@ public interface IErpDataProduceClient { String API_PREFIX = "/feign/erpdata/produce"; String QUERY_BATCH = API_PREFIX + "/queryBatch"; String REWORK_ORDER = API_PREFIX + "/loadReworkOrder"; + String REWORK_ORDER_SIZE = API_PREFIX + "/loadReworkOrderSize"; String PRODUCT_APP_AREA = API_PREFIX + "/productAppArea"; String VERSION = API_PREFIX + "/version"; String CUSTODIAN = API_PREFIX + "/getCustodian"; @@ -43,8 +44,17 @@ public interface IErpDataProduceClient { @GetMapping(REWORK_ORDER) R> loadReworkOrder(@RequestParam(value = "reworkCode", required = false) String reworkCode, @RequestParam(value = "partCode", required = false) String partCode, - @RequestParam(value = "batchNo", required = false) String batchNo); + @RequestParam(value = "batchNo", required = false) String batchNo, + @RequestParam(value = "current") Integer current, + @RequestParam(value = "size") Integer size); + /** + * 返工订单数量 + */ + @GetMapping(REWORK_ORDER_SIZE) + R loadReworkOrderSize(@RequestParam(value = "reworkCode", required = false) String reworkCode, + @RequestParam(value = "partCode", required = false) String partCode, + @RequestParam(value = "batchNo", required = false) String batchNo); /** * 获取产品区域 */ diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java index 8a31e2f5..5c6a8960 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java @@ -1,5 +1,6 @@ package org.springblade.erpdata.feign; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.tool.api.R; import org.springblade.erpdata.pojo.vo.QueryBatchVO; import org.springblade.erpdata.pojo.vo.ReworkProcessVO; @@ -23,7 +24,12 @@ public class IErpDataProduceClientFallback implements IErpDataProduceClient { } @Override - public R> loadReworkOrder(String reworkCode, String partCode, String batchNo) { + public R> loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size) { + return R.fail("获取数据失败"); + } + + @Override + public R loadReworkOrderSize(String reworkCode, String partCode, String batchNo) { return R.fail("获取数据失败"); } diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java index d696ad81..fa0c0244 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java @@ -99,7 +99,6 @@ public class CraftAbilityEntity extends BaseEntity { // @TableField(exist = false) private String dispatcherName; @Schema(description = "局部镀订单面积") - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal localArea; @Schema(description = "外协限制") private String wxLimit; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index 492ed33a..b50c8a73 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -60,6 +60,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -196,6 +197,11 @@ public class CraftAbilityController extends BladeController { if(craftAbilityService.count(queryWrapper) > 0){ return R.fail("编码已存在"); } + + if(null == craftAbility.getLocalArea()){ + craftAbility.setLocalArea(new BigDecimal("-1")); + } + return R.status(craftAbilityService.updateById(craftAbility)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java index e0d71e19..284ba777 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java @@ -371,7 +371,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { // 5. 设置结束工位ID并处理不同回库类型 Long endWcId = returnToWarehouseDto.getEndWcId(); task.setWcId(endWcId); - if (!returnToWarehouseDto.getStationRegion().isEmpty()) { + if (returnToWarehouseDto.getStationRegion()!=null) { task.setStationRegion(returnToWarehouseDto.getStationRegion()); } if (endWcId == 0) { @@ -870,8 +870,10 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { // 异常处理：回滚任务 taskService.removeById(task); List stationList = stationService.list(new LambdaQueryWrapper().eq(Station::getId, task.getStationId())); - stationList.get(0).setStationStatus(STATUS_FREE); - stationService.updateById(stationList.get(0)); + if (stationList!=null&&stationList.size()!=0) { + stationList.get(0).setStationStatus(STATUS_FREE); + stationService.updateById(stationList.get(0)); + } log.error("【AGV调度】任务{}调度异常，已回滚", task.getId(), e); return R.fail("AGV小车调用异常：" + e.getMessage()); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java index c0d65b55..88b3fda0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java @@ -71,12 +71,12 @@ public class ReworkProcessController extends BladeController { // records.add(reworkProcessVO); // page.setRecords(records); // return R.data(page); - IPage page = Condition.getPage(query); - String reworkCode = prReworkProcess.getReworkCode(); - String partCode = prReworkProcess.getPartCode(); - String batchNo = prReworkProcess.getBatchNo(); - R> listR = erpDataProduceClient.loadReworkOrder(reworkCode, partCode, batchNo); - return R.data(page.setRecords(listR.getData())); + IPage iPage = Condition.getPage(query); + List process = erpDataProduceClient.loadReworkOrder(prReworkProcess.getReworkCode(), prReworkProcess.getPartCode(), prReworkProcess.getBatchNo(), query.getCurrent(), query.getSize()).getData(); + iPage.setRecords(process); + int size = erpDataProduceClient.loadReworkOrderSize(prReworkProcess.getReworkCode(), prReworkProcess.getPartCode(), prReworkProcess.getBatchNo()).getData(); + iPage.setTotal(size); + return R.data(iPage); } // @GetMapping("/treeProcess") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java index 699a2d82..cc3cc510 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java @@ -9,7 +9,9 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO; import org.springblade.desk.produce.pojo.entity.MacToolUse; +import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO; import org.springblade.desk.produce.service.IMacToolUseService; import org.springframework.web.bind.annotation.*; @@ -29,8 +31,8 @@ public class WorkProcessController extends BladeController { @GetMapping("/queryData") @ApiOperationSupport(order = 1) @Operation(summary = "分页", description = "传入macToolUse") - public R> page(MacToolUse macToolUse, Query query) { - IPage pages = macToolUseService.queryMacToolUse(Condition.getPage(query), macToolUse); + public R> page(MesMacToolUseDTO macToolUse, Query query) { + IPage pages = macToolUseService.queryMacToolUse(Condition.getPage(query), macToolUse); return R.data(pages); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml index 606c9161..96c4066e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml @@ -9,17 +9,21 @@ c.PART_CODE AS partCode, b.BATCH_NO AS batchNo, d.PPS_ID AS ppsId, + e.NAME AS ppsName, a.QTY AS qty, a.TEST_QTY AS testQty, a.SCRAP_QTY AS scrapQty, a.LOSS_QTY AS lossQty, a.MEMO AS memo, a.CREATE_TIME AS maintenanceTime, - a.CREATE_USER AS maintenance + a.CREATE_USER AS maintenance, + f.REAL_NAME AS maintenanceName FROM MES_DEDUCTION_PRESERVE a INNER JOIN MES_WORK_ORDER b ON a.WO_ID = b.ID INNER JOIN MES_YIELD_ORDER c ON b.YO_ID = c.ID INNER JOIN MES_WORK_PLAN d ON a.WP_ID = d.ID + LEFT JOIN BS_PROCESS_SET e ON d.PPS_ID = e.ID + LEFT JOIN BLADE_USER f ON a.CREATE_USER = f.ID a.IS_DELETED = 0 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.java index 720868a5..5edcc901 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.java @@ -2,8 +2,10 @@ package org.springblade.desk.produce.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO; import org.springblade.desk.produce.pojo.entity.MacToolUse; import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; +import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import java.util.List; @@ -17,7 +19,7 @@ import java.util.Map; public interface MacToolUseMapper extends BaseMapper { MacToolUse getTcDataByWoId(Long woId); - List queryMacToolUse(IPage page, MacToolUse macToolUse); + List queryMacToolUse(IPage page, MesMacToolUseDTO macToolUse); List listSlotInfo(Long id, int isGr, int isCx); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml index c3fe0bcc..53441125 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml @@ -31,9 +31,7 @@ - + - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java index 9fe5d802..fec81163 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java @@ -2,11 +2,13 @@ package org.springblade.desk.produce.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO; import org.springblade.desk.produce.pojo.entity.MacToolUse; import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; import org.springblade.desk.produce.pojo.entity.WorkOrder; import org.springblade.desk.produce.pojo.entity.WorkPlan; import org.springblade.desk.produce.pojo.vo.MacToolUseVO; +import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import java.util.List; @@ -33,7 +35,7 @@ public interface IMacToolUseService extends BaseService { */ void unMacToolUseBind(List mtuList); - IPage queryMacToolUse(IPage page, MacToolUse macToolUse); + IPage queryMacToolUse(IPage page, MesMacToolUseDTO macToolUse); MacToolUse getTcDataByWoId(Long woId); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java index 39d45361..830de794 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java @@ -98,10 +98,10 @@ public class DeductionPreserveServiceImpl extends BaseServiceImpl queryMacToolUse(IPage page, MacToolUse macToolUse) { + public IPage queryMacToolUse(IPage page, MesMacToolUseDTO macToolUse) { return page.setRecords(baseMapper.queryMacToolUse(page, macToolUse)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java index 83178c25..56d5c9e1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java @@ -303,7 +303,9 @@ public class MakeRecServiceImpl extends BaseServiceImpl List ppsIds = new ArrayList<>(); List makeTeams = new ArrayList<>(); for (MesMakeRecVO record : records) { - ppsIds.add(record.getPpsId()); + if (record.getPpsId() != null) { + ppsIds.add(record.getPpsId()); + } if (record.getFrontPpsId() != null) { ppsIds.add(record.getFrontPpsId()); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java index 95d64c95..a982711a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -146,6 +146,9 @@ public class InspectionItemController extends BladeController { @ApiLog("修改检验项目") @Operation(summary = "修改一条", description = "传入InspectionItem Obj") public R update(@Valid @RequestBody InspectionItem updateOne) { + if(null == updateOne.getStandardWorkMinute()){ + updateOne.setStandardWorkMinute(-1D); + } return R.status(service.updateById(updateOne)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 623ad036..fb7202fe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -181,10 +181,10 @@ AND wo.CARD_NO = #{q.cardNo} - AND rs.CREATE_TIME >= #{q.createTimeStart} + AND rs.CREATE_TIME >= TO_DATE(#{q.createTimeStart}, 'YYYY-MM-DD HH24:MI:SS') - AND rs.CREATE_TIME <= #{q.createTimeEnd} + AND rs.CREATE_TIME <= TO_DATE(#{q.createTimeEnd}, 'YYYY-MM-DD HH24:MI:SS') AND rs.REVIEW_DATE >= #{q.reviewTimeStart} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java index 760b64e4..ca9bb1b1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java @@ -168,11 +168,11 @@ public class CycleTestService2 { */ public void setVOValue(CycleTestVO vo) { R uiUP = userClient.userInfo(vo.getUpdateUser()); - if (uiUP.isSuccess() && uiUP.getData().getUser() != null) { + if (uiUP.isSuccess() && uiUP.getData() != null && uiUP.getData().getUser() != null) { vo.setUpdateUserName(uiUP.getData().getUser().getName()); } R uiPro = userClient.userInfo(vo.getProcessUserId()); - if (uiPro.isSuccess() && uiPro.getData().getUser() != null) { + if (uiPro.isSuccess() && uiPro.getData() != null && uiPro.getData().getUser() != null) { vo.setProcessUserName(uiPro.getData().getUser().getName()); } CycleTestItem item = itemService.getById(vo.getCycleTestItemId()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java index 5eeeccd1..83bd8e61 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java @@ -435,8 +435,8 @@ public class CycleTestTaskService2 { } } R uiPro = userClient.userInfo(vo.getProcessUserId()); - if (uiPro.getData().getUser() != null) { - vo.setProcessUserName(uiPro.getData().getUser().getName()); + if (uiPro != null && uiPro.getData() != null && uiPro.getData().getUser() != null) { + vo.setProcessUserName(uiPro.getData().getUser().getRealName()); } { Instant instant = vo.getCreateTime().toInstant(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index 3a34f519..5af235ca 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -464,6 +464,11 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl> loadReworkOrder(String reworkCode, String partCode, String batchNo) { - return R.data(erpDataProduceService.loadReworkOrder(reworkCode, partCode, batchNo)); + public R> loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size) { + return R.data(erpDataProduceService.loadReworkOrder(reworkCode, partCode, batchNo, current, size)); + } + + @Override + public R loadReworkOrderSize(String reworkCode, String partCode, String batchNo) { + return R.data(erpDataProduceService.loadReworkOrderSize(reworkCode, partCode, batchNo)); } @Override diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.java index 1ad9e5c6..fb028b90 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.java @@ -18,11 +18,13 @@ public interface ErpDataProduceMapper extends Mapper { QueryBatchVO queryBatch(String partCode); - List loadReworkOrder(String reworkCode, String partCode, String batchNo); + List loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size); Map getProductAppareaByPartCode(String partCode); String getVersionByPartCode(String partCode); String getCustodianByRecDept(String partCode, String recDept); + + int loadReworkOrderSize(String reworkCode, String partCode, String batchNo); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml index baddd120..3239c6e1 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml @@ -39,6 +39,10 @@ a.prtno = #{partCode} + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java index 47107ed7..2c2b494c 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java @@ -18,7 +18,7 @@ public interface IErpDataProduceService { QueryBatchVO queryBatch(String partCode); - List loadReworkOrder(String reworkCode, String partCode, String batchNo); + List loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size); Map getProductAppareaByPartCode(String partCode); @@ -29,4 +29,6 @@ public interface IErpDataProduceService { String chkSjjd(String ypCode, String batchNo); String chkShjh(String woCode, String ypCode, String partCode, String productIdent, Double makeQty, String memo); + + Integer loadReworkOrderSize(String reworkCode, String partCode, String batchNo); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java index d8df8036..36a39a92 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java @@ -3,6 +3,8 @@ package org.springblade.erpdata.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.erpdata.mapper.ErpDataProduceMapper; import org.springblade.erpdata.pojo.dto.ReworkProcessDTO; import org.springblade.erpdata.pojo.vo.QueryBatchVO; @@ -15,6 +17,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcCall; import org.springframework.stereotype.Service; import java.sql.Types; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -38,8 +41,8 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService { } @Override - public List loadReworkOrder(String reworkCode, String partCode, String batchNo) { - return erpDataProduceMapper.loadReworkOrder(reworkCode, partCode, batchNo); + public List loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size) { + return erpDataProduceMapper.loadReworkOrder(reworkCode, partCode, batchNo, current, size); } @Override @@ -128,4 +131,9 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService { return excflag; } + + @Override + public Integer loadReworkOrderSize(String reworkCode, String partCode, String batchNo) { + return erpDataProduceMapper.loadReworkOrderSize(reworkCode, partCode, batchNo); + } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java index 3b9ef887..0b9b5d92 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java @@ -37,7 +37,7 @@ public class WorkOrderDto { private String makeQty; private String workCenterName; - private String workCenterId; + private Long workCenterId; private Integer totalCount; private Integer schedulingCount; private Integer unschedulingCount; @@ -54,4 +54,7 @@ public class WorkOrderDto { private List workOrderList; + private List workCenterList; + + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java index 3cce158c..a6c4ca45 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java @@ -91,4 +91,7 @@ public interface WorkOrderMapper extends BaseMapper { List selectProcessExecuteDetailPage(IPage page, WorkPlanVO workPlan); + List selectUserCenter(@Param("userId") Long userId); + + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index db8b2540..cb4e168d 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -108,7 +108,8 @@ b.equip_code AS "equipCode", a.status AS "orderStatus", b.status AS "planStatus", - b.team_members as "teamMembers" + b.team_members as "teamMembers", + b.work_center_id as "workCenterId" FROM MES_WORK_ORDER a LEFT JOIN MES_WORK_PLAN b ON a.ID = b.WO_ID @@ -262,6 +263,12 @@ #{planStatus} + + and b.work_center_id IN + + #{workCenterId} + + GROUP BY a.WO_CODE, @@ -624,5 +631,15 @@ + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index c311895e..b6d48dc0 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -41,6 +41,8 @@ import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.dashboard.constant.DsPartConstant; @@ -243,6 +245,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl schedulingBoard(WorkOrderDto workOrder) { + + List list = baseMapper.selectWorkOrderList(workOrder); String yesterday = DateFormatUtils.format(DateUtils.addDays(new Date(), -1), "yyyy-MM-dd"); String twodaysAgo = DateFormatUtils.format(DateUtils.addDays(new Date(), -2), "yyyy-MM-dd"); @@ -298,6 +302,23 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workCenterList = baseMapper.selectUserCenter(userId); + woCodeGroup = woCodeGroup.entrySet().stream() + .filter(entry -> { + return entry.getValue().stream() + .anyMatch(dto -> workCenterList.contains(dto.getWorkCenterId())); + }) + .collect(Collectors.toMap( + Map.Entry::getKey, + Map.Entry::getValue, + (oldValue, newValue) -> oldValue, + LinkedHashMap::new + )); + } List resultList = new ArrayList<>(); for (Map.Entry> entry : woCodeGroup.entrySet()) { //根据工序名称过滤订单 @@ -376,6 +397,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl exportSchedulingBoard(WorkOrderDto workOrder) { + BladeUser user = AuthUtil.getUser(); + if(!user.getRoleName().equals("administrator")){ + Long userId = AuthUtil.getUserId(); + List workCenterList = baseMapper.selectUserCenter(userId); + workOrder.setWorkCenterList(workCenterList); + } return baseMapper.exportSchedulingBoard(workOrder); }