From e75234fc27a51bde5a20da1e401694a2dcd456b3 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 7 Nov 2024 19:38:40 +0800
Subject: [PATCH] =?UTF-8?q?11/7=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/res/inout/IoCodeTempResponse.java     | 31 +++++++++++++++++++
 .../impl/IoOrderDetailCodeServiceImpl.java    | 13 ++++++++
 .../mybatis/mapper/inout/IoCodeTempDao.xml    | 16 ++++++++--
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java
index 921d2d84..8da1faf0 100644
--- a/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java
@@ -129,4 +129,35 @@ public class IoCodeTempResponse {
     @TableField(value = "drugLink")
     private Integer drugLink;
 
+    private String remark;
+
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 仓库名称
+     */
+    private String invName;
+
+    /**
+     * 货位名称
+     */
+    private String warehouseName;
+
+    private String productName;
+    private String ggxh;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String manufactory;
+
+
+
+    //药品数据
+    private String bzgg;
+    private String prepnUnit;
+    private String prepnSpec;
+
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
index 58e4303c..58ebd2ab 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
@@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicCorpDao;
 import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
+import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.service.basic.impl.UdiProductServiceImpl;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
@@ -39,6 +41,9 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
     @Resource
     private BasicCorpDao basicCorpDao;
 
+    @Resource
+    UdiProductServiceImpl udiProductService;
+
     @Override
     public List<IoOrderDetailCodeEntity> findByOrderId(String orderId) {
         return ioOrderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId).orderByDesc("id"));
@@ -136,8 +141,16 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
         }
         List<IoOrderDetailCodeResponse> list = new ArrayList<>(orderEntityList.size());
         for (IoOrderDetailCodeEntity ioOrderDetailCodeEntity : orderEntityList) {
+
             IoOrderDetailCodeResponse resp = new IoOrderDetailCodeResponse();
             BeanUtil.copyProperties(ioOrderDetailCodeEntity, resp);
+            if (ioOrderDetailCodeEntity.getProductType() == 2){
+                //增加药品数据
+                UdiProductEntity product = udiProductService.findByNameCode(ioOrderDetailCodeEntity.getNameCode());
+                resp.setBzgg(product.getBzgg());
+                resp.setPrepnUnit(product.getPrepnUnit());
+                resp.setPrepnSpec(product.getPrepnSpec());
+            }
             String supName = basicCorpDao.selectNameByErpId(ioOrderDetailCodeEntity.getSupId());
             resp.setSupName(supName);
             list.add(resp);
diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml
index bcfd22c5..0f09f934 100644
--- a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml
@@ -2,9 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoCodeTempDao">
     <select id="selectCodeList" resultType="com.glxp.api.res.inout.IoCodeTempResponse">
-        select *,
-               (select `name` from basic_corp where erpId = io_code_temp.supId) supName
-        from io_code_temp
+        select ic.*,
+        bp.cpmctymc productName,
+        bp.ggxh,
+        bp.bzgg,
+        bp.prepnUnit,
+        bp.prepnSpec,
+        bp.ylqxzcrbarmc,
+        bp.zczbhhzbapzbh,
+        bp.manufactory,
+        bc.name     supName
+        from io_code_temp ic
+        left join basic_products bp on bp.nameCode = ic.nameCode
+        left join basic_corp bc on ic.supId = bc.erpId
         <where>
             <if test="orderId != null and orderId != ''">
                 orderId = #{orderId}