diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java index ef6cd7106..a1927b71c 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java @@ -23,6 +23,7 @@ public class OrderBoxRefinement implements BasicProcessor { @Override public ProcessResult process(TaskContext context) throws Exception { client.monitoringStation(); - return new ProcessResult(true); + log.info("执行完成了"); + return new ProcessResult(true,"执行成功"); } } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemTaskBillVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemTaskBillVO.java index 1f3864143..95a87057c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemTaskBillVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemTaskBillVO.java @@ -32,6 +32,9 @@ public class OemTaskBillVO extends OemTaskBillEntity { private String tbStatusName; public String getTbStatusName() { + if (this.getTbStatus() == null) { + return "未处理"; // 或者返回其他默认值，如 "未知" + } return this.getTbStatus() == 1 ? "已处理" : "未处理"; } } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java index 8cc0cc598..d40f6cfae 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java @@ -16,7 +16,7 @@ public class PrMacTooUseSpec implements java.io.Serializable { /** * id */ - private String mtuId; + private Long mtuId; /** * 零件号 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java new file mode 100644 index 000000000..7a9982e29 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java @@ -0,0 +1,15 @@ +package org.springblade.desk.produce.pojo.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; + +import java.util.List; + +@Data +public class TaskDataDto { + private String cdjArea; + private String pdjArea; + private String gjArea; + private List slotList; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java index cdda06f12..9fba2e94d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java @@ -7,7 +7,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.desk.produce.pojo.dto.PrintChildCheck; +import org.springblade.desk.produce.pojo.dto.TaskDataDto; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; +import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.entity.WorkPlanItem; @@ -291,8 +293,8 @@ public class WorkPlan extends BaseEntity { @Schema(description = "返工工艺Id") @TableField(exist = false) public Long rpId; - @TableField(exist = false) - private List slotList; +// @TableField(exist = false) +// private List slotList; @TableField(exist = false) private List prList; @TableField(exist = false) @@ -334,5 +336,9 @@ public class WorkPlan extends BaseEntity { private List dsRbFilePreserveSlotList; @TableField(exist = false) private List printChildCheck; + @TableField(exist = false) + private AuditFile auditFile; + @TableField(exist = false) + private TaskDataDto taskData; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BindModelVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BindModelVO.java new file mode 100644 index 000000000..f1db7c837 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BindModelVO.java @@ -0,0 +1,95 @@ +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 BindModelVO { + + /** + * id + */ + @Schema(description = "id") + private Long id; + /** + * 车间订单号 + */ + @Schema(description = "车间订单号") + private String woCode; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plate; + /** + * 计划员 + */ + @Schema(description = "计划员") + private String planUser; + /** + * 加工状态 + */ + @Schema(description = "加工状态") + private String runStatus; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * 加工数量 + */ + @Schema(description = "加工数量") + private Double makeQty; + /** + * 零件号 + */ + @Schema(description = "零件号") + private String partCode; + /** + * 产品名称 + */ + @Schema(description = "产品名称") + private String partName; + /** + * 班组 + */ + @Schema(description = "班组") + private String makeTeam; + /** + * 当前工序号 + */ + @Schema(description = "当前工序号") + private String orders; + /** + * 当前工序名称 + */ + @Schema(description = "当前工序名称") + private String ppsName; + /** + * 下序工序号 + */ + @Schema(description = "下序工序号") + private String nextOrders; + /** + * 下序名称 + */ + @Schema(description = "下序名称") + private String nextPpsName; + /** + * 生产标识 + */ + @Schema(description = "生产标识") + private String prodIdent; + /** + * 面积 + */ + @Schema(description = "面积") + private Double area; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MacToolUseVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MacToolUseVO.java new file mode 100644 index 000000000..c2fc9e9e9 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MacToolUseVO.java @@ -0,0 +1,44 @@ +package org.springblade.desk.produce.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * 设备，工装使用记录 视图实体类 + * + * @author BladeX + * @since 2026-02-04 + */ +@Data +public class MacToolUseVO { + + @Schema(description = "使用记录ID") + private Long mtuId; + /** + * 零件号 + */ + @Schema(description = "零件号") + private String partCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * 数量 + */ + @Schema(description = "数量") + private String quantity; + /** + * 时间 + */ + @Schema(description = "时间") + private String createTime; + /** + * 设备 + */ + @Schema(description = "设备编号") + private String deviceCode; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingDeviceVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingDeviceVo.java index ca019bbe3..32b788cb9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingDeviceVo.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingDeviceVo.java @@ -11,13 +11,13 @@ public class UnBingDeviceVo { private List list; - private String oneData; + private Date oneData; private String twoData; - private String threeData; - private String fourData; - private String fiveData; - private String sixData; - private String sevenData; + private Date threeData; + private Date fourData; + private Date fiveData; + private Date sixData; + private Date sevenData; private String dataFourteen; private String tempSlot; diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java index 61a777019..5977bedef 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java @@ -50,8 +50,6 @@ public interface IWorkOrderClient { @GetMapping(INIT_RESOURCE) R initResource(); - @GetMapping(GLASS_CAKE_ORDER) - R> selectGlassCakeOrderPage(GlassCakeOrderPageQuery glassCakeOrderPageQuery); @PostMapping(GLASS_CAKE_QUALITY) R getById(@RequestBody Long id); diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java index 87fac5410..196dd0585 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java @@ -25,12 +25,8 @@ */ package org.springblade.scheduling.feign; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.scheduling.pojo.entity.QualityGradeEntity; -import org.springblade.scheduling.pojo.vo.GlassCakeOrderPageQuery; -import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springframework.stereotype.Component; import java.util.List; @@ -53,10 +49,6 @@ public class IWorkOrderClientFallback implements IWorkOrderClient { return R.fail("初始化资源失败"); } - @Override - public R> selectGlassCakeOrderPage(GlassCakeOrderPageQuery glassCakeOrderPageQuery) { - return R.fail("获取玻璃饼订单失败"); - } @Override public R getById(Long id) { diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java index 94306d801..079bd822c 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java @@ -6,6 +6,7 @@ import org.springblade.wms.pojo.entity.StGlassCakeOut; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -29,9 +30,9 @@ public interface StGlassCakeOutClient { String GLASS_OUT_ORDER = API_PREFIX + "/generateOrder"; String GLASS_BATCH_OUT_ORDER = API_PREFIX + "/batchGenerateOrder"; - @PostMapping("GLASS_OUT_ORDER") + @PostMapping(GLASS_OUT_ORDER) R> callGeneratePreOutOrder(@SpringQueryMap StGlassCakeOutDTO dto); - @PostMapping("GLASS_BATCH_OUT_ORDER") - R> batchGeneratePreOutOrder(@SpringQueryMap List dtoList); + @PostMapping(GLASS_BATCH_OUT_ORDER) + R> batchGeneratePreOutOrder(@RequestBody List dtoList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java index 7dc87cf03..8b50aeb90 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java @@ -202,4 +202,14 @@ public class DsTaskBillController extends BladeController { return R.data(bsFillingDetailService.listFillingDetail(busId,BsFillingDetailEntity.DS_TASK_BILL)); } + /** + * 外协任务单表 详情 + */ + @GetMapping("/listOemFillingDetail") + @ApiOperationSupport(order = 12) + @Operation(summary = "外协任务单表", description = "传入dsTaskBill") + public R listOemFillingDetail(@RequestParam Long busId) { + return R.data(bsFillingDetailService.listFillingDetail(busId, BsFillingDetailEntity.OEM_PROCESS_TASK)); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java index dc54338aa..4a24b877a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java @@ -90,7 +90,7 @@ public class OrderBindController { summary = "根据流程卡号查询", description = "根据流程卡号查询" ) - public R getCardNo(String cardNo) throws BusinessException { + public R getCardNo(@RequestParam String cardNo) throws BusinessException { return iYieldOrderService.getCardNo(cardNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/utils/AgvTaskTypeUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/utils/AgvTaskTypeUtil.java index fb94ff28e..eec4f90c2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/utils/AgvTaskTypeUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/utils/AgvTaskTypeUtil.java @@ -48,11 +48,25 @@ public class AgvTaskTypeUtil { log.info("起点楼层：{}，终点楼层：{}", startFloor, endFloor); // 场景4: 输送线起点(1002)或梳齿架 ---> 站点(二层) -> QM3 - if ((isStartConveyorStart || (startFloor != null && startFloor == 1)) - && endFloor != null && endFloor == 2) { +// if ((isStartConveyorStart || (startFloor != null && startFloor == 1)) +// && endFloor != null && endFloor == 2) { + if (isStartConveyorStart + && endFloor != null && endFloor == 2) { log.info("起点(输送线起点/1层梳齿架)到二层站点任务，使用QM3"); return "QM3"; } + // 场景6: 站点1层 ---> 站点(三层) -> QM13 + if ((startFloor != null && startFloor == 1) + && endFloor != null && endFloor == 2) { + log.info("起点(1层梳齿架)到二层站点任务，使用QM13"); + return "QM13"; + } + // 场景7: 站点3层 ---> 站点(1层) -> QM31 + if ((startFloor != null && startFloor == 2) + && endFloor != null && endFloor == 1) { + log.info("起点(3层)到1层站点任务，使用QM31"); + return "QM31"; + } // 场景1: 站点 <-----> 站点 -> QM if (startFloor != null && endFloor != null) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java index 4e1dc02e4..7767c8bb3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemTaskBillServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.time.LocalDate; @@ -98,6 +99,7 @@ public class OemTaskBillServiceImpl extends BaseServiceImpl fillingDetailList = handleOemTaskBill.getFillingDetailList(); if (null != fillingDetailList && fillingDetailList.size() > 0) { for (BsFillingDetailEntity fillingDetail : fillingDetailList) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java index 43e24d871..fa70bca06 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java @@ -5,24 +5,17 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.entity.RackSetEntity; -import org.springblade.desk.device.pojo.vo.RackSetVO; -import org.springblade.desk.device.wrapper.RackSetWrapper; -import org.springblade.desk.produce.pojo.dto.TurnTypeDTO; -import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity; -import org.springblade.desk.produce.pojo.entity.WorkPlan; +import org.springblade.desk.produce.pojo.vo.BindModelVO; import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO; import org.springblade.desk.produce.service.IPdaLoadService; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; /** * @ClassName PdaLoadController @@ -42,9 +35,9 @@ public class PdaLoadController { @GetMapping(value = "/loadBindData/{cardNo}") @ApiOperationSupport(order = 1) - @Operation(summary = "加载绑定需要的流程卡数据", description = "传入cardNo") - public R loadBindData(@PathVariable String cardNo) { - return R.data(pdaLoadService.loadBindData(AuthUtil.getUserId(), cardNo)); + @Operation(summary = "根据流程卡号数据", description = "传入cardNo") + public R loadBindData(@PathVariable String cardNo) { + return R.data(pdaLoadService.loadBindData(1297L, cardNo)); } @GetMapping(value = "/getBsRackSetByCode/{rsCode}") @@ -55,18 +48,12 @@ public class PdaLoadController { } @GetMapping(value = "/getBsFeiBaSetByCode/{fsCode}") + @ApiOperationSupport(order = 3) @Operation(summary = "根据飞靶编码查询数据", description = "fsCode") public R getBsFeiBaSetByCode(@PathVariable String fsCode) { return R.data(pdaLoadService.getBsFeiBaSetByCode(fsCode)); } - @GetMapping(value = "/getBsFeiBaSetByCodeUn/{fsCode}") - @ApiOperationSupport(order = 3) - @Operation(summary = "根据挂具编码查询数据(解绑)", description = "传入fsCode") - public R getBsFeiBaSetByCodeUn(@PathVariable String fsCode) { - return R.data(pdaLoadService.getBsFeiBaSetByCode(fsCode)); - } - @GetMapping(value = "/getEcByDeviceCode/{deviceCode}") @ApiOperationSupport(order = 4) @Operation(summary = "根据设备编码查询数据", description = "传入deviceCode") @@ -111,7 +98,7 @@ public class PdaLoadController { } @GetMapping(value = "/getHangNum") - @ApiOperationSupport(order = 7) + @ApiOperationSupport(order = 10) @Operation(summary = "根据设备编号获取挂次号", description = "") public R> getHangNum(@RequestParam String deviceCode) { return R.data(pdaLoadService.getHangNum(deviceCode)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java index 4d50ff947..a553e0929 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java @@ -1,22 +1,22 @@ package org.springblade.desk.produce.controller; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.pojo.entity.BasicClazz; import org.springblade.desk.basic.service.IBasicClazzService; import org.springblade.desk.produce.pojo.dto.DeviceBindDTO; -import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity; +import org.springblade.desk.produce.pojo.vo.MacToolUseVO; import org.springblade.desk.produce.pojo.vo.SjEcBingCardVo; import org.springblade.desk.produce.pojo.vo.UnBingDeviceVo; import org.springblade.desk.produce.pojo.vo.UnBingVo; import org.springblade.desk.produce.service.IPdaSaveService; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @ClassName PdaLoadController * @Description: 手持移动端数据查询接口 @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/pdaSave") -@Tag(name = "手持移动端数据查询接口", description = "接口") +@Tag(name = "手持移动端数据保存接口", description = "接口") public class PdaSaveController { private final IPdaSaveService pdaSaveService; @@ -98,6 +98,13 @@ public class PdaSaveController { return R.success(); } + @Operation(summary = "设备解绑") + @PostMapping("/unBind") + public R unBind(@RequestBody UnBingVo unBingVo) { + pdaSaveService.unBind(unBingVo); + return R.success(); + } + @Operation(summary = "烧结流程卡与设备绑定") @PostMapping("/sjEcBindingCard") public R sjEcBindingCard(@RequestBody SjEcBingCardVo sjEcBingCardVo) { @@ -105,16 +112,9 @@ public class PdaSaveController { return R.success(); } - @Operation(summary = "解绑") - @PostMapping("/unBind") - public R unBind(@RequestBody UnBingVo unBingVo) { - pdaSaveService.unBind(unBingVo); - return R.success(); - } - @Operation(summary = "获取烧结未解绑的绑定记录") @PostMapping("/getUnbindByCard") - public R getUnbindByCard(@RequestParam(value = "cardNo") String cardNo) { + public R> getUnbindByCard(@RequestParam(value = "cardNo") String cardNo) { return R.data(pdaSaveService.getUnbindByCard(cardNo)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml index e4f9747a4..8339c5c30 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml @@ -62,15 +62,19 @@ INNER JOIN MES_WORK_PLAN b ON a.NEXT_WP_ID = b.ID INNER JOIN MES_WORK_ORDER c ON a.WO_ID = c.ID - a.status = 3 and c.ID = #{id} and b.next_wp_id > 0 and (a.make_team in - - #{tsId} - - or a.subsidiary_team in - - #{tsId} - - or c.dispatcher= #{userId}) and c.run_status = 3 + a.status = 3 and c.ID = #{id} and b.next_wp_id > 0 + + and (a.make_team in + + #{tsId} + + or a.subsidiary_team in + + #{tsId} + + or c.dispatcher= #{userId}) + + and c.run_status = 3 select a.* from MES_MAC_TOOL_USE a left join MES_WORK_PLAN wp on a.WP_ID = wp.ID - where wp.Id=#{wpId} and a.mtu_index=#{indexNum} order by a.Id + where a.WP_ID=#{wpId} and a.mtu_index=#{indexNum} order by a.Id - +