From d219f3d78e68feaeb3c959c3042ba5feca04d76f Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 7 Dec 2022 16:22:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=E8=A1=A8=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/DeviceMAOrderController.java | 7 +- .../DeviceMAOrderDetailCotroller.java | 91 +++++++ ...eMaOrderDao.java => DeviceMAOrderDao.java} | 12 +- .../entity/inventory/DeviceMAOrderEntity.java | 81 ------ .../FilterDeviceMAOrderDetailRequest.java | 17 ++ .../DeviceMAOrderDetailResponse.java | 32 +++ .../res/inventory/DeviceMAOrderResponse.java | 17 -- .../inventory/DeviceMAOrderDetailService.java | 24 ++ .../inventory/DeviceMAOrderService.java | 3 +- .../impl/DeviceMAOrderDetailServiceImpl.java | 74 ++++++ .../impl/DeviceMAOrderServiceImpl.java | 64 +++-- .../mapper/inventory/DeviceMaOrderDao.xml | 249 ------------------ scripts/设备领用养护功能表.sql | 34 ++- 13 files changed, 313 insertions(+), 392 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java rename api-admin/src/main/java/com/glxp/api/admin/dao/inventory/{DeviceMaOrderDao.java => DeviceMAOrderDao.java} (62%) delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderDetailRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderDetailResponse.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java delete mode 100644 api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMaOrderDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java index 67b0f919..5856f1aa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse; import com.glxp.api.admin.service.inventory.DeviceMAOrderService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -37,9 +36,9 @@ public class DeviceMAOrderController { */ @GetMapping("/device/MA/order/filterList") public BaseResponse filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest) { - List list = deviceMAOrderService.filterList(filterDeviceMAOrderRequest); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + List list = deviceMAOrderService.filterList(filterDeviceMAOrderRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); return ResultVOUtils.success(pageSimpleResponse); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java new file mode 100644 index 00000000..14518206 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java @@ -0,0 +1,91 @@ +package com.glxp.api.admin.controller.inventory; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; +import com.glxp.api.admin.service.inventory.DeviceMAOrderDetailService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 设备养护记录详情接口 + */ +@RestController +public class DeviceMAOrderDetailCotroller { + + @Resource + private DeviceMAOrderDetailService deviceMAOrderDetailService; + + /** + * 查询设备养护记录详情列表 + * + * @param detailRequest + * @return + */ + @GetMapping("/device/MA/order/detail/filterList") + public BaseResponse filterList(FilterDeviceMAOrderDetailRequest detailRequest) { + List list = deviceMAOrderDetailService.filterList(detailRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + /** + * 添加设备养护记录详情 + * + * @param detailEntity + * @param bindingResult + * @return + */ + @PostMapping("/device/MA/order/detail/addOrderDetail") + public BaseResponse addOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + return deviceMAOrderDetailService.addDetail(detailEntity); + } + + /** + * 更新设备养护记录详情 + * + * @param detailEntity + * @param bindingResult + * @return + */ + @PostMapping("/device/MA/order/detail/updateOrderDetail") + public BaseResponse updateOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + return deviceMAOrderDetailService.updateDetail(detailEntity); + } + + /** + * 删除设备养护记录详情 + * + * @param detailEntity + * @param bindingResult + * @return + */ + @PostMapping("/device/MA/order/detail/deleteOrderDetail") + public BaseResponse deleteOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + return deviceMAOrderDetailService.deleteDetail(detailEntity); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java similarity index 62% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDao.java rename to api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java index acb3fefc..d424d856 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java @@ -1,12 +1,12 @@ package com.glxp.api.admin.dao.inventory; + import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; -import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse; import java.util.List; -public interface DeviceMaOrderDao { +public interface DeviceMAOrderDao { int deleteByPrimaryKey(Integer id); int insert(DeviceMAOrderEntity record); @@ -19,11 +19,5 @@ public interface DeviceMaOrderDao { int updateByPrimaryKey(DeviceMAOrderEntity record); - /** - * 查询设备养护记录列表 - * - * @param filterDeviceMAOrderRequest - * @return - */ - List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest); + List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java deleted file mode 100644 index 51ad8a1b..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.glxp.api.admin.entity.inventory; - -import lombok.Data; - -/** - * 设备养护记录表 - */ -@Data -public class DeviceMAOrderEntity { - private Integer id; - - /** - * 设备养护记录号 - */ - private String orderId; - - /** - * 码 - */ - private String code; - - /** - * 产品ID - */ - private String productId; - - /** - * 批次号 - */ - private String batchNo; - - /** - * 生产日期 - */ - private String produceDate; - - /** - * 失效日期 - */ - private String expireDate; - - /** - * 序列号 - */ - private String serialNo; - - /** - * 养护时间 - */ - private String createTime; - - /** - * 更新时间 - */ - private String updateTime; - - /** - * 设备状态 0：异常 1：正常 - */ - private Integer deviceStatus; - - /** - * 养护状态 0：未养护 1：已养护 - */ - private Integer maintenanceStatus; - - /** - * 养护人 - */ - private String createUser; - - /** - * 养护说明 - */ - private String remark; - - /** - * 状态 - */ - private Boolean status; -} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderDetailRequest.java new file mode 100644 index 00000000..aae14754 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderDetailRequest.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +/** + * 设备养护记录详情查询接口参数 + */ +@Data +public class FilterDeviceMAOrderDetailRequest extends ListPageRequest { + + /** + * 设备养护记录号 + */ + private String orderIdFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderDetailResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderDetailResponse.java new file mode 100644 index 00000000..a15cea2f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderDetailResponse.java @@ -0,0 +1,32 @@ +package com.glxp.api.admin.res.inventory; + +import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; +import lombok.Data; + +/** + * 设备养护记录详情响应结果 + */ +@Data +public class DeviceMAOrderDetailResponse extends DeviceMAOrderDetailEntity { + + /** + * 产品名称 + */ + private String productName; + + /** + * 医疗器械注册人名称 + */ + private String ylqxzcrbarmc; + + /** + * 注册证备案号 + */ + private String zczbhhzbapzbh; + + /** + * 规格型号 + */ + private String ggxh; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderResponse.java deleted file mode 100644 index cb1785f1..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceMAOrderResponse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.glxp.api.admin.res.inventory; - -import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; -import lombok.Data; - -/** - * 设备养护记录响应结果 - */ -@Data -public class DeviceMAOrderResponse extends DeviceMAOrderEntity { - - /** - * 产品名称 - */ - private String productName; - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java new file mode 100644 index 00000000..1b7c92f3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.service.inventory; + +import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; +import com.glxp.api.common.res.BaseResponse; + +import java.util.List; + +/** + * 设备养护记录详情Service + */ +public interface DeviceMAOrderDetailService { + + List filterList(FilterDeviceMAOrderDetailRequest detailRequest); + + BaseResponse addDetail(DeviceMAOrderDetailEntity detailEntity); + + BaseResponse updateDetail(DeviceMAOrderDetailEntity detailEntity); + + + BaseResponse deleteDetail(DeviceMAOrderDetailEntity detailEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java index 3aa40e54..8be29d71 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java @@ -2,7 +2,6 @@ package com.glxp.api.admin.service.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; -import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse; import com.glxp.api.common.res.BaseResponse; import java.util.List; @@ -18,7 +17,7 @@ public interface DeviceMAOrderService { * @param filterDeviceMAOrderRequest * @return */ - List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest); + List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest); /** * 添加设备养护记录 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java new file mode 100644 index 00000000..5a680250 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java @@ -0,0 +1,74 @@ +package com.glxp.api.admin.service.inventory.impl; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao; +import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; +import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; +import com.glxp.api.admin.service.inventory.DeviceMAOrderDetailService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import groovy.util.logging.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class DeviceMAOrderDetailServiceImpl implements DeviceMAOrderDetailService { + + @Resource + private DeviceMaOrderDetailDao deviceMaOrderDetailDao; + + @Override + public List filterList(FilterDeviceMAOrderDetailRequest detailRequest) { + if (null == detailRequest) { + return Collections.emptyList(); + } + if (null != detailRequest.getPage() && null != detailRequest.getLimit()) { + PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit()); + } + return deviceMaOrderDetailDao.filterList(detailRequest); + } + + @Override + public BaseResponse addDetail(DeviceMAOrderDetailEntity detailEntity) { + if (null == detailEntity) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + deviceMaOrderDetailDao.insert(detailEntity); + return ResultVOUtils.success("添加成功！"); + } + + @Override + public BaseResponse updateDetail(DeviceMAOrderDetailEntity detailEntity) { + if (null == detailEntity || null == detailEntity.getId()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + deviceMaOrderDetailDao.updateByPrimaryKey(detailEntity); + return ResultVOUtils.success("更新成功"); + } + + @Override + public BaseResponse deleteDetail(DeviceMAOrderDetailEntity detailEntity) { + if (null == detailEntity) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + if (null == detailEntity.getId() && StrUtil.isBlank(detailEntity.getOrderIdFk())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + if (null != detailEntity.getId()) { + deviceMaOrderDetailDao.deleteByPrimaryKey(detailEntity.getId()); + } else { + //删除整单数据 + deviceMaOrderDetailDao.deleteByOrderId(detailEntity.getOrderIdFk()); + } + return ResultVOUtils.success("删除成功"); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java index c71507d2..42d44a3f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java @@ -1,16 +1,15 @@ package com.glxp.api.admin.service.inventory.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDetailDao; -import com.glxp.api.admin.dao.inventory.DeviceMaOrderDao; +import com.glxp.api.admin.dao.inventory.DeviceMAOrderDao; +import com.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; +import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; -import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; -import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.inventory.DeviceMAOrderService; import com.glxp.api.admin.util.DateUtil; @@ -33,23 +32,25 @@ import java.util.List; public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { @Resource - private DeviceMaOrderDao deviceMaOrderDao; - @Resource - private DeviceCollectOrderDetailDao deviceCollectOrderDetailDao; + private DeviceMAOrderDao deviceMAOrderDao; @Resource private CustomerService customerService; @Resource private GennerOrderUtils gennerOrderUtils; + @Resource + private DeviceCollectOrderDetailDao deviceCollectOrderDetailDao; + @Resource + private DeviceMaOrderDetailDao deviceMaOrderDetailDao; @Override - public List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest) { + public List filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest) { if (null == filterDeviceMAOrderRequest) { return Collections.emptyList(); } if (null != filterDeviceMAOrderRequest.getPage() && null != filterDeviceMAOrderRequest.getLimit()) { PageHelper.offsetPage((filterDeviceMAOrderRequest.getPage() - 1) * filterDeviceMAOrderRequest.getLimit(), filterDeviceMAOrderRequest.getLimit()); } - return deviceMaOrderDao.filterList(filterDeviceMAOrderRequest); + return deviceMAOrderDao.filterList(filterDeviceMAOrderRequest); } @Override @@ -57,19 +58,34 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { if (null == deviceMAOrderEntity) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - FilterDeviceCollectOrderDetailRequest filterDeviceCollectOrderDetailRequest = new FilterDeviceCollectOrderDetailRequest(); - filterDeviceCollectOrderDetailRequest.setCode(deviceMAOrderEntity.getCode()); - List deviceCollectOrderDetailEntityList = deviceCollectOrderDetailDao.selectList(filterDeviceCollectOrderDetailRequest); - DeviceCollectOrderDetailEntity deviceCollectOrderDetailEntity = deviceCollectOrderDetailEntityList.get(0); - BeanUtil.copyProperties(deviceCollectOrderDetailEntity, deviceMAOrderEntity); + if (StrUtil.isBlank(deviceMAOrderEntity.getCollOrderId())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请选择养护设备！"); + } deviceMAOrderEntity.setOrderId(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_MA_ORDER, "yyyyMMdd"))); - deviceMAOrderEntity.setCreateTime(DateUtil.getDateTime()); deviceMAOrderEntity.setCreateUser(customerService.getUserBean().getUserName()); + deviceMAOrderEntity.setCreateTime(DateUtil.getDateTime()); + deviceMAOrderEntity.setStatus(0); deviceMAOrderEntity.setUpdateTime(DateUtil.getDateTime()); - deviceMAOrderEntity.setDeviceStatus(1); - deviceMAOrderEntity.setMaintenanceStatus(0); - deviceMaOrderDao.insert(deviceMAOrderEntity); - return ResultVOUtils.success("添加成功！"); + deviceMAOrderDao.insert(deviceMAOrderEntity); + //查询此设备领用单据的设备列表，生成养护清单 + List deviceCollectOrderDetailList = deviceCollectOrderDetailDao.selectByOrderId(deviceMAOrderEntity.getCollOrderId()); + deviceCollectOrderDetailList.forEach(collectOrderDetail -> { + DeviceMAOrderDetailEntity detailEntity = new DeviceMAOrderDetailEntity(); + detailEntity.setOrderIdFk(deviceMAOrderEntity.getOrderId()); + detailEntity.setCode(collectOrderDetail.getCode()); + detailEntity.setNameCode(collectOrderDetail.getNameCode()); + detailEntity.setBatchNo(collectOrderDetail.getBatchNo()); + detailEntity.setProduceDate(collectOrderDetail.getProduceDate()); + detailEntity.setExpireDate(collectOrderDetail.getExpireDate()); + detailEntity.setProductId(collectOrderDetail.getProductId()); + detailEntity.setSerialNo(collectOrderDetail.getSerialNo()); + detailEntity.setCreateUser(deviceMAOrderEntity.getCreateUser()); + detailEntity.setCreateTime(deviceMAOrderEntity.getCreateTime()); + detailEntity.setMaintenanceStatus(0); + detailEntity.setDeviceStatus(1); + deviceMaOrderDetailDao.insert(detailEntity); + }); + return ResultVOUtils.success(deviceMAOrderEntity); } @Override @@ -80,7 +96,7 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { if (null == deviceMAOrderEntity.getId() || StrUtil.isBlank(deviceMAOrderEntity.getOrderId())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - deviceMaOrderDao.updateByPrimaryKey(deviceMAOrderEntity); + deviceMAOrderDao.updateByPrimaryKey(deviceMAOrderEntity); return ResultVOUtils.success("更新成功"); } @@ -89,7 +105,13 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { if (null == id) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - deviceMaOrderDao.deleteByPrimaryKey(id); + DeviceMAOrderEntity deviceMAOrderEntity = deviceMAOrderDao.selectByPrimaryKey(id); + if (null == deviceMAOrderEntity) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此记录已被删除！"); + } + deviceMAOrderDao.deleteByPrimaryKey(id); + //删除此养护记录的详情数据 + deviceCollectOrderDetailDao.deleteByOrderId(deviceMAOrderEntity.getOrderId()); return ResultVOUtils.success("删除成功！"); } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMaOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMaOrderDao.xml deleted file mode 100644 index a28f8f17..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMaOrderDao.xml +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id, - orderId, - code, - productId, - batchNo, - produceDate, - expireDate, - serialNo, - createTime, - updateTime, - deviceStatus, - maintenanceStatus, - `createUser`, - remark, - `status` - - - - - - delete - from device_ma_order - where id = #{id,jdbcType=INTEGER} - - - - insert into device_ma_order (orderId, code, productId, - batchNo, produceDate, expireDate, - serialNo, createTime, updateTime, - deviceStatus, maintenanceStatus, `createUser`, - remark, `status`) - values (#{orderId,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, - #{batchNo,jdbcType=VARCHAR}, #{produceDate,jdbcType=VARCHAR}, #{expireDate,jdbcType=VARCHAR}, - #{serialNo,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, - #{deviceStatus,jdbcType=BOOLEAN}, #{maintenanceStatus,jdbcType=BOOLEAN}, #{createUser,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, #{status,jdbcType=BOOLEAN}) - - - - insert into device_ma_order - - - orderId, - - - code, - - - productId, - - - batchNo, - - - produceDate, - - - expireDate, - - - serialNo, - - - createTime, - - - updateTime, - - - deviceStatus, - - - maintenanceStatus, - - - `createUser`, - - - remark, - - - `status`, - - - - - #{orderId,jdbcType=VARCHAR}, - - - #{code,jdbcType=VARCHAR}, - - - #{productId,jdbcType=VARCHAR}, - - - #{batchNo,jdbcType=VARCHAR}, - - - #{produceDate,jdbcType=VARCHAR}, - - - #{expireDate,jdbcType=VARCHAR}, - - - #{serialNo,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=VARCHAR}, - - - #{deviceStatus,jdbcType=BOOLEAN}, - - - #{maintenanceStatus,jdbcType=BOOLEAN}, - - - #{createUser,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{status,jdbcType=BOOLEAN}, - - - - - - update device_ma_order - - - orderId = #{orderId,jdbcType=VARCHAR}, - - - code = #{code,jdbcType=VARCHAR}, - - - productId = #{productId,jdbcType=VARCHAR}, - - - batchNo = #{batchNo,jdbcType=VARCHAR}, - - - produceDate = #{produceDate,jdbcType=VARCHAR}, - - - expireDate = #{expireDate,jdbcType=VARCHAR}, - - - serialNo = #{serialNo,jdbcType=VARCHAR}, - - - createTime = #{createTime,jdbcType=VARCHAR}, - - - updateTime = #{updateTime,jdbcType=VARCHAR}, - - - deviceStatus = #{deviceStatus,jdbcType=BOOLEAN}, - - - maintenanceStatus = #{maintenanceStatus,jdbcType=BOOLEAN}, - - - `createUser` = #{createUser,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=BOOLEAN}, - - - where id = #{id,jdbcType=INTEGER} - - - - update device_ma_order - set orderId = #{orderId,jdbcType=VARCHAR}, - code = #{code,jdbcType=VARCHAR}, - productId = #{productId,jdbcType=VARCHAR}, - batchNo = #{batchNo,jdbcType=VARCHAR}, - produceDate = #{produceDate,jdbcType=VARCHAR}, - expireDate = #{expireDate,jdbcType=VARCHAR}, - serialNo = #{serialNo,jdbcType=VARCHAR}, - createTime = #{createTime,jdbcType=VARCHAR}, - updateTime = #{updateTime,jdbcType=VARCHAR}, - deviceStatus = #{deviceStatus,jdbcType=BOOLEAN}, - maintenanceStatus = #{maintenanceStatus,jdbcType=BOOLEAN}, - `createUser` = #{createUser,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=BOOLEAN} - where id = #{id,jdbcType=INTEGER} - - - - \ No newline at end of file diff --git a/scripts/设备领用养护功能表.sql b/scripts/设备领用养护功能表.sql index 7becde2d..90523446 100644 --- a/scripts/设备领用养护功能表.sql +++ b/scripts/设备领用养护功能表.sql @@ -41,18 +41,34 @@ DROP TABLE IF EXISTS `device_ma_order`; CREATE TABLE `device_ma_order` ( `id` int NOT NULL AUTO_INCREMENT, `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备养护记录号', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '码', - `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID', - `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', - `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', - `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', - `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `collOrderId` 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 '更新时间', - `deviceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '设备状态 0：异常 1：正常', - `maintenanceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '养护状态 0：未养护 1：已养护', `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护人', + `auditUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核人', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护说明', `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备养护记录表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备养护记录表' ROW_FORMAT = Dynamic; + +# 设备养护记录详情表 +DROP TABLE IF EXISTS `device_ma_order_detail`; +CREATE TABLE `device_ma_order_detail` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备养护记录号', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '条码', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品DI', + `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `serialNo` 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 '更新时间', + `deviceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '设备状态 0：异常 1：正常', + `maintenanceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '养护状态 0：未养护 1：已养护', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护人', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护说明', + `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备养护记录详情表' ROW_FORMAT = Dynamic;