diff --git a/src/main/java/com/glxp/api/dao/inv/InvMAExplanationDao.java b/src/main/java/com/glxp/api/dao/inv/InvMAExplanationDao.java new file mode 100644 index 000000000..e8aad81e3 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/InvMAExplanationDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.InvMAExplanationEntity; + +public interface InvMAExplanationDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/InvMAOrderDao.java b/src/main/java/com/glxp/api/dao/inv/InvMAOrderDao.java new file mode 100644 index 000000000..a84582f3e --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/InvMAOrderDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.InvMAOrderEntity; + +public interface InvMAOrderDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/InvMAOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvMAOrderDetailDao.java new file mode 100644 index 000000000..b4a842bbd --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/InvMAOrderDetailDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.InvMAOrderDetailEntity; +import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.inv.InvMAOrderDetailResponse; + +import java.util.List; + +public interface InvMAOrderDetailDao extends BaseMapper { + + /** + * 查询库存养护记录详情列表 + * + * @param filterInvMAOrderDetailRequest + * @return + */ + List filterList(FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest); +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/InvMAExplanationEntity.java b/src/main/java/com/glxp/api/entity/inv/InvMAExplanationEntity.java new file mode 100644 index 000000000..f54bc947a --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/InvMAExplanationEntity.java @@ -0,0 +1,43 @@ +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; + +/** + * 库存养护说明表 + */ +@Data +@TableName(value = "inv_ma_explanation") +public class InvMAExplanationEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 名称 + */ + @TableField(value = "`name`") + private String name; + + /** + * 启用状态 0：未启用 1：启用 + */ + @TableField(value = "`status`") + private String status; + + /** + * 默认内容 + */ + @TableField(value = "`text`") + private String text; + + public static final String COL_ID = "id"; + + public static final String COL_NAME = "name"; + + public static final String COL_STATUS = "status"; + + public static final String COL_TEXT = "text"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/InvMAOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvMAOrderDetailEntity.java new file mode 100644 index 000000000..6a7509cd1 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/InvMAOrderDetailEntity.java @@ -0,0 +1,127 @@ +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; + +/** + * 库存养护记录详情表 + */ +@Data +@TableName(value = "inv_ma_order_detail") +public class InvMAOrderDetailEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 养护记录号 + */ + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 条码 + */ + @TableField(value = "code") + private String code; + + /** + * 耗材字典ID + */ + @TableField(value = "relId") + private String relId; + + /** + * DI标识 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private String productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 养护数量 + */ + @TableField(value = "`count`") + private Integer count; + + /** + * 养护状态 0：未养护 1：已养护 + */ + @TableField(value = "maStatus") + private Boolean maStatus; + + /** + * 设备状态 0：异常 1：正常 + */ + @TableField(value = "deviceStatus") + private Boolean deviceStatus; + + /** + * 养护时间 + */ + @TableField(value = "createTime") + private String createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private String updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + 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_PRODUCTIONDATE = "productionDate"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_COUNT = "count"; + + public static final String COL_MASTATUS = "maStatus"; + + public static final String COL_DEVICESTATUS = "deviceStatus"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/InvMAOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InvMAOrderEntity.java new file mode 100644 index 000000000..00ee6af90 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/InvMAOrderEntity.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; + +/** + * 库存养护记录表 + */ +@Data +@TableName(value = "inv_ma_order") +public class InvMAOrderEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 养护记录号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 分库码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 货位码 + */ + @TableField(value = "invSpaceCode") + private String invSpaceCode; + + /** + * 状态 0：草稿 1：未审核 2：已完成 + */ + @TableField(value = "`status`") + private Boolean status; + + /** + * 养护日期 + */ + @TableField(value = "createTime") + private String createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private String updateTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private String auditTime; + + /** + * 养护人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERID = "orderId"; + + public static final String COL_INVCODE = "invCode"; + + public static final String COL_INVSPACECODE = "invSpaceCode"; + + public static final String COL_STATUS = "status"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_AUDITTIME = "auditTime"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_AUDITUSER = "auditUser"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/inv/AddInvMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/AddInvMAOrderDetailRequest.java new file mode 100644 index 000000000..24ee518b0 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/AddInvMAOrderDetailRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.req.inv; + +import java.util.List; + +/** + * 添加库粗养护记录详情接口参数 + */ +public class AddInvMAOrderDetailRequest { + + /** + * 库存养护记录号 + */ + private String orderIdFk; + + /** + * 库存详情ID集合 + */ + List invProductIds; + + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderDetailRequest.java new file mode 100644 index 000000000..3c7718af7 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderDetailRequest.java @@ -0,0 +1,30 @@ +package com.glxp.api.req.inv; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 库存养护记录详情参数 + */ +@Data +public class FilterInvMAOrderDetailRequest extends ListPageRequest { + + private Integer id; + + /** + * 养护记录ID + */ + public String orderIdFk; + + /** + * 养护状态 0：未养护 1：已养护 + */ + public Integer maStatus; + + /** + * 设备状态 0：异常 1：正常 + */ + private Integer deviceStatus; + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderRequest.java new file mode 100644 index 000000000..b6518f892 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderRequest.java @@ -0,0 +1,35 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 养护记录查询参数 + */ +@Data +public class FilterInvMAOrderRequest extends ListPageRequest { + + + private Integer id; + + /** + * 记录ID + */ + private String orderId; + + /** + * 分库号 + */ + private String invCode; + + /** + * 货位号 + */ + private String invSpaceCode; + + /** + * 状态 0：草稿 1：未审核 2：已完成 + */ + private Integer status; + +} diff --git a/src/main/java/com/glxp/api/res/inv/InvMAOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/InvMAOrderDetailResponse.java new file mode 100644 index 000000000..2d38f830e --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/InvMAOrderDetailResponse.java @@ -0,0 +1,101 @@ +package com.glxp.api.res.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +/** + * 养护记录详情接口结果封装类 + */ +@Data +public class InvMAOrderDetailResponse { + + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 养护记录号 + */ + private String orderIdFk; + + /** + * 条码 + */ + private String code; + + /** + * 耗材字典ID + */ + private String relId; + + /** + * DI标识 + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 养护数量 + */ + private Integer count; + + /** + * 养护状态 0：未养护 1：已养护 + */ + private Boolean maStatus; + + /** + * 设备状态 0：异常 1：正常 + */ + private Boolean deviceStatus; + + /** + * 养护时间 + */ + private String createTime; + + /** + * 更新时间 + */ + private String updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 产品名称 + */ + private String productName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 注册/备案凭证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产厂家 + */ + private String ylqxzcrbarmc; + +} diff --git a/src/main/java/com/glxp/api/res/inv/InvMAOrderResponse.java b/src/main/java/com/glxp/api/res/inv/InvMAOrderResponse.java new file mode 100644 index 000000000..1d9ee9185 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/InvMAOrderResponse.java @@ -0,0 +1,73 @@ +package com.glxp.api.res.inv; + +import lombok.Data; + +/** + * 养护记录接口返回结果 + */ +@Data +public class InvMAOrderResponse { + + private Integer id; + + /** + * 养护记录号 + */ + private String orderId; + + /** + * 分库码 + */ + private String invCode; + + /** + * 货位码 + */ + private String invSpaceCode; + + /** + * 状态 0：草稿 1：未审核 2：已完成 + */ + private Boolean status; + + /** + * 养护日期 + */ + private String createTime; + + /** + * 更新时间 + */ + private String updateTime; + + /** + * 审核时间 + */ + private String auditTime; + + /** + * 养护人 + */ + private String createUser; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 备注 + */ + private String remark; + + /** + * 分库名称 + */ + private String invWarehouseName; + + /** + * 货位名称 + */ + private String invSpaceName; + +} diff --git a/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java new file mode 100644 index 000000000..36bcb72a9 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java @@ -0,0 +1,56 @@ +package com.glxp.api.service.inv; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inv.InvMAOrderDetailEntity; +import com.glxp.api.req.inv.AddInvMAOrderDetailRequest; +import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.inv.InvMAOrderDetailResponse; + +import java.util.List; + +/** + * 库存养护记录详情Service + */ +public interface InvMAOrderDetailService { + + /** + * 查询养护记录详情 + * + * @param filterInvMAOrderDetailRequest + * @return + */ + List filterList(FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest); + + /** + * 扫码添加养护记录详情 + * + * @param invMAOrderDetailEntity + * @return + */ + BaseResponse addOrderDetail(InvMAOrderDetailEntity invMAOrderDetailEntity); + + /** + * 养护详情记录 -1 + * + * @param id + * @return + */ + BaseResponse delete(Integer id); + + /** + * 根据库存详情批量添加养护详情记录 + * + * @param addMAOrderDetailRequest + * @return + */ + BaseResponse batchAddDetail(AddInvMAOrderDetailRequest addMAOrderDetailRequest); + + /** + * 更新养护记录详情 + * + * @param invMAOrderDetailEntity + * @return + */ + BaseResponse update(InvMAOrderDetailEntity invMAOrderDetailEntity); + +} diff --git a/src/main/java/com/glxp/api/service/inv/InvMAOrderService.java b/src/main/java/com/glxp/api/service/inv/InvMAOrderService.java new file mode 100644 index 000000000..68ee512d3 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/InvMAOrderService.java @@ -0,0 +1,65 @@ +package com.glxp.api.service.inv; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inv.InvMAOrderEntity; +import com.glxp.api.req.inv.FilterInvMAOrderRequest; +import com.glxp.api.res.inv.InvMAOrderResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 库存养护记录Service + */ +public interface InvMAOrderService { + + /** + * 查询养护记录列表 + * + * @param filterInvMAOrderRequest + * @return + */ + List filterList(FilterInvMAOrderRequest filterInvMAOrderRequest); + + /** + * 添加养护记录 + * + * @param invMAOrderEntity + * @return + */ + BaseResponse addOrder(InvMAOrderEntity invMAOrderEntity); + + /** + * 更新养护记录 + * + * @param invMAOrderEntity + * @return + */ + BaseResponse update(InvMAOrderEntity invMAOrderEntity); + + /** + * 养护记录提交审核 + * + * @param id + * @return + */ + BaseResponse submitAudit(Integer id); + + /** + * 更新养护记录状态 + * + * @param id + * @param status + * @return + */ + BaseResponse updateStatus(Integer id, Integer status); + + /** + * 删除养护记录 + * + * @param id + * @return + */ + BaseResponse delete(@Param("id") Integer id); + +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java new file mode 100644 index 000000000..88366176a --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java @@ -0,0 +1,65 @@ +package com.glxp.api.service.inv.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.dao.inv.*; +import com.glxp.api.entity.inv.InvMAOrderDetailEntity; +import com.glxp.api.req.inv.AddInvMAOrderDetailRequest; +import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.inv.InvMAOrderDetailResponse; +import com.glxp.api.service.inv.InvMAOrderDetailService; +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.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { + + @Resource + private InvMAOrderDetailDao invMAOrderDetailDao; + @Resource + private InvMAOrderDao invMAOrderDao; + @Resource + private InvProductDetailDao invProductDetailDao; + @Resource + private InvProductDao invProductDao; + @Resource + private InvMAExplanationDao invMAExplanationDao; + + @Override + public List filterList(FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest) { + if (null == filterInvMAOrderDetailRequest) { + return Collections.emptyList(); + } + if (null != filterInvMAOrderDetailRequest.getPage() && null != filterInvMAOrderDetailRequest.getLimit()) { + PageHelper.offsetPage((filterInvMAOrderDetailRequest.getPage() - 1) * filterInvMAOrderDetailRequest.getLimit(), filterInvMAOrderDetailRequest.getLimit()); + } + return invMAOrderDetailDao.filterList(filterInvMAOrderDetailRequest); + } + + @Override + public BaseResponse addOrderDetail(InvMAOrderDetailEntity invMAOrderDetailEntity) { + return null; + } + + @Override + public BaseResponse delete(Integer id) { + return null; + } + + @Override + public BaseResponse batchAddDetail(AddInvMAOrderDetailRequest addMAOrderDetailRequest) { + return null; + } + + @Override + public BaseResponse update(InvMAOrderDetailEntity invMAOrderDetailEntity) { + return null; + } +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java new file mode 100644 index 000000000..19367f447 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java @@ -0,0 +1,50 @@ +package com.glxp.api.service.inv.impl; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inv.InvMAOrderEntity; +import com.glxp.api.req.inv.FilterInvMAOrderRequest; +import com.glxp.api.res.inv.InvMAOrderResponse; +import com.glxp.api.service.inv.InvMAOrderService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class InvMAOrderServiceImpl implements InvMAOrderService { + + + + @Override + public List filterList(FilterInvMAOrderRequest filterInvMAOrderRequest) { + return null; + } + + @Override + public BaseResponse addOrder(InvMAOrderEntity invMAOrderEntity) { + return null; + } + + @Override + public BaseResponse update(InvMAOrderEntity invMAOrderEntity) { + return null; + } + + @Override + public BaseResponse submitAudit(Integer id) { + return null; + } + + @Override + public BaseResponse updateStatus(Integer id, Integer status) { + return null; + } + + @Override + public BaseResponse delete(Integer id) { + return null; + } +} diff --git a/src/main/resources/mybatis/mapper/inv/InvMAExplanationDao.xml b/src/main/resources/mybatis/mapper/inv/InvMAExplanationDao.xml new file mode 100644 index 000000000..12a50b5f6 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/InvMAExplanationDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml new file mode 100644 index 000000000..99c99cb44 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/InvMAOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvMAOrderDetailDao.xml new file mode 100644 index 000000000..fc71e2e2a --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/InvMAOrderDetailDao.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file