diff --git a/src/main/java/com/glxp/api/common/util/ResultVOUtils.java b/src/main/java/com/glxp/api/common/util/ResultVOUtils.java index 87eb51b96..b3d2adf6c 100644 --- a/src/main/java/com/glxp/api/common/util/ResultVOUtils.java +++ b/src/main/java/com/glxp/api/common/util/ResultVOUtils.java @@ -63,6 +63,15 @@ public class ResultVOUtils { return error(resultEnum.getCode(), resultEnum.getMessage()); } + /** + * 直接返回参数校验异常 + * + * @return + */ + public static BaseResponse paramVerifyFail() { + return error(ResultEnum.PARAM_VERIFY_FALL); + } + /** * 错误时返回 * diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index ceb373d26..61149f644 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -10,6 +10,11 @@ public class Constant { public static final String SERIAL_CACHE_PREFIX_STAT = "serialstat_"; public static final String SERIAL_CACHE_SYNC_UDI = "syncUdi"; + /** + * 部门设备编码缓存Key + */ + public static final String DEPT_CACHE_CODE = "deptDeviceCode"; + public static final String SCAN_ORDER = "MS"; //出入库单据 public static final String BUS_ORDER = "MY"; public static final String LIN_YONG = "ML"; //领用 diff --git a/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java new file mode 100644 index 000000000..0a33b7480 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java @@ -0,0 +1,87 @@ +package com.glxp.api.controller.inv; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.inv.DeptDeviceDetailEntity; +import com.glxp.api.req.inv.AddDeptDeviceRequest; +import com.glxp.api.req.inv.FilterDeptDeviceRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.inv.DeptDeviceDetailResponse; +import com.glxp.api.service.inv.impl.DeptDeviceDetailService; +import lombok.extern.slf4j.Slf4j; +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; + +/** + * 部门设备明细接口 + */ +@Slf4j +@RestController +public class DeptDeviceDetailController { + + @Resource + private DeptDeviceDetailService deptDeviceDetailService; + + /** + * 查询部门设备明细列表 + * + * @param filterDeptDeviceRequest + * @return + */ + @GetMapping("/udiwms/inv/deptDevice/filter") + public BaseResponse filterList(FilterDeptDeviceRequest filterDeptDeviceRequest) { + List list = deptDeviceDetailService.filterList(filterDeptDeviceRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 添加设备信息 + * + * @param addDeptDeviceRequest + * @return + */ + @PostMapping("/udiwms/inv/deptDevice/add") + public BaseResponse addDevice(@RequestBody AddDeptDeviceRequest addDeptDeviceRequest) { + if (null == addDeptDeviceRequest) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return deptDeviceDetailService.addDevice(addDeptDeviceRequest); + } + + /** + * 更新设备信息 + * + * @param deptDeviceDetail + * @return + */ + @PostMapping("/udiwms/inv/deptDevice/update") + public BaseResponse updateDevice(@RequestBody DeptDeviceDetailEntity deptDeviceDetail) { + if (null == deptDeviceDetail) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return deptDeviceDetailService.updateDevice(deptDeviceDetail); + } + + /** + * 删除设备信息 + * + * @param deleteRequest + * @return + */ + @PostMapping("/udiwms/inv/deptDevice/delete") + public BaseResponse deleteDevice(@RequestBody DeleteRequest deleteRequest) { + if (null == deleteRequest || null == deleteRequest.getId()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return deptDeviceDetailService.deleteDevice(deleteRequest.getId()); + } + +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeptDeviceDetailDao.java b/src/main/java/com/glxp/api/dao/inv/DeptDeviceDetailDao.java new file mode 100644 index 000000000..f5fb1fff3 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeptDeviceDetailDao.java @@ -0,0 +1,28 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeptDeviceDetailEntity; +import com.glxp.api.req.inv.FilterDeptDeviceRequest; +import com.glxp.api.res.inv.DeptDeviceDetailResponse; + +import java.util.List; + +/** + * 科室设备明细Dao + */ +public interface DeptDeviceDetailDao extends BaseMapper { + + /** + * 查询最大的资产编码 + * + * @return + */ + String selectMaxCode(); + + /** + * 查询 + * @param filterDeptDeviceRequest + * @return + */ + List filterList(FilterDeptDeviceRequest filterDeptDeviceRequest); +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java new file mode 100644 index 000000000..213c339cd --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceInspectOrderEntity; + +public interface DeviceInspectOrderDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java new file mode 100644 index 000000000..a18f8a1dd --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceInspectPlanEntity; + +public interface DeviceInspectPlanDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectSetDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceInspectSetDao.java new file mode 100644 index 000000000..30cff3a94 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceInspectSetDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceInspectSetEntity; + +public interface DeviceInspectSetDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java index c74e270b4..139cb09bf 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java @@ -25,7 +25,7 @@ public interface DeviceReceiveOrderDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeptDeviceDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/DeptDeviceDetailEntity.java new file mode 100644 index 000000000..79b1c3b0d --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeptDeviceDetailEntity.java @@ -0,0 +1,165 @@ +package com.glxp.api.entity.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 科室设备明细表 + */ +@Data +@TableName(value = "dept_device_detail") +public class DeptDeviceDetailEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 科室编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 原始码 + */ + @TableField(value = "originCode") + private String originCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 耗材字典编码 + */ + @TableField(value = "relId") + private String relId; + + /** + * 设备名称 + */ + @TableField(value = "deviceName") + private String deviceName; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + private String ggxh; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private String productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 生产厂家 + */ + @TableField(value = "manufactory") + private String manufactory; + + /** + * 计量单位 + */ + @TableField(value = "measname") + private String measname; + + /** + * 注册/备案凭证号 + */ + @TableField(value = "zczbhhzbapzbh") + private String zczbhhzbapzbh; + + /** + * 供应商ID + */ + @TableField(value = "supId") + private String supId; + + /** + * 供应商名称 + */ + @TableField(value = "supName") + private String supName; + + /** + * 状态（1：正常；2：报修；3：养护中；4：已养护；5：已报废） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 添加方式（1：领用添加；2：手动添加） + */ + @TableField(value = "addType") + private Integer addType; + + /** + * 添加人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 负责人 + */ + @TableField(value = "manager") + private String manager; + + /** + * 最后养护时间 + */ + @TableField(value = "maTime") + private Date maTime; + + /** + * 添加时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java new file mode 100644 index 000000000..ff0277846 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java @@ -0,0 +1,99 @@ +package com.glxp.api.entity.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备维保记录表 + */ +@Data +@TableName(value = "device_inspect_order") +public class DeviceInspectOrderEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 上级单号，计划或报修单号 + */ + @TableField(value = "lastOrderId") + private String lastOrderId; + + /** + * 维保类型（1：报修；2：计划） + */ + @TableField(value = "`type`") + private Integer type; + + /** + * 状态（1：新增；2：未审核；3：已审核） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 设备状态（0：异常；2：正常） + */ + @TableField(value = "deviceStatus") + private String deviceStatus; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 审核时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 养护说明 + */ + @TableField(value = "remark") + private String remark; + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java new file mode 100644 index 000000000..26753197f --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java @@ -0,0 +1,87 @@ +package com.glxp.api.entity.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备巡检计划表 + */ +@Data +@TableName(value = "device_inspect_plan") +public class DeviceInspectPlanEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 计划级别（1：低级；2：中级；3：高级） + */ + @TableField(value = "`level`") + private Integer level; + + /** + * 状态（1：新增；2：未审核；3：已审核） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectSetEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectSetEntity.java new file mode 100644 index 000000000..9f068540f --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectSetEntity.java @@ -0,0 +1,63 @@ +package com.glxp.api.entity.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备巡检设置表 + */ +@Data +@TableName(value = "device_inspect_set") +public class DeviceInspectSetEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 时间频率 + */ + @TableField(value = "frequency") + private String frequency; + + /** + * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒） + */ + @TableField(value = "frequencyUnit") + private Integer frequencyUnit; + + /** + * 状态（1：启用；2：禁用） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java index 6118320fd..622ce3e7a 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java @@ -72,6 +72,12 @@ public class DeviceReceiveOrderDetailEntity { @TableField(value = "serialNo") private String serialNo; + /** + * 供应商ID + */ + @TableField(value = "supId") + private String supId; + /** * 领用时间 */ @@ -83,78 +89,47 @@ public class DeviceReceiveOrderDetailEntity { */ @TableField(value = "updateTime") private Date updateTime; - public static final String COL_ID = "id"; - - public static final String COL_ORDERIDFK = "orderIdFk"; - - public static final String COL_ORIGINCODE = "originCode"; - - public static final String COL_CODE = "code"; - - public static final String COL_RELID = "relId"; - - public static final String COL_NAMECODE = "nameCode"; - - public static final String COL_BATCHNO = "batchNo"; - - public static final String COL_PRODUCEDATE = "produceDate"; /** * 产品名称 */ private String productName; - public static final String COL_EXPIREDATE = "expireDate"; - /** * 仓库名称 */ private String invName; - public static final String COL_SERIALNO = "serialNo"; - /** * 货位名称 */ private String invSpaceName; - public static final String COL_INVCODE = "invCode"; - /** * 货位名称 */ private String invSpaceCode; - public static final String COL_INVSPACECODE = "invSpaceCode"; - /** * 注册/备案凭证号 */ private String zczbhhzbapzbh; - public static final String COL_RECEIVEINVCODE = "receiveInvCode"; - /** * 生产厂家 */ private String ylqxzcrbarmc; - public static final String COL_RECEIVESPACECODE = "receiveSpaceCode"; - /** * 规格型号 */ private String ggxh; - public static final String COL_CREATETIME = "createTime"; - /** * 是否可以自定义序列号 */ private Boolean editSerialNo; - public static final String COL_UPDATETIME = "updateTime"; - /** * 部门名称 */ diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java index 58c3db0c9..e3182f228 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java @@ -96,6 +96,12 @@ public class DeviceReceiveOrderEntity { @TableField(value = "updateTime") private Date updateTime; + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + /** * 备注 */ diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java new file mode 100644 index 000000000..778251682 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java @@ -0,0 +1,87 @@ +package com.glxp.api.entity.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备报修单表 + */ +@Data +@TableName(value = "device_repair_order") +public class DeviceRepairOrderEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 状态（1：新增；2：未审核；3：已审核） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 报修说明 + */ + @TableField(value = "msg") + private String msg; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/inv/AddDeptDeviceRequest.java b/src/main/java/com/glxp/api/req/inv/AddDeptDeviceRequest.java new file mode 100644 index 000000000..065d8933f --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/AddDeptDeviceRequest.java @@ -0,0 +1,108 @@ +package com.glxp.api.req.inv; + +import lombok.Data; + +/** + * 添加部门设备信息接口参数 + */ +@Data +public class AddDeptDeviceRequest { + + private Integer id; + + /** + * 科室编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 原始码 + */ + private String originCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 生产厂家 + */ + private String manufactory; + + /** + * 计量单位 + */ + private String measname; + + /** + * 注册/备案凭证号 + */ + private String zczbhhzbapzbh; + + /** + * 供应商名称 + */ + private String supName; + + /** + * 状态（1：正常；2：报修；3：养护中；4：已养护；5：已报废） + */ + private Integer status; + + /** + * 添加方式（1：领用添加；2：手动添加） + */ + private Integer addType; + + /** + * 添加人 + */ + private String createUser; + + /** + * 负责人 + */ + private String manager; + + /** + * 备注 + */ + private String remark; + +} diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java index f20c97170..9ce966016 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java @@ -40,4 +40,9 @@ public class AddDeviceReceiveOrderDetailRequest { */ private String invSpaceCode; + /** + * 供应商ID + */ + private String supId; + } diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeptDeviceRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeptDeviceRequest.java new file mode 100644 index 000000000..d0d885e26 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterDeptDeviceRequest.java @@ -0,0 +1,57 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 查询部门设备明细接口参数 + */ +@Data +public class FilterDeptDeviceRequest extends ListPageRequest { + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 资产编码 + */ + private String code; + + /** + * 原始编码 + */ + private String originCode; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 状态（1：正常；2：报修；3：养护中；4：已养护；5：已报废） + */ + private Integer status; + + /** + * 添加方式（1：领用添加；2：手动添加） + */ + private Integer addType; + +} diff --git a/src/main/java/com/glxp/api/res/inv/DeptDeviceDetailResponse.java b/src/main/java/com/glxp/api/res/inv/DeptDeviceDetailResponse.java new file mode 100644 index 000000000..9f9c56b36 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/DeptDeviceDetailResponse.java @@ -0,0 +1,10 @@ +package com.glxp.api.res.inv; + +import lombok.Data; + +/** + * 部门设备明细VO + */ +@Data +public class DeptDeviceDetailResponse { +} diff --git a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderDetailResponse.java index 6fbb6976b..76689b5b4 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderDetailResponse.java @@ -115,4 +115,24 @@ public class DeviceReceiveOrderDetailResponse { */ private String deptName; + /** + * 供应商ID + */ + private String supId; + + /** + * 供应商名称 + */ + private String supName; + + /** + * 生产厂家 + */ + private String manufactory; + + /** + * 计量单位 + */ + private String measname; + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailService.java b/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailService.java new file mode 100644 index 000000000..851b4e17a --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailService.java @@ -0,0 +1,55 @@ +package com.glxp.api.service.inv.impl; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inv.DeptDeviceDetailEntity; +import com.glxp.api.req.inv.AddDeptDeviceRequest; +import com.glxp.api.req.inv.FilterDeptDeviceRequest; +import com.glxp.api.res.inv.DeptDeviceDetailResponse; + +import java.util.List; + +/** + * 部门设备明细Service + */ +public interface DeptDeviceDetailService { + + /** + * 通过设备领用添加设备到部门详情表 + * + * @param orderId + * @return + */ + BaseResponse addDeviceByReceiveOrder(String orderId); + + /** + * 查询部门设备明细列表 + * + * @param filterDeptDeviceRequest + * @return + */ + List filterList(FilterDeptDeviceRequest filterDeptDeviceRequest); + + /** + * 手动添加设备信息 + * + * @param addDeptDeviceRequest + * @return + */ + BaseResponse addDevice(AddDeptDeviceRequest addDeptDeviceRequest); + + /** + * 更新设备信息 + * + * @param deptDeviceDetail + * @return + */ + BaseResponse updateDevice(DeptDeviceDetailEntity deptDeviceDetail); + + /** + * 删除设备信息 + * + * @param id + * @return + */ + BaseResponse deleteDevice(String id); +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java new file mode 100644 index 000000000..e84ce70aa --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java @@ -0,0 +1,144 @@ +package com.glxp.api.service.inv.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.inv.DeptDeviceDetailDao; +import com.glxp.api.dao.inv.DeviceReceiveOrderDao; +import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao; +import com.glxp.api.entity.inv.DeptDeviceDetailEntity; +import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; +import com.glxp.api.req.inv.AddDeptDeviceRequest; +import com.glxp.api.req.inv.FilterDeptDeviceRequest; +import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; +import com.glxp.api.res.inv.DeptDeviceDetailResponse; +import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.util.IdUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService { + + @Resource + private DeviceReceiveOrderDao deviceReceiveOrderDao; + @Resource + private DeviceReceiveOrderDetailDao deviceReceiveOrderDetailDao; + @Resource + private DeptDeviceDetailDao deptDeviceDetailDao; + @Resource + private IdUtil idUtil; + @Resource + private CustomerService customerService; + + + @Override + public BaseResponse addDeviceByReceiveOrder(String orderId) { + //查询此设备领用单 + DeviceReceiveOrderEntity receiveOrderEntity = deviceReceiveOrderDao.selectOne(new QueryWrapper().eq("orderId", orderId)); + //查询领用设备详情 + FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest(); + detailRequest.setOrderIdFk(orderId); + List deviceReceiveOrderDetailResponses = deviceReceiveOrderDetailDao.filterList(detailRequest); + + Date date = new Date(); + for (DeviceReceiveOrderDetailResponse receiveOrderDetailResponse : deviceReceiveOrderDetailResponses) { + //查询此编码的产品是否已经在科室设备明细中 + Long count = deptDeviceDetailDao.selectCount(new QueryWrapper().eq("deptCode", receiveOrderEntity.getFromDeptCode()) + .eq("invCode", receiveOrderEntity.getInvCode()) + .eq("code", receiveOrderDetailResponse.getCode()) + ); + if (count == 0) { + DeptDeviceDetailEntity deviceDetail = new DeptDeviceDetailEntity(); + deviceDetail.setDeptCode(receiveOrderEntity.getFromDeptCode()); + deviceDetail.setInvCode(receiveOrderEntity.getInvCode()); + deviceDetail.setOriginCode(receiveOrderDetailResponse.getCode()); + deviceDetail.setCode(idUtil.getDeptDeviceCode()); //生成资产编号 + deviceDetail.setRelId(receiveOrderDetailResponse.getRelId()); + deviceDetail.setDeviceName(receiveOrderDetailResponse.getProductName()); + deviceDetail.setGgxh(receiveOrderDetailResponse.getGgxh()); + deviceDetail.setBatchNo(receiveOrderDetailResponse.getBatchNo()); + deviceDetail.setSerialNo(receiveOrderDetailResponse.getSerialNo()); + deviceDetail.setProductionDate(receiveOrderDetailResponse.getProductionDate()); + deviceDetail.setExpireDate(receiveOrderDetailResponse.getExpireDate()); + deviceDetail.setManufactory(receiveOrderDetailResponse.getManufactory()); + deviceDetail.setZczbhhzbapzbh(receiveOrderDetailResponse.getZczbhhzbapzbh()); + deviceDetail.setMeasname(receiveOrderDetailResponse.getMeasname()); + deviceDetail.setSupId(receiveOrderDetailResponse.getSupId()); + deviceDetail.setSupName(receiveOrderDetailResponse.getSupName()); + deviceDetail.setManager(receiveOrderEntity.getReceiveUser()); + deviceDetail.setStatus(1); + deviceDetail.setAddType(1); + deviceDetail.setCreateUser(receiveOrderEntity.getAuditUser()); + deviceDetail.setCreateTime(date); + deviceDetail.setUpdateTime(date); + deptDeviceDetailDao.insert(deviceDetail); + } + } + return ResultVOUtils.success("添加成功"); + } + + @Override + public List filterList(FilterDeptDeviceRequest filterDeptDeviceRequest) { + if (null == filterDeptDeviceRequest) { + return Collections.emptyList(); + } + if (null != filterDeptDeviceRequest.getPage() && null != filterDeptDeviceRequest.getLimit()) { + PageHelper.offsetPage((filterDeptDeviceRequest.getPage() - 1) * filterDeptDeviceRequest.getLimit(), filterDeptDeviceRequest.getLimit()); + } + return deptDeviceDetailDao.filterList(filterDeptDeviceRequest); + } + + @Override + public BaseResponse addDevice(AddDeptDeviceRequest addDeptDeviceRequest) { + Long count = deptDeviceDetailDao.selectCount(new QueryWrapper() + .eq("deptCode", addDeptDeviceRequest.getDeptCode()) + .eq("invCode", addDeptDeviceRequest.getInvCode()) + .eq("originCode", addDeptDeviceRequest.getOriginCode()) + ); + if (count > 0) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); + } + DeptDeviceDetailEntity deptDeviceDetail = new DeptDeviceDetailEntity(); + BeanUtil.copyProperties(addDeptDeviceRequest, deptDeviceDetail); + deptDeviceDetail.setCode(idUtil.getDeptDeviceCode()); //资产编码 + deptDeviceDetail.setCreateUser(customerService.getUserIdStr()); + deptDeviceDetail.setCreateTime(new Date()); + deptDeviceDetail.setUpdateTime(new Date()); + deptDeviceDetailDao.insert(deptDeviceDetail); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse updateDevice(DeptDeviceDetailEntity deptDeviceDetail) { + DeptDeviceDetailEntity oldData = deptDeviceDetailDao.selectById(deptDeviceDetail.getId()); + deptDeviceDetail.setCreateUser(oldData.getCreateUser()); + deptDeviceDetail.setCreateTime(oldData.getCreateTime()); + + deptDeviceDetailDao.updateById(deptDeviceDetail); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse deleteDevice(String id) { + if (StrUtil.isBlank(id)) { + return ResultVOUtils.paramVerifyFail(); + } + deptDeviceDetailDao.deleteById(id); + return ResultVOUtils.success(); + } + +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java index fd23c88b7..acc0ef10e 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inv.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; @@ -89,6 +88,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe invProductDetailRequest.setDeptCode(addDetailRequest.getDeptCode()); invProductDetailRequest.setInvCode(addDetailRequest.getInvCode()); invProductDetailRequest.setInvSpaceCode(addDetailRequest.getInvSpaceCode()); + invProductDetailRequest.setSupId(addDetailRequest.getSupId()); } //查询库存详情 List invProductDetailEntities = invProductDetailDao.filterInvProductDetailList(invProductDetailRequest); @@ -107,6 +107,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe filterInvProductDetailRequest.setDeptCode(invProductEntity.getDeptCode()); filterInvProductDetailRequest.setInvCode(invProductEntity.getInvCode()); filterInvProductDetailRequest.setInvSpaceCode(addDetailRequest.getInvSpaceCode()); + filterInvProductDetailRequest.setSupId(addDetailRequest.getSupId()); List invProductDetailEntities = invProductDetailDao.filterInvProductDetailList(filterInvProductDetailRequest); //计算出在仓库中的设备 //提取库存详情中不同的码 @@ -172,16 +173,14 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe DeviceReceiveOrderDetailEntity orderDetail = new DeviceReceiveOrderDetailEntity(); orderDetail.setOrderIdFk(orderIdFk); orderDetail.setOriginCode(code); + orderDetail.setCode(code); orderDetail.setRelId(invProductDetailEntity.getRelId()); orderDetail.setNameCode(udi.getUdi()); orderDetail.setBatchNo(udi.getBatchNo()); orderDetail.setProductionDate(udi.getProduceDate()); orderDetail.setExpireDate(udi.getExpireDate()); - //判断有无序列号，如果有序列号，则可以通过udi码来判定唯一，直接使用udi码做唯一码 - if (StrUtil.isNotBlank(udi.getSerialNo())) { - orderDetail.setSerialNo(udi.getSerialNo()); - orderDetail.setCode(code); - } + orderDetail.setSupId(invProductDetailEntity.getSupId()); + orderDetail.setSerialNo(udi.getSerialNo()); Date date = new Date(); orderDetail.setCreateTime(date); orderDetail.setUpdateTime(date); @@ -194,13 +193,9 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } //判断新的条码是否重复 - UdiEntity udiEntity = new UdiEntity(); - BeanUtil.copyProperties(detailEntity, udiEntity); - udiEntity.setUdi(detailEntity.getNameCode()); - String code = FilterUdiUtils.transGlxpHasSerStr(udiEntity); FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest(); detailRequest.setOrderIdFk(detailEntity.getOrderIdFk()); - detailRequest.setCode(code); + detailRequest.setCode(detailRequest.getCode()); List list = deviceReceiveOrderDetailDao.filterList(detailRequest); if (CollUtil.isNotEmpty(list)) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "条码重复！"); diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java index bc445fb13..44345ebd4 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java @@ -1,7 +1,7 @@ package com.glxp.api.service.inv.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; @@ -10,7 +10,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.dao.inv.DeviceReceiveOrderDao; import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao; -import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest; @@ -19,13 +18,11 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.DeviceReceiveOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; @@ -43,6 +40,8 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService private GennerOrderUtils gennerOrderUtils; @Resource private CustomerService customerService; + @Resource + private DeptDeviceDetailService deptDeviceDetailService; @Override public List filterList(FilterDeviceReceiveOrderRequest deviceReceiveOrderRequest) { @@ -97,28 +96,6 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService if (CollUtil.isEmpty(detailList)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加领用设备！"); } - - List details = new ArrayList<>(detailList.size()); - //检验序列号，校验通过更新无序列号产品编码 - for (DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity : detailList) { - if (StrUtil.isBlank(deviceReceiveOrderDetailEntity.getSerialNo())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "领用设备中存在无序列号设备，无法提交审核，请完善设备信息！"); - } else if (StrUtil.isBlank(deviceReceiveOrderDetailEntity.getCode())) { - //有自定义序列号，重新生成码 - UdiEntity udiEntity = new UdiEntity(); - BeanUtil.copyProperties(deviceReceiveOrderDetailEntity, udiEntity); - udiEntity.setUdi(deviceReceiveOrderDetailEntity.getNameCode()); - String code = FilterUdiUtils.transGlxpHasSerStr(udiEntity); - deviceReceiveOrderDetailEntity.setCode(code); - details.add(deviceReceiveOrderDetailEntity); - } - } - - if (CollUtil.isNotEmpty(details)) { - //更新自定义码详情 - deviceReceiveOrderDetailDao.updateCodeBatch(details); - } - //更新领用记录状态为待审核 deviceReceiveOrderDao.updateStatusById(1, id); return ResultVOUtils.success("提交成功！"); @@ -137,11 +114,16 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService deviceReceiveOrderEntity.setAuditUser(auditUser); deviceReceiveOrderEntity.setStatus(status); - //驳回领用记录，置空无序列号数据的序列号和code字段值 - if (status == 0) { - deviceReceiveOrderDetailDao.resetCode(deviceReceiveOrderEntity.getOrderId()); + if (status == 2) { + //审核通过，将设备添加到部门设备详情表 + ThreadUtil.execAsync(ThreadUtil.newThread(() -> { + deptDeviceDetailService.addDeviceByReceiveOrder(deviceReceiveOrderEntity.getOrderId()); + }, "领用单添加到部门设备明细")); } + deviceReceiveOrderEntity.setAuditTime(new Date()); + deviceReceiveOrderEntity.setUpdateTime(new Date()); + deviceReceiveOrderDao.updateById(deviceReceiveOrderEntity); return ResultVOUtils.success("更新成功！"); } @@ -157,6 +139,6 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService @Override public Integer selectOrderIdByOrderId(String orderId) { - return deviceReceiveOrderDao.selectOrderIdByOrderId(orderId); + return deviceReceiveOrderDao.selectIdByOrderId(orderId); } } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java index 4c943bd33..311512dc3 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java @@ -6,8 +6,8 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.dao.purchase.*; +import com.glxp.api.dao.purchase.SupCertDao; +import com.glxp.api.dao.purchase.SupCertRemindMsgDao; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupCertRemindMsgEntity; import com.glxp.api.req.purchase.FilterCertRemindMsgRequest; @@ -33,14 +33,6 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService { @Resource private SupCertRemindMsgDao supCertRemindMsgDao; @Resource - private SupProductDao supProductDao; - @Resource - private UdiRelevanceDao udiRelevanceDao; - @Resource - private SupManufacturerDao supManufacturerDao; - @Resource - private SupCompanyDao supCompanyDao; - @Resource private SupCertDao supCertDao; @Override diff --git a/src/main/java/com/glxp/api/util/IdUtil.java b/src/main/java/com/glxp/api/util/IdUtil.java new file mode 100644 index 000000000..28eb09e01 --- /dev/null +++ b/src/main/java/com/glxp/api/util/IdUtil.java @@ -0,0 +1,36 @@ +package com.glxp.api.util; + +import com.glxp.api.constant.Constant; +import com.glxp.api.dao.inv.DeptDeviceDetailDao; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * ID工具类 + */ +@Component +public class IdUtil { + + @Resource + private RedisUtil redisUtil; + @Resource + private DeptDeviceDetailDao deptDeviceDetailDao; + + /** + * 获取最新的科室设备明细的资产编码 + * + * @return + */ + public String getDeptDeviceCode() { + long code = redisUtil.incr(Constant.DEPT_CACHE_CODE, 1); + if (code == 1) { + //redis中的key不存在，重新缓存当前最大的key进去 + redisUtil.set(Constant.DEPT_CACHE_CODE, deptDeviceDetailDao.selectMaxCode()); + //重新获取最新的编码 + code = redisUtil.incr(Constant.DEPT_CACHE_CODE, 1); + } + return String.valueOf(code); + } + +} diff --git a/src/main/resources/mybatis/mapper/inv/DeptDeviceDetailDao.xml b/src/main/resources/mybatis/mapper/inv/DeptDeviceDetailDao.xml new file mode 100644 index 000000000..06a2ed434 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeptDeviceDetailDao.xml @@ -0,0 +1,65 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml new file mode 100644 index 000000000..16662d5d9 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, deptCode, invCode, code, lastOrderId, `type`, `status`, deviceStatus, `createUser`, + auditUser, createTime, auditTime, updateTime, remark + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml new file mode 100644 index 000000000..9e36afea4 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + id, deptCode, invCode, code, `level`, `status`, `createUser`, auditUser, createTime, + auditTime, updateTime, remark + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectSetDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectSetDao.xml new file mode 100644 index 000000000..0bef3a37f --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectSetDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + id, code, frequency, frequencyUnit, `status`, createTime, updateTime, remark + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml index 9e7d0851b..f9ac31be1 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml @@ -47,7 +47,7 @@ where id = #{id} - select id from device_receive_order where orderId = #{orderId} diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml index 9ae6c2e69..7f83cad20 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml @@ -40,6 +40,8 @@ drod.serialNo, drod.createTime, drod.updateTime, + drod.supId, + (select `name` from basic_corp where erpId = drod.supId) supName, dro.fromDeptCode, dro.fromInvCode, dro.fromInvSpaceCode, @@ -49,6 +51,8 @@ bp.cpmctymc productName, bp.zczbhhzbapzbh, bp.ylqxzcrbarmc, + bp.manufactory, + bp.measname, bp.ggxh, (select name from auth_dept where code = dro.fromDeptCode) fromDeptName, (select name from auth_warehouse where code = dro.fromInvCode) fromInvName, diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml new file mode 100644 index 000000000..c14ea67de --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + id, deptCode, invCode, code, `status`, `createUser`, auditUser, msg, createTime, + auditTime, updateTime, remark + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 8f168fa78..712f960e1 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -142,7 +142,15 @@