From ce0da2cd18b3d9ebc4db2aefce4113b78cf96233 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 28 Jun 2023 09:23:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/thrsys/ThrProductsController.java | 6 +++--- src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java | 2 +- .../java/com/glxp/api/entity/inout/IoCodeTempEntity.java | 2 +- .../com/glxp/api/entity/purchase/PurOrderDetailEntity.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 92278bca..147c4b09 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -187,7 +187,7 @@ public class ThrProductsController { udiProductEntity.setMeasname(thrProductsEntity.getMeasname()); if (StrUtil.isNotEmpty(thrProductsEntity.getSpec())) udiProductEntity.setGgxh(thrProductsEntity.getSpec()); - if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) + else if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) udiProductEntity.setGgxh(thrProductsEntity.getStandard()); if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo())) udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); @@ -211,8 +211,8 @@ public class ThrProductsController { udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc()); if (StrUtil.isNotEmpty(thrProductsEntity.getCpms())) udiProductEntity.setCpms(thrProductsEntity.getCpms()); - if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) - udiProductEntity.setGgxh(thrProductsEntity.getStandard()); +// if (StrUtil.isNotEmpty(thrProductsEntity.getStandard())) +// udiProductEntity.setGgxh(thrProductsEntity.getStandard()); udiProductService.updateUdiInfo(udiProductEntity); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java index b4a6be1f..5b759e50 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java @@ -140,7 +140,7 @@ public class IoCodeEntity implements Serializable { private Date createTime; @TableField(exist = false) - private Integer status; //条码校验状态 + private int status; //条码校验状态 @TableField(exist = false) private int scanCount; diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java index 2d0c9c30..79c93765 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java @@ -137,7 +137,7 @@ public class IoCodeTempEntity { private Date createTime; @TableField(exist = false) - private Integer status; //条码校验状态 + private int status; //条码校验状态 @TableField(exist = false) private String mySupId; //更新供应商 diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java index 914bc521..23cfcb99 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java @@ -24,7 +24,7 @@ public class PurOrderDetailEntity { * 产品ID */ @TableField(value = "productId") - private Integer productId; + private Long productId; /** * 产品名称 From 3caf75626b8c7b83255cdac391415bfe5bcfd07a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 30 Jun 2023 09:02:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E5=8D=8F=E8=B0=83=E5=B9=B3=E5=8F=B0=E8=BF=BD=E6=BA=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 65 ++++++-- .../api/controller/sync/TestController.java | 47 ++++++ .../glxp/api/dao/auth/AuthCompanyMapper.java | 9 ++ .../api/dao/inout/IoOrderDetailResultDao.java | 4 + .../com/glxp/api/entity/auth/AuthCompany.java | 38 +++++ .../glxp/api/req/inout/CptTraceRequest.java | 89 +++++++++++ .../api/res/inout/CptTraceOrderResponse.java | 19 +++ .../api/res/inout/CptTraceResultResponse.java | 146 ++++++++++++++++++ .../api/service/auth/AuthCompanyService.java | 15 ++ .../inout/IoOrderDetailResultService.java | 3 + .../impl/IoOrderDetailResultServiceImpl.java | 7 + .../com/glxp/api/util/udi/UdiInfoUtil.java | 7 + .../mybatis/mapper/auth/AuthCompanyMapper.xml | 20 +++ .../mapper/inout/IoOrderDetailResultDao.xml | 29 ++++ 14 files changed, 489 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/sync/TestController.java create mode 100644 src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java create mode 100644 src/main/java/com/glxp/api/entity/auth/AuthCompany.java create mode 100644 src/main/java/com/glxp/api/req/inout/CptTraceRequest.java create mode 100644 src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java create mode 100644 src/main/java/com/glxp/api/res/inout/CptTraceResultResponse.java create mode 100644 src/main/java/com/glxp/api/service/auth/AuthCompanyService.java create mode 100644 src/main/resources/mybatis/mapper/auth/AuthCompanyMapper.xml diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 404839ae..16937ab9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; @@ -10,22 +11,24 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.AuthCompany; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; -import com.glxp.api.req.inout.FilterCodeRequest; -import com.glxp.api.req.inout.FilterOrderDetailResultRequest; -import com.glxp.api.req.inout.FilterOrderRequest; -import com.glxp.api.req.inout.InspectionPDFTemplateRequest; +import com.glxp.api.req.inout.*; +import com.glxp.api.res.inout.CptTraceOrderResponse; +import com.glxp.api.res.inout.CptTraceResultResponse; import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.service.auth.AuthCompanyService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; +import com.glxp.api.util.DateUtil; import com.glxp.api.util.JasperUtils; import net.sf.jasperreports.engine.JRException; import org.springframework.beans.factory.annotation.Value; @@ -40,10 +43,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 单据扫码明细查询接口 @@ -64,6 +64,8 @@ public class IoOrderDetailResultController extends BaseController { private SystemPDFModuleService systemPDFModuleService; @Value("${file_path}") private String filePath; + @Resource + AuthCompanyService authCompanyService; /** * 查询单据扫码明细列表 @@ -183,7 +185,6 @@ public class IoOrderDetailResultController extends BaseController { return ResultVOUtils.success(sysPdfTemplateRelevanceStatemenEntity.getTemplateId()); } - /** * 出入库明细打印 * @@ -256,4 +257,50 @@ public class IoOrderDetailResultController extends BaseController { return ResultVOUtils.success(); } + + /** + * 提供UDI协调调用单据明细 + */ + @PostMapping("/udiCpt/inout/trace/search") + public BaseResponse cptTraceOrder(@RequestBody CptTraceRequest cptTraceRequest) { + if (StrUtil.isEmpty(cptTraceRequest.getBatchNo()) || CollUtil.isEmpty(cptTraceRequest.getDiList())) { + return ResultVOUtils.error(500, "参数有误！"); + } + AuthCompany authCompany = authCompanyService.getOne(new QueryWrapper<>()); + List cptTraceOrderResponses = orderDetailResultService.cptTrace(cptTraceRequest); + List cptTraceResultResponses = new ArrayList<>(); + if (CollUtil.isNotEmpty(cptTraceOrderResponses)) { + for (CptTraceOrderResponse cptTraceOrderResponse : cptTraceOrderResponses) { + + CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse(); + cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo()); + cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime())); + cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType()); + + if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { + if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode())) + continue; + cptTraceResultResponse.setInOutType(2); + cptTraceResultResponse.setFromCorp(authCompany.getName()); + cptTraceResultResponse.setFromCorpCreditNum(authCompany.getCreditCode()); + + } else { + cptTraceResultResponse.setInOutType(1); + cptTraceResultResponse.setFromCorp(cptTraceOrderResponse.getFromCorpName()); + cptTraceResultResponse.setFromCorpCreditNum(cptTraceOrderResponse.getCreditNo()); + cptTraceResultResponse.setToCorp(authCompany.getName()); + cptTraceResultResponse.setToCorpCreditNum(authCompany.getCreditCode()); + } + if (StrUtil.isEmpty(cptTraceOrderResponse.getFromCorpName()) && cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { + cptTraceResultResponse.setBillType("使用出库"); + cptTraceResultResponse.setToUserInfo("患者使用出库"); + } + cptTraceResultResponses.add(cptTraceResultResponse); + } + } + + return ResultVOUtils.success(cptTraceResultResponses); + + } + } diff --git a/src/main/java/com/glxp/api/controller/sync/TestController.java b/src/main/java/com/glxp/api/controller/sync/TestController.java new file mode 100644 index 00000000..a1837fdb --- /dev/null +++ b/src/main/java/com/glxp/api/controller/sync/TestController.java @@ -0,0 +1,47 @@ +package com.glxp.api.controller.sync; + +import cn.hutool.core.util.StrUtil; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.idc.utils.IDCUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.util.List; + +@Slf4j +@RestController +public class TestController { + + @PostMapping("/test/file/uplaod") + @Log(title = "测试上传数据", businessType = BusinessType.INSERT) + public BaseResponse uploadProducts(@RequestParam("file") List files, @RequestParam("key") String key) { + if (StrUtil.isEmpty(key) || !key.equals("glxp6666")) { + return ResultVOUtils.error(500, "key不能为空"); + } + String filePath = "D:\\udiwms\\testFile\\"; + File createFile = new File(filePath); + if (!createFile.exists()) { + createFile.mkdirs(); + } + for (int i = 0; i < files.size(); i++) { + MultipartFile file = files.get(i); + if (file.isEmpty()) { + return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败"); + } + String fileName = file.getOriginalFilename(); + try { + IDCUtils.writeFile(file.getBytes(), filePath + file.getName(), file.getOriginalFilename()); + } catch (Exception e) { + log.error("产品信息导入失败", e); + } + } + return ResultVOUtils.success("上传成功"); + } +} diff --git a/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java b/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java new file mode 100644 index 00000000..1f9cf3c1 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.auth; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.auth.AuthCompany; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AuthCompanyMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java index 52185d55..666072e5 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java @@ -2,7 +2,9 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; +import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.res.inout.CptTraceOrderResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import java.util.List; @@ -25,5 +27,7 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest); + List cptTrace(CptTraceRequest cptTraceRequest); + } diff --git a/src/main/java/com/glxp/api/entity/auth/AuthCompany.java b/src/main/java/com/glxp/api/entity/auth/AuthCompany.java new file mode 100644 index 00000000..85bddc71 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/auth/AuthCompany.java @@ -0,0 +1,38 @@ +package com.glxp.api.entity.auth; + +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 = "auth_company") +public class AuthCompany { + @TableField(value = "`name`") + private String name; + + @TableField(value = "category") + private Integer category; + + @TableField(value = "creditCode") + private String creditCode; + + @TableField(value = "addr") + private String addr; + + @TableField(value = "productAddr") + private String productAddr; + + /** + * 企业类别：1.生产企业，2.流通企业，3。医疗机构 + */ + @TableField(value = "classes") + private Integer classes; + + @TableField(value = "appId") + private String appId; + + @TableField(value = "appSecret") + private String appSecret; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/inout/CptTraceRequest.java b/src/main/java/com/glxp/api/req/inout/CptTraceRequest.java new file mode 100644 index 00000000..64a3c849 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/CptTraceRequest.java @@ -0,0 +1,89 @@ +package com.glxp.api.req.inout; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * 客户端查询任务列表实体类 + */ +@Data +public class CptTraceRequest { + + + /** + * 按UDI码查询出入库信息 + */ + private String udiCode; + + /** + * 查询记录表ID外键 + */ + private Long produdctRecordIdFk; + + /** + * 任务类型 1：关联关系；2：入库；3：出库 + */ + private Integer taskType; + + /** + * DI标识列表，多级包装会有多个DI + * DI标识数组，逗号隔开 + */ + private List diList; + + /** + * 企业信息ID外键 + */ + private Long companyIdFk; + + /** + * 医疗器械注册人 + */ + private String ylqxzcrbarmc; + + /** + * 医疗器械注册人统一社会信用号 + */ + private String creditNum; + + /** + * 产品名称 + */ + private String cpmctymc; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + /** + * 生成日期 + */ + private String produceDate; + /** + * 失效日期 + */ + private String expireDate; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 任务创建时间 + */ + private Date createTime; + /** + * 任务更新时间 + */ + private Date updateTime; + + +} diff --git a/src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java b/src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java new file mode 100644 index 00000000..216c71f4 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java @@ -0,0 +1,19 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CptTraceOrderResponse { + + private String billNo; + private Date createTime; + private String mainAction; + private String billType; + private String fromCorpName; + private String creditNo; + private String action; + private String fromInvCode; + private Integer count; +} diff --git a/src/main/java/com/glxp/api/res/inout/CptTraceResultResponse.java b/src/main/java/com/glxp/api/res/inout/CptTraceResultResponse.java new file mode 100644 index 00000000..c8c6599d --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/CptTraceResultResponse.java @@ -0,0 +1,146 @@ +package com.glxp.api.res.inout; + +import cn.hutool.core.util.StrUtil; +import lombok.Data; + +import java.util.Date; + +@Data +public class CptTraceResultResponse { + + + private Long id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据时间 + */ + private String billDate; + + /** + * 1:入库；2：出库 + */ + private Integer inOutType; + + /** + * 单据类型 + */ + private String billType; + + /** + * 发货企业 + */ + private String fromCorp; + + /** + * 发货企业统一社会信用号 + */ + private String fromCorpCreditNum; + + /** + * 收货企业 + */ + private String toCorp; + + /** + * 收货企业统一社会信用号 + */ + private String toCorpCreditNum; + + private String toUserInfo; + + /** + * 单据创建者 + */ + private Long createUser; + + /** + * 当前企业信息ID外键 + */ + private Long companyIdFk; + + /** + * 当前企业名称 + */ + private String companyName; + + /** + * 当前企业统一社会信用号 + */ + private String companyCertNum; + + /** + * 客户端类型 + */ + private Integer clientType; + + /** + * 退货原因（退货时填写） + */ + private String returnReason; + + /** + * 销毁原因（销毁时填写） + */ + private String destoryReason; + + /** + * 执行销毁人（销毁时填写） + */ + private String excuseUser; + + /** + * 执行销毁人证件号（销毁时填写） + */ + private String excuseCode; + + /** + * 监督人姓名【销毁出库时填写】 + */ + private String superviserUser; + + /** + * 监督人证件号【销毁出库时填写】 + */ + private String superviserCode; + + /** + * 上传着ID + */ + private Long uploadUser; + + /** + * 备注 + */ + private String remark; + + /** + * 更新时间 + */ + private Date updateTime; + + //关联信息 + private String cpmctymc; + private String nameCode; + private String ggxh; + private String ylqxzcrbarmc; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String udiCode; + private String zczbhhzbapzbh; + private String recordCode; + private Integer count; + + public String getToCorp() { + if (StrUtil.isEmpty(toCorp)) + return toUserInfo; + return toCorp; + } + +} diff --git a/src/main/java/com/glxp/api/service/auth/AuthCompanyService.java b/src/main/java/com/glxp/api/service/auth/AuthCompanyService.java new file mode 100644 index 00000000..e9e77f96 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/AuthCompanyService.java @@ -0,0 +1,15 @@ +package com.glxp.api.service.auth; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.auth.AuthCompany; +import com.glxp.api.dao.auth.AuthCompanyMapper; + +@Service +public class AuthCompanyService extends ServiceImpl { + + +} + diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java index fc8e1f92..9f6affdf 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -2,7 +2,9 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; +import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.res.inout.CptTraceOrderResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import java.util.List; @@ -24,4 +26,5 @@ public interface IoOrderDetailResultService { List filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest); + List cptTrace(CptTraceRequest cptTraceRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 00f6e366..2548ac42 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -6,7 +6,9 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderDetailResultDao; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; +import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.res.inout.CptTraceOrderResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.service.inout.IoOrderDetailResultService; import org.springframework.stereotype.Service; @@ -72,4 +74,9 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic return orderDetailResultDao.filterOrderList(orderDetailResultRequest); } + @Override + public List cptTrace(CptTraceRequest cptTraceRequest) { + return orderDetailResultDao.cptTrace(cptTraceRequest); + } + } diff --git a/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java b/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java index 8d82d9c6..774b8455 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java @@ -22,6 +22,10 @@ public class UdiInfoUtil { if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhsxrq()) && "否".equals(udiProductEntity.getScbssfbhsxrq())) { udiProductEntity.setAllowNoExpire(true); } + if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhxlh()) && "否".equals(udiProductEntity.getScbssfbhxlh())) { + udiProductEntity.setAllowNoExpire(true); + } + return udiProductEntity; } @@ -42,6 +46,9 @@ public class UdiInfoUtil { if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhsxrq()) && "否".equals(udiProductEntity.getScbssfbhsxrq())) { udiProductEntity.setAllowNoExpire(true); } + if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhxlh()) && "否".equals(udiProductEntity.getScbssfbhxlh())) { + udiProductEntity.setAllowNoExpire(true); + } } } diff --git a/src/main/resources/mybatis/mapper/auth/AuthCompanyMapper.xml b/src/main/resources/mybatis/mapper/auth/AuthCompanyMapper.xml new file mode 100644 index 00000000..4eb550dd --- /dev/null +++ b/src/main/resources/mybatis/mapper/auth/AuthCompanyMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + `name`, category, creditCode, addr, productAddr, classes, appId, appSecret + + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 278064c1..a833da3d 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -74,4 +74,33 @@ + + + From f89170c3dfee1d7c539f4cc378aeee9bcff323fc Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 3 Jul 2023 17:50:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java | 4 ++++ src/main/resources/schemas/schema_v2.1.sql | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java b/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java index 774b8455..1a492bce 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java @@ -24,6 +24,8 @@ public class UdiInfoUtil { } if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhxlh()) && "否".equals(udiProductEntity.getScbssfbhxlh())) { udiProductEntity.setAllowNoExpire(true); + } else if (StrUtil.isEmpty(udiProductEntity.getScbssfbhxlh())) { + udiProductEntity.setAllowNoExpire(true); } return udiProductEntity; @@ -48,6 +50,8 @@ public class UdiInfoUtil { } if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhxlh()) && "否".equals(udiProductEntity.getScbssfbhxlh())) { udiProductEntity.setAllowNoExpire(true); + } else if (StrUtil.isEmpty(udiProductEntity.getScbssfbhxlh())) { + udiProductEntity.setAllowNoExpire(true); } } } diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 2fbcc7ba..11c0f33e 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -412,7 +412,6 @@ INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `cu `localAction`, `remark1`, `remark2`, `remark3`, `printType`, `modelKey`) VALUES (5, 33, 110, 0, NULL, '内部码报表打印', NULL, NULL, NULL, NULL, 'reportForms'); -CALL Pro_Temp_ColumnWork('basic_udirel', 'zdcfsycs', 'int', 1); CALL Pro_Temp_ColumnWork('io_order_detail_code', 'updateTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'updateTime', 'datetime ', 1);