UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理单据，关联关系问题等

Browse Source
dev_unify
yewj 8 months ago
parent 7ddccf734f
commit 55beb3b285
5 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
Unescape Escape View File

@ -451,7 +451,6 @@ public class IoCollectOrderController extends BaseController {
/**
* 确认取药
*
* @param collectOrderRequest
* @return

26
src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
Unescape Escape View File

@ -363,42 +363,42 @@ public class BasicProductsEntity {
* 一级分类名称(学科，品名）
*/
@TableField(value = "catalogname1")
@ApiModelProperty(value="一级分类名称(学科，品名）")
@ApiModelProperty(value = "一级分类名称(学科，品名）")
private String catalogname1;
/**
* 二级分类名称(用途、品目）
*/
@TableField(value = "catalogname2")
@ApiModelProperty(value="二级分类名称(用途、品目）")
@ApiModelProperty(value = "二级分类名称(用途、品目）")
private String catalogname2;
/**
* 三级分类名称(部位、功能、品种）
*/
@TableField(value = "catalogname3")
@ApiModelProperty(value="三级分类名称(部位、功能、品种）")
@ApiModelProperty(value = "三级分类名称(部位、功能、品种）")
private String catalogname3;
/**
* 一级分类名称(学科，品名）
*/
@TableField(value = "catalogcode1")
@ApiModelProperty(value="一级分类名称(学科，品名）")
@ApiModelProperty(value = "一级分类名称(学科，品名）")
private Integer catalogcode1;
/**
* 二级分类名称(用途、品目）
*/
@TableField(value = "catalogcode2")
@ApiModelProperty(value="二级分类名称(用途、品目）")
@ApiModelProperty(value = "二级分类名称(用途、品目）")
private Integer catalogcode2;
/**
* 三级分类名称(部位、功能、品种）
*/
@TableField(value = "catalogcode3")
@ApiModelProperty(value="三级分类名称(部位、功能、品种）")
@ApiModelProperty(value = "三级分类名称(部位、功能、品种）")
private Integer catalogcode3;
/**
@ -411,12 +411,10 @@ public class BasicProductsEntity {
* 耗材材质
*/
@TableField(value = "matrial")
@ApiModelProperty(value="耗材材质")
@ApiModelProperty(value = "耗材材质")
private String matrial;
/**
* 产品类型 1:药品 2:耗材
*/
@ -482,7 +480,7 @@ public class BasicProductsEntity {
/**
*制剂规格
* 制剂规格
*/
@TableField(value = "prepnSpec")
private String prepnSpec;
@ -546,7 +544,11 @@ public class BasicProductsEntity {
*/
@TableField(value = "xjdw")
private String xjdw;
/**
* 明细分类
*/
@TableField(value = "detailSort")
private Integer detailSort;
public static final String COL_ID = "id";
@ -661,5 +663,5 @@ public class BasicProductsEntity {
public static final String COL_UPDATEUSER = "updateUser";
public static final String COL_REMARK = "remark";
public static final String COL_BZGG= "bzgg";
public static final String COL_BZGG = "bzgg";
}

13
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -21,6 +21,7 @@ import com.glxp.api.entity.collect.IoCollectOrder;
import com.glxp.api.entity.collect.IoCollectOrderBiz;
import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
import com.glxp.api.entity.collect.RelCodeDetail;
import com.glxp.api.entity.inout.IoCodeLostEntity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.entity.inout.IoSplitCodeEntity;
import com.glxp.api.entity.inv.AnncmntProductEntity;
@ -38,6 +39,7 @@ import com.glxp.api.service.auth.SysWorkplaceService;
import com.glxp.api.service.basic.BasicCollectBustypeService;
import com.glxp.api.service.basic.SysWorkplaceDocumentService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.inout.IoCodeLostService;
import com.glxp.api.service.inout.IoSplitCodeService;
import com.glxp.api.service.inv.AnncmntProductService;
import com.glxp.api.service.thrsys.IThrBusTypeOriginService;
@ -118,6 +120,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
InvWarehouseService invWarehouseService;
@Resource
SysWorkplacePutRelService workplacePutRelService;
@Resource
IoCodeLostService codeLostService;
@Transactional(rollbackFor = Exception.class)
public IoCollectOrder prescribeTagCode(AddTagCodeReqeust addTagCodeReqeust) {
@ -187,7 +191,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
throw new JsonException(500, "当前产品已过期！");
}
}
IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code);
IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code, putWorkPlaceCode);
List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(addTagCodeReqeust.getBillNo());
//2.校验是否处方单UDI码
if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_GEN_ORDER) {
@ -256,6 +260,13 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
collectOrderCodeManRequest.setUdiCode(code);
collectOrderCodeManRequest.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
IoCollectOrderCodeMan collectOrderCodeMan = collectOrderCodeManMapper.exitCode(collectOrderCodeManRequest);
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
if (codeLostEntity != null) {
udiEntity.setBatchNo(codeLostEntity.getBatchNo());
udiEntity.setProduceDate(codeLostEntity.getProduceDate());
udiEntity.setExpireDate(codeLostEntity.getExpireDate());
}
if (collectOrderCodeMan != null && StrUtil.isNotEmpty(collectOrderCodeMan.getSerialNo())) {
throw new JsonException(500, "当前追溯码已被其他单据关联！");
}

3
src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
Unescape Escape View File

@ -78,6 +78,9 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
}
public IoSplitCodeEntity findByCode(String code, Long workPlaceCode) {
if (workPlaceCode == null) {
return null;
}
List<IoSplitCodeEntity> ioSplitCodeEntities = splitCodeMapper.selectList(new LambdaQueryWrapper<IoSplitCodeEntity>()
.eq(IoSplitCodeEntity::getCode, code)
.eq(workPlaceCode != null, IoSplitCodeEntity::getWorkPlaceCode, workPlaceCode)

20
src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java
Unescape Escape View File

@ -1,11 +1,16 @@
package com.glxp.api.service.inout.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.req.inout.IoCodeLostRequest;
import com.glxp.api.res.collect.RelCodeDetailResponse;
import com.glxp.api.res.inout.IoCodeLostResponse;
import com.glxp.api.service.collect.RelCodeBatchService;
import com.glxp.api.service.collect.RelCodeDetailService;
import com.glxp.api.util.MsDateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -38,13 +43,26 @@ public class IoCodeLostServiceImpl extends ServiceImpl<IoCodeLostMapper, IoCodeL
return codeLostEntityMapper.selectLost(ioCodeLostRequest);
}
@Override
@Resource
RelCodeBatchService relCodeBatchService;
@Resource
RelCodeDetailService relCodeDetailService;
public IoCodeLostEntity findByCode(String code) {
List<IoCodeLostEntity> codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper<IoCodeLostEntity>().like("code", code).last("limit 1"));
if (CollUtil.isNotEmpty(codeLostEntities)) {
return codeLostEntities.get(0);
}
RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code);
if (codeRelEntity != null) {
IoCodeLostEntity udiEntity = new IoCodeLostEntity();
udiEntity.setBatchNo(codeRelEntity.getBatchNo());
udiEntity.setCode(code);
udiEntity.setProduceDate(MsDateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd"));
udiEntity.setExpireDate(MsDateUtil.formatDate(codeRelEntity.getValidateDate(), "yyMMdd"));
return udiEntity;
}
return null;
}

Write Preview
Loading…
Cancel
Save