diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java new file mode 100644 index 000000000..4b38d2a25 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -0,0 +1,100 @@ +package com.glxp.api.controller.collect; + + +import cn.hutool.core.util.StrUtil; +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.controller.BaseController; +import com.glxp.api.entity.collect.IoCollectCodeBackup; +import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.req.collect.IoCollectCodeRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.collect.IoCollectCodeResponse; +import com.glxp.api.service.collect.IoCollectCodeBackService; +import com.glxp.api.service.collect.IoCollectOrderService; +import lombok.extern.slf4j.Slf4j; +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; + + +@Slf4j +@RestController +public class IoCollectCodeBackupController extends BaseController { + + @Resource + IoCollectCodeBackService ioCollectCodeBackService; + + @Resource + IoCollectOrderService collectOrderService; + + /** + * 追溯码备份查询 + */ + @GetMapping("/udiwms/basic/collect/ioCollectCodeBackup/list") + public BaseResponse manuCodeList(IoCollectCodeRequest IoCollectCodeRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List collectOrderCodeManResponses = ioCollectCodeBackService.filterList(IoCollectCodeRequest); + for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses){ + if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) { + ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc()); + } + IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo()); + ioCollectCodeResponse.setBillTime(byBillNo.getBillTime()); + if (byBillNo.getRemark() != null){ + ioCollectCodeResponse.setRemark(byBillNo.getRemark()); + } + } + PageInfo pageInfo = new PageInfo<>(collectOrderCodeManResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(collectOrderCodeManResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + /** + * 根据id删除追溯码表 + * @param IoCollectCodeBackup + * @return + */ + @PostMapping("/udiwms/basic/collect/ioCollectCodeBackup/deleteCollectCode") + public BaseResponse deleteCollectCode(@RequestBody IoCollectCodeBackup IoCollectCodeBackup) { + boolean b = ioCollectCodeBackService.removeById(IoCollectCodeBackup); + if (!b){ + return ResultVOUtils.error(500,"删除失败"); + } + return ResultVOUtils.success("删除成功"); + } + + + /** + * 根据id删除追溯码表 + * @param IoCollectCodeBackup + * @param bindingResult + * @return + */ + @PostMapping("/udiwms/basic/collect/ioCollectCodeBackup/updateCollectCode") + public BaseResponse updateCollectCode(@RequestBody IoCollectCodeBackup IoCollectCodeBackup, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = ioCollectCodeBackService.updateById(IoCollectCodeBackup); + if (!b){ + return ResultVOUtils.error(500,"更新失败"); + } + return ResultVOUtils.success("更新成功"); + } + +} diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectCodeBackMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectCodeBackMapper.java new file mode 100644 index 000000000..190e18a04 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectCodeBackMapper.java @@ -0,0 +1,15 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.IoCollectCodeBackup; +import com.glxp.api.req.collect.IoCollectCodeRequest; +import com.glxp.api.res.collect.IoCollectCodeResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface IoCollectCodeBackMapper extends BaseMapper { + + List filterList(IoCollectCodeRequest ioCollectCodeRequest); +} diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java new file mode 100644 index 000000000..7aa630240 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java @@ -0,0 +1,144 @@ +package com.glxp.api.entity.collect; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@ApiModel(value = "com-glxp-api-entity-collect-IoCollectCode") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "io_collect_code_backup") +public class IoCollectCodeBackup implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 追溯码（UDI.药品） + */ + @TableField(value = "code") + @ApiModelProperty(value = "追溯码（UDI.药品）") + private String code; + + /** + * 单据来源 + */ + @TableField(value = "fromType") + @ApiModelProperty(value = "单据来源") + private String fromType; + + /** + * 单据类型 + */ + @TableField(value = "busType") + @ApiModelProperty(value = "单据类型") + private String busType; + + /** + * 单据号 + */ + @TableField(value = "billNo") + @ApiModelProperty(value = "单据号") + private String billNo; + + /** + * 往来单位 + */ + @TableField(value = "fromCorp") + @ApiModelProperty(value = "往来单位") + private String fromCorp; + + /** + * 操作时间 + */ + @TableField(value = "operTime") + @ApiModelProperty(value = "操作时间") + private Date operTime; + + /** + * 操作人 + */ + @TableField(value = "operUser") + @ApiModelProperty(value = "操作人") + private String operUser; + + /** + * 采集点 + */ + @TableField(value = "collectCode") + @ApiModelProperty(value = "采集点") + private String collectCode; + + /** + * 采集点负责人 + */ + @TableField(value = "collectUser") + @ApiModelProperty(value = "采集点负责人") + private String collectUser; + + /** + * 工位 + */ + @TableField(value = "workPlaceCode") + @ApiModelProperty(value = "工位") + private Long workPlaceCode; + + /** + * 工位负责人 + */ + @TableField(value = "workPlaceUser") + @ApiModelProperty(value = "工位负责人") + private String workPlaceUser; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + + /** + * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动赋码 + */ + @TableField(value = "fifoSplit") + @ApiModelProperty(value = "") + private Integer fifoSplit; + + /** + * 出入库类型（1：入库；2：出库） + */ + @TableField(value = "inoutType") + @ApiModelProperty(value = "出入库类型") + private Integer inoutType; + + /** + * 扫码数量 + */ + @TableField(value = "scanCount") + @ApiModelProperty(value = "出入库类型") + private Integer scanCount; + + + /** + * 耗材字典外键id + */ + @TableField(value = "relId") + @ApiModelProperty(value = "耗材字典外键id") + private Long relId; + + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java new file mode 100644 index 000000000..1a233a30a --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java @@ -0,0 +1,34 @@ +package com.glxp.api.service.collect; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.collect.IoCollectCodeBackMapper; +import com.glxp.api.entity.collect.*; +import com.glxp.api.req.collect.IoCollectCodeRequest; +import com.glxp.api.res.collect.IoCollectCodeResponse; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +@Service +public class IoCollectCodeBackService extends ServiceImpl { + + /** + * 追溯码查询 + * + * @param ioCollectCodeRequest + * @return + */ + public List filterList(IoCollectCodeRequest ioCollectCodeRequest) { + if (ioCollectCodeRequest == null) { + return Collections.emptyList(); + } + if (ioCollectCodeRequest.getPage() != null) { + int offset = (ioCollectCodeRequest.getPage() - 1) * ioCollectCodeRequest.getLimit(); + PageHelper.offsetPage(offset, ioCollectCodeRequest.getLimit()); + } + return super.baseMapper.filterList(ioCollectCodeRequest); + } +} diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml new file mode 100644 index 000000000..690a247c9 --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml @@ -0,0 +1,39 @@ + + + + + +