From 9fc48948f300db54ba934575f3491074c5d9d060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Fri, 28 Jul 2023 17:43:45 +0800 Subject: [PATCH] =?UTF-8?q?2023-07-28=20=E5=BC=82=E5=B8=B8=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pda/dao/ToolDetailMapper.java | 4 ++++ .../pda/service/ToolHeaderService.java | 2 ++ .../service/impl/ToolHeaderServiceImpl.java | 17 ++++++++++++++++ .../controller/ToolInfoController.java | 13 ++++++++++++ .../toolMan/entity/ToolUseQtyAssessData.java | 18 +++++++++++++---- .../resources/mapper/pda/ToolDetailMapper.xml | 20 ++++++++++++++++++- 6 files changed, 69 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java b/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java index e2db29c..ef4f00c 100644 --- a/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java +++ b/src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java @@ -213,4 +213,8 @@ public interface ToolDetailMapper { void updateToolItem(ToolSubPropertiesValueData data); void deleteItemModal(ToolSubPropertiesValueData data); + + void checkToolUseQtyAssess(ToolUseQtyAssessData data); + + void updateToolDetailUseQty(ToolUseQtyAssessData data); } diff --git a/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java b/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java index 7593640..53f9d1b 100644 --- a/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java +++ b/src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java @@ -262,4 +262,6 @@ public interface ToolHeaderService { void deleteItemModal(ToolSubPropertiesValueData data); + + void checkToolUseQtyAssess(ToolUseQtyAssessData data); } diff --git a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java index 417e1fb..cc7d254 100644 --- a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java +++ b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java @@ -694,6 +694,23 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { return new PageUtils(resultList); } + /** + * @description: 审核寿命评估 + * @author: fengyuan_yang + * @date: 2023/7/28 14:25 + * @param: [data] + * @return: void + **/ + @Override + @Transactional + public void checkToolUseQtyAssess(ToolUseQtyAssessData data) { + // 更新寿命评估表数据 + toolDetailMapper.checkToolUseQtyAssess(data); + // 更新工具实例寿命 + data.setEstUseQty(data.getAddUseQty() + data.getEstUseQty()); + toolDetailMapper.updateToolDetailUseQty(data); + } + @Override public List getItemModal(ToolSubPropertiesValueData data){ return toolDetailMapper.getItemModal(data); diff --git a/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java b/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java index 202f314..191c941 100644 --- a/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java +++ b/src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java @@ -366,4 +366,17 @@ public class ToolInfoController extends AbstractController { return R.ok(); } + /** + * @description: 审核寿命评估 + * @author: fengyuan_yang + * @date: 2023/7/28 14:24 + * @param: [data] + * @return: com.jtem.common.utils.R + **/ + @PostMapping("checkToolUseQtyAssess") + public R checkToolUseQtyAssess(@RequestBody ToolUseQtyAssessData data){ + toolHeaderService.checkToolUseQtyAssess(data); + return R.ok(); + } + } diff --git a/src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java b/src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java index 6366cea..bbdc77a 100644 --- a/src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java +++ b/src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java @@ -9,6 +9,8 @@ import java.util.Date; @Alias("ToolUseQtyAssessData") public class ToolUseQtyAssessData extends QueryPage { + // 工厂号 + private String site; // 主键ID private Integer id; // 工具编码 @@ -28,8 +30,8 @@ public class ToolUseQtyAssessData extends QueryPage { // 创建人 private String createBy; // 创建时间 - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createDate; // 状态 private String status; @@ -40,12 +42,20 @@ public class ToolUseQtyAssessData extends QueryPage { // 审核人 private String checker; // 审核时间 - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date checkDate; // 实际新增寿命 private Double actualAddUseQty; + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + public String getToolDescription() { return toolDescription; } diff --git a/src/main/resources/mapper/pda/ToolDetailMapper.xml b/src/main/resources/mapper/pda/ToolDetailMapper.xml index 41a15ff..9d1234d 100644 --- a/src/main/resources/mapper/pda/ToolDetailMapper.xml +++ b/src/main/resources/mapper/pda/ToolDetailMapper.xml @@ -287,7 +287,7 @@ PurchaseDate = #{purchaseDate,jdbcType=TIMESTAMP}, PhaseInDate = #{phaseInDate,jdbcType=TIMESTAMP}, PhaseOutDate = #{phaseOutDate,jdbcType=TIMESTAMP}, - lifespan = #{lifespan} + lifespan = #{lifespan} Site=#{site,jdbcType=VARCHAR} AND ToolInstanceID=#{toolInstanceId,jdbcType=VARCHAR} @@ -564,6 +564,24 @@ END + + + update tool_use_qty_assess + set actual_add_use_qty = #{addUseQty}, + status = #{status}, + checker = #{createBy}, + check_date = getDate() + where id = #{id} + + + + + update ToolDetail + set EstUseQty = #{estUseQty} + where ToolID = #{toolId} and Site = #{site} and ToolInstanceID = #{toolInstanceId} + + +