diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderController.java index 99463711..2c9c282c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderController.java @@ -122,11 +122,11 @@ public class InvMAOrderController { * @return */ @PostMapping("/inv/MA/order/delete") - public BaseResponse delete(FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) { + public BaseResponse delete(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (null == filterInvMAOrderRequest || null == filterInvMAOrderRequest.getId() || null == filterInvMAOrderRequest.getStatus()) { + if (null == filterInvMAOrderRequest || null == filterInvMAOrderRequest.getId()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空!"); } return invMAOrderService.delete(filterInvMAOrderRequest.getId()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java index 9e03a54a..8423236a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java @@ -52,4 +52,30 @@ public interface InvMaintenanceOrderDetailDao { * @return */ InvMaintenanceOrderDetailEntity selectByOrderIdAndCode(@Param("orderIdFk") String orderIdFk, @Param("code") String code); + + /** + * 查询养护记录详情 + * + * @param orderId + * @return + */ + List selectByOrderId(@Param("orderId") String orderId); + + /** + * 更新养护记录详情时间 + * + * @param id 养护记录详情ID + * @param createTime 养护时间 + * @param updateTime 更新时间 + * @return + */ + int updateTime(@Param("id") Integer id, @Param("createTime") String createTime, @Param("updateTime") String updateTime); + + /** + * 查询库存养护记录详情ID集合 + * + * @param orderId + * @return + */ + List selectDetailIds(@Param("orderId") String orderId); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderDetailEntity.java index 6f414f41..35e51ba2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderDetailEntity.java @@ -64,4 +64,14 @@ public class InvMaintenanceOrderDetailEntity { * 备注 */ private String remark; + + /** + * 养护时间 + */ + private String createTime; + + /** + * 更新时间 + */ + private String updateTime; } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java index f2c43f8b..853b0358 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java @@ -1,6 +1,8 @@ package com.glxp.api.admin.service.inventory.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.constant.ConstantType; @@ -66,6 +68,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { if (null != maintenanceOrderDetailEntity) { if (StrUtil.isBlank(udi.getSerialNo()) || (StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo()))) { maintenanceOrderDetailEntity.setCount(maintenanceOrderDetailEntity.getCount() + 1); + maintenanceOrderDetailEntity.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN)); invMAOrderDetailDao.updateByPrimaryKey(maintenanceOrderDetailEntity); } else { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复!"); @@ -97,6 +100,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { if (null != invMaintenanceExplanation) { invMaintenanceOrderDetailEntity.setRemark(invMaintenanceExplanation.getText()); } + invMaintenanceOrderDetailEntity.setCreateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN)); invMAOrderDetailDao.insert(invMaintenanceOrderDetailEntity); } else { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前仓库中不存在此产品,无法进行养护!"); @@ -175,6 +179,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { maOrderDetail.setCount(codeMap.get(code)); maOrderDetail.setMaintenanceStatus(0); maOrderDetail.setDeviceStatus(1); + maOrderDetail.setCreateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN)); if (null != invMaintenanceExplanation) { maOrderDetail.setRemark(invMaintenanceExplanation.getText()); } @@ -187,6 +192,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { @Override public BaseResponse update(InvMaintenanceOrderDetailEntity invMaintenanceOrderDetailEntity) { + invMaintenanceOrderDetailEntity.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN)); invMAOrderDetailDao.updateByPrimaryKey(invMaintenanceOrderDetailEntity); return ResultVOUtils.success("更新成功!"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java index a5818722..d6fab7ed 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java @@ -111,6 +111,7 @@ public class InvMAOrderServiceImpl implements InvMAOrderService { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } maintenanceOrder.setStatus(status); + maintenanceOrder.setAuditTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN)); maintenanceOrder.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN)); invMAOrderDao.updateByPrimaryKey(maintenanceOrder); return ResultVOUtils.success("更新成功"); @@ -123,7 +124,7 @@ public class InvMAOrderServiceImpl implements InvMAOrderService { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此记录不存在!"); } //删除养护记录和详情 - invMAOrderDao.selectByPrimaryKey(id); + invMAOrderDao.deleteByPrimaryKey(id); invMAOrderDetailDao.deleteByOrderId(maintenanceOrder.getOrderId()); return ResultVOUtils.success("删除成功"); } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml index 681f72b2..658398f1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml @@ -14,6 +14,8 @@ + + @@ -28,7 +30,9 @@ `count`, maintenanceStatus, deviceStatus, - remark + remark, + createTime, + updateTime + + + + + update inv_maintenance_order_detail + + + createTime = #{createTime,jdbcType=VARCHAR}, + + + updateTime = #{updateTime,jdbcType=VARCHAR}, + + + where id = #{id} + + + \ No newline at end of file diff --git a/scripts/库存养护功能表.sql b/scripts/库存养护功能表.sql index 47aa42ff..407046e3 100644 --- a/scripts/库存养护功能表.sql +++ b/scripts/库存养护功能表.sql @@ -30,8 +30,10 @@ CREATE TABLE `inv_maintenance_order_detail` ( `maintenanceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '养护状态 0:未养护 1:已养护', `deviceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '设备状态 0:异常 1:正常', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '养护单据详情表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 46 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '养护单据详情表' ROW_FORMAT = Dynamic; # 养护说明表 DROP TABLE IF EXISTS `inv_maintenance_explanation`;