From 4e52c52eb55c716e703026a6cec65a9dbbc96693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Wed, 18 Mar 2026 21:57:21 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../produce/pojo/dto/PrMacTooUseSpec.java | 2 +- .../desk/produce/pojo/vo/BindModelVO.java | 95 +++++++++++++++ .../desk/produce/pojo/vo/MacToolUseVO.java | 44 +++++++ .../desk/produce/pojo/vo/UnBingDeviceVo.java | 12 +- .../produce/controller/PdaLoadController.java | 25 +--- .../produce/controller/PdaSaveController.java | 24 ++-- .../desk/produce/mapper/PlateAroundMapper.xml | 22 ++-- .../produce/service/IMacToolUseService.java | 4 + .../desk/produce/service/IPdaLoadService.java | 5 +- .../desk/produce/service/IPdaSaveService.java | 3 +- .../service/impl/MacToolUseServiceImpl.java | 30 +++++ .../service/impl/PdaLoadServiceImpl.java | 62 ++++++++-- .../service/impl/PdaSaveServiceImpl.java | 109 ++++++++++-------- 13 files changed, 323 insertions(+), 114 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/BindModelVO.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MacToolUseVO.java 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/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/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