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

feat: 三方出入库明细功能

Browse Source
dev_20240306
chenhc 1 year ago
parent 8c0e5a73ba
commit 1f116efd92
8 changed files with 267 additions and 64 deletions
Show Stats Download Patch File Download Diff File

23
src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java
Unescape Escape View File

@ -108,6 +108,18 @@ public class ThrInvOrderController {
return ResultVOUtils.error(500, "生成失败！");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/generateGhOrder")
public BaseResponse generateGhOrder(@RequestBody @Valid GenerateOrderRequest generateOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (thrInvOrderService.generateGhOrder(generateOrderRequest)){
return ResultVOUtils.success("生成成功");
}
return ResultVOUtils.error(500, "生成失败！");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/refreshOrder")
public BaseResponse refreshOrder(@RequestBody @Valid RefreshOrderRequest refreshOrderRequest, BindingResult bindingResult) {
@ -120,4 +132,15 @@ public class ThrInvOrderController {
return ResultVOUtils.error(500, "刷新失败！");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/refreshGhOrder")
public BaseResponse refreshGhOrder(@RequestBody @Valid RefreshOrderRequest refreshOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (thrInvOrderService.refreshGhOrder(refreshOrderRequest)){
return ResultVOUtils.success("刷新成功");
}
return ResultVOUtils.error(500, "刷新失败！");
}
}

3
src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.dao.basic;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.basic.BasicProductsEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse;
@ -136,4 +137,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest);
List<BasicProductsEntity> selectProductByRelIds(@Param("relIds")List<Long> relIds);
List<BasicProductsEntity> getProductsEntitiesByNameCode(String nameCode);
}

8
src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetail.java
Unescape Escape View File

@ -68,12 +68,12 @@ public class ThrInvOrderDetail implements Serializable {
/**
* 生产日期
*/
private Date productionDate;
private String productionDate;
/**
* 失效日期
*/
private Date expireDate;
private String expireDate;
/**
* 医疗器械注册备案人
@ -154,6 +154,10 @@ public class ThrInvOrderDetail implements Serializable {
* udiCode
*/
private String udiCode;
/**
* serialNo
*/
private String serialNo;
private static final long serialVersionUID = 1L;

10
src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java
Unescape Escape View File

@ -48,10 +48,20 @@ public interface ThrInvOrderService {
*/
boolean generateOrder(GenerateOrderRequest generateOrderRequest);
boolean generateGhOrder(GenerateOrderRequest generateOrderRequest);
/**
* 刷新单据
* @param refreshOrderRequest
* @return
*/
boolean refreshOrder(RefreshOrderRequest refreshOrderRequest);
/**
* 刷新单据高耗
* @param refreshOrderRequest
* @return
*/
boolean refreshGhOrder(RefreshOrderRequest refreshOrderRequest);
}

112
src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -17,6 +18,7 @@ import com.glxp.api.dao.thrsys.ThrInvOrderMapper;
import com.glxp.api.entity.basic.BasicProductsEntity;
import com.glxp.api.entity.basic.BasicSkProjectDetailEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
@ -45,6 +47,7 @@ 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.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -153,7 +156,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
handleExternalConvertThrInvGhOrderDetail(list, thrInvOrderDetails, billNo, thirdSys, thrInvOrder);
if (CollectionUtil.isNotEmpty(thrInvOrderDetails)) {
handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, list.get(0),Constant.THR_INV_PH_ORDER_TYPE);
handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, list.get(0), Constant.THR_INV_GH_ORDER_TYPE);
//保存数据
thrInvOrderMapper.insert(thrInvOrder);
@ -165,6 +168,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
/**
* 处理高耗
*
* @param list
* @param thrInvOrderDetails
* @param billNo
@ -172,24 +176,49 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
* @param thrInvOrder
*/
private void handleExternalConvertThrInvGhOrderDetail(List<ThrInvResultResponse> list, List<ThrInvOrderDetail> thrInvOrderDetails, String billNo, String thirdSys, ThrInvOrder thrInvOrder) {
StringBuilder exmsg = new StringBuilder("");
list.forEach(item -> {
String udiCode = item.getUdiCode();
UdiEntity udi = FilterUdiUtils.getUdi(udiCode);
/**
* udi 的 产品编号 获取产品信息 包装
*
*/
// TODO: 2024/3/4
ThrInvOrderDetail thrInvOrderDetail = new ThrInvOrderDetail();
String udiCode = item.getUdiCode();
UdiEntity udiEntity = FilterUdiUtils.getUdi(udiCode);
String nameCode = udiEntity.getUdi();
List<BasicProductsEntity> productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode);
if (CollectionUtil.isNotEmpty(productsEntities)) {
BasicProductsEntity basicProductsEntity = productsEntities.get(0);
String mainAction = item.getMainAction();
String thrCode = item.getThrCode();
Long relId = basicProductsEntity.getId();
Integer count;
if (ConstantType.TYPE_PUT.equals(mainAction)) {
count = Integer.valueOf(item.getInCount());
} else {
count = Integer.valueOf(item.getOutCount());
}
BeanUtils.copyProperties(item, thrInvOrderDetail);
thrInvOrderDetail.setOrderIdFk(billNo);
thrInvOrderDetail.setNameCode(nameCode);
thrInvOrderDetail.setRelId(relId);
thrInvOrderDetail.setUdiCode(udiCode);
thrInvOrderDetail.setThrCode(thrCode);
thrInvOrderDetail.setReCount(String.valueOf(count));
thrInvOrderDetail.setBatchNo(udiEntity.getBatchNo());
thrInvOrderDetail.setProductionDate(udiEntity.getProduceDate());
thrInvOrderDetail.setExpireDate(udiEntity.getExpireDate());
thrInvOrderDetail.setSerialNo(udiEntity.getSerialNo());
thrInvOrderDetails.add(thrInvOrderDetail);
} else {
exmsg.append(udiCode + ",");
}
});
if (exmsg.length() > 0) {
exmsg.deleteCharAt(exmsg.length() - 1);
exmsg.insert(0, "以下UDI码未匹配成功：");
thrInvOrder.setExMsg(String.valueOf(exmsg));
}else {
thrInvOrder.setExMsg("");
}
}
@ -318,6 +347,13 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
return true;
}
@Override
public boolean generateGhOrder(GenerateOrderRequest generateOrderRequest) {
String billNo = generateOrderRequest.getBillNo();
// TODO: 2024/3/5
return true;
}
@Override
public boolean refreshOrder(RefreshOrderRequest refreshOrderRequest) {
String billNo = refreshOrderRequest.getBillNo();
@ -429,6 +465,54 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
return true;
}
@Override
public boolean refreshGhOrder(RefreshOrderRequest refreshOrderRequest) {
String billNo = refreshOrderRequest.getBillNo();
//通过单号获取单据信息
QueryWrapper<ThrInvOrder> qw = new QueryWrapper<>();
qw.eq("billNo", billNo);
ThrInvOrder thrInvOrder = thrInvOrderMapper.selectOne(qw);
if (Objects.isNull(thrInvOrder)) return false;
//通过单号获取单据明细信息
QueryWrapper<ThrInvOrderDetail> qwd = new QueryWrapper<>();
qwd.eq("orderIdFk", billNo);
List<ThrInvOrderDetail> thrInvOrderDetails = thrInvOrderDetailMapper.selectList(qwd);
if (CollectionUtil.isEmpty(thrInvOrderDetails)) return false;
List<ThrInvOrderDetail> updateThrInvOrderDetails = new ArrayList<>();
StringBuilder exmsg = new StringBuilder("");
thrInvOrderDetails.forEach(item -> {
Long relId = item.getRelId();
if (ObjectUtil.isNull(relId)) {
String nameCode = item.getNameCode();
List<BasicProductsEntity> productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode);
if (CollectionUtil.isNotEmpty(productsEntities)) {
BasicProductsEntity basicProductsEntity = productsEntities.get(0);
item.setRelId(basicProductsEntity.getId());
updateThrInvOrderDetails.add(item);
} else {
exmsg.append(nameCode + ",");
}
}
});
if (exmsg.length() > 0) {
exmsg.deleteCharAt(exmsg.length() - 1);
exmsg.insert(0, "以下UDI码未匹配成功：");
thrInvOrder.setExMsg(String.valueOf(exmsg));
}else {
thrInvOrder.setExMsg("");
}
//更新单据信息
thrInvOrderMapper.updateById(thrInvOrder);
//更新明细
if (CollectionUtil.isNotEmpty(updateThrInvOrderDetails)) {
thrInvOrderDetailMapper.updateBatchById(updateThrInvOrderDetails);
}
return true;
}
/**
* 校验relId字段有空返回false
*

67
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -1878,4 +1878,71 @@
</foreach>
</select>
<select id="getProductsEntitiesByNameCode" resultType="com.glxp.api.entity.basic.BasicProductsEntity">
select bu.id,
basic_products.originUuid,
basic_products.nameCode,
basic_products.deviceRecordKey,
basic_products.packRatio,
basic_products.packUnit,
basic_products.packLevel,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.ybbm,
basic_products.sptm,
basic_products.manufactory,
basic_products.measname,
basic_products.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
basic_products.cpdls,
basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName
from basic_udirel AS bu
LEFT JOIN basic_products
ON bu.uuid = basic_products.uuid
where basic_products.nameCode = #{nameCode}
</select>
</mapper>

19
src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
Unescape Escape View File

@ -32,13 +32,14 @@
<result column="manufacturer" jdbcType="VARCHAR" property="manufacturer" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="udiCode" jdbcType="VARCHAR" property="udiCode" />
<result column="serialNo" jdbcType="VARCHAR" property="serialNo" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, orderIdFk, cpmctymc, relId, thrCode, nameCode, ggxh, batchNo, measname, price,
productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, inCount, outCount, supName,
deptName, deptCode, invName, invCode, spaceCode, spaceName, reCount, mainAction,
manufacturer, remark,udiCode
manufacturer, remark,udiCode,serialNo
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated-->
@ -62,7 +63,7 @@
supName, deptName, deptCode,
invName, invCode, spaceCode,
spaceName, reCount, mainAction,
manufacturer, remark,udiCode)
manufacturer, remark,udiCode,serialNo)
values (#{orderIdFk,jdbcType=VARCHAR}, #{cpmctymc,jdbcType=VARCHAR}, #{relId,jdbcType=INTEGER},
#{thrCode,jdbcType=VARCHAR}, #{nameCode,jdbcType=VARCHAR}, #{ggxh,jdbcType=VARCHAR},
#{batchNo,jdbcType=VARCHAR}, #{measname,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL},
@ -71,7 +72,7 @@
#{supName,jdbcType=VARCHAR}, #{deptName,jdbcType=VARCHAR}, #{deptCode,jdbcType=VARCHAR},
#{invName,jdbcType=VARCHAR}, #{invCode,jdbcType=VARCHAR}, #{spaceCode,jdbcType=VARCHAR},
#{spaceName,jdbcType=VARCHAR}, #{reCount,jdbcType=VARCHAR}, #{mainAction,jdbcType=VARCHAR},
#{manufacturer,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{udiCode,jdbcType=VARCHAR})
#{manufacturer,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{udiCode,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrderDetail" useGeneratedKeys="true">
<!--@mbg.generated-->
@ -158,6 +159,9 @@
<if test="udiCode != null">
udiCode,
</if>
<if test="serialNo != null">
serialNo,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderIdFk != null">
@ -241,6 +245,9 @@
<if test="udiCode != null">
#{udiCode,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
#{serialNo,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.entity.thrsys.ThrInvOrderDetail">
@ -328,6 +335,9 @@
<if test="udiCode != null">
udiCode = #{udiCode,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
serialNo = #{serialNo,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@ -360,7 +370,8 @@
mainAction = #{mainAction,jdbcType=VARCHAR},
manufacturer = #{manufacturer,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
udiCode = #{udiCode,jdbcType=VARCHAR}
udiCode = #{udiCode,jdbcType=VARCHAR},
serialNo = #{serialNo,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>

1
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -593,3 +593,4 @@ CALL Pro_Temp_ColumnWork('thr_inv_order', 'sourceType', ' int(0) NULL DEFAULT NU
CALL Pro_Temp_ColumnWork('thr_inv_order', 'exMsg', ' varchar(510) NULL DEFAULT NULL COMMENT ''单据异常信息'' AFTER `remark`', 1);
CALL Pro_Temp_ColumnWork('thr_inv_order', 'skProject',' int(0) NULL DEFAULT NULL COMMENT ''是否组套'' AFTER `remark`', 1);
CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'udiCode',' varchar(255) NULL DEFAULT NULL COMMENT ''udiCode'' AFTER `remark`', 1);
CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'serialNo',' varchar(255) NULL DEFAULT NULL COMMENT ''序列号'' AFTER `remark`', 1);

Write Preview
Loading…
Cancel
Save