Merge remote-tracking branch 'origin/dev_drug' into dev_drug

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -202,7 +202,7 @@ public class BasicBussinessTypeController extends BaseController {
 
         if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
             List<BasicBussinessTypeEntity> result = new ArrayList<>();
-            List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType());
+            List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueTypeAndType(bussinessTypeFilterRequest);
             if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getInvCode()) || StrUtil.isNotEmpty(bussinessTypeFilterRequest.getCode())) {
                 //过滤是否是当前仓库底下单据类型
                 FilterBussinessTypeRequest tempRequest = new FilterBussinessTypeRequest();

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -82,4 +82,6 @@ public interface UdiProductService {
     void updateLevelCount(UdiRelevanceEntity udiRelevanceEntity);
 
     boolean deleteByNameCode(String nameCode);
+
+    UdiProductEntity findProductByNameCode(String nameCode);
 }

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -586,6 +586,11 @@ public class UdiProductServiceImpl implements UdiProductService {
         return udiProductDao.delete(new QueryWrapper<UdiProductEntity>().eq("nameCode", nameCode)) > 0;
     }
 
+    @Override
+    public UdiProductEntity findProductByNameCode(String nameCode) {
+        return udiProductDao.findByNameCode(nameCode);
+    }
+
     /**
      * 根据当前层级标识计算流通拆零数量
      */

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -14,6 +14,7 @@ import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.UdiEntity;
+import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
 import com.glxp.api.entity.inv.InvPreinDetailEntity;
@@ -26,6 +27,7 @@ import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inout.impl.IoCodeTempService;
 import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
@@ -87,6 +89,9 @@ public class IoCheckInoutService {
     @Resource
     SystemParamConfigService systemParamConfigService;
 
+    @Resource
+    UdiProductService udiProductService;
+
     /**
      * 判断是否需要手动校验
      *
@@ -447,6 +452,11 @@ public class IoCheckInoutService {
                 orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount());
                 orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount());
                 orderDetailResultEntity.setId(null);
+                UdiProductEntity product =  udiProductService.findProductByNameCode(orderDetailCodeEntity.getNameCode());
+                if (product.getProductsType() == 2){
+                    //药品 拿到药品赋值
+                    orderDetailResultEntity.setSpec(product.getBzgg());
+                }
                 orderDetailResultService.insert(orderDetailResultEntity);
 
             });
@@ -569,6 +579,11 @@ public class IoCheckInoutService {
                 BeanUtils.copyProperties(orderDetailBizEntity, orderDetailResultEntity);
                 orderDetailResultEntity.setId(null);
                 orderDetailResultEntity.setReCount(orderDetailBizEntity.getScanCount());
+                UdiProductEntity product =  udiProductService.findProductByNameCode(orderDetailBizEntity.getNameCode());
+                if (product.getProductsType() == 2){
+                    //药品 拿到药品赋值
+                    orderDetailResultEntity.setSpec(product.getBzgg());
+                }
                 orderDetailResultService.insert(orderDetailResultEntity);
             }
 

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -8,8 +8,8 @@
         bp.prepnUnit,
         bp.bzgg
         from io_order_detail_biz
-                     left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+        left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
-                     left join basic_products bp on bu.uuid = bp.uuid
+        left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -33,8 +33,8 @@
         bp.prepnSpec,
         bp.prepnUnit
         from io_order_detail_biz
-                     left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+        left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
-                     left join basic_products bp on bu.uuid = bp.uuid
+        left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -54,12 +54,12 @@
 
     <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
         select io_order_detail_code.*,
-               (select count(*)
+        (select count(*)
-                FROM io_order_invoice
+        FROM io_order_invoice
-                where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
+        where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
         from io_order_detail_code
-                     left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
+        left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
-                     left join basic_products bp on bu.uuid = bp.uuid
+        left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -79,14 +79,14 @@
 
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        SELECT ic.*, cpmctymc, ggxh,
+        SELECT ic.*, bp.cpmctymc, bp.ggxh,
         bp.bzgg,
         bp.packUnit,
         bp.prepnSpec,
         bp.prepnUnit
         FROM io_order_invoice ic
-                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}

src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml

@@ -121,7 +121,8 @@
                io.manufacturer,
                io.certCode,
                io.reCount,
-               io.count
+               io.count,
+               bp.bzgg
         FROM io_order_invoice ic
                      INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk
                      LEFT JOIN basic_udirel bu