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

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -162,7 +162,6 @@ public class IoOrderController extends BaseController {
             if (ioOrderResponse.getCheckStatus() == null) {
                 ioOrderResponse.setCheckStatus(0 + "");
             }
-            ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
         }
 
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
@@ -1051,6 +1050,7 @@ public class IoOrderController extends BaseController {
         AuthAdmin userBean = customerService.getUserBean();
         return ResultVOUtils.success(userBean);
     }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/order/filterInvoiceList")
     public BaseResponse filterInvoiceList(FilterOrderRequest filterOrderRequest) {

src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java

@@ -13,6 +13,7 @@ import java.util.List;
 public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRelevanceEntity, UdiRelevanceEntity> {
 
     List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
+    String selectPackLevel(@Param("nameCode") String nameCode);
 
 
     List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);

src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java

@@ -12,4 +12,5 @@ public interface InvInnerOrderPrintDao extends BaseMapper<InvInnerOrderPrintEnti
     List<InvInnerOrderPrintEntity> filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
 
     List<InnerOrderPrintResponse> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
+
 }

src/main/java/com/glxp/api/entity/basic/UdiEntity.java

@@ -1,5 +1,7 @@
 package com.glxp.api.entity.basic;
 
+import cn.hutool.core.util.StrUtil;
+
 /**
  * @author 彭于晏
  * @date 2020/9/22.

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -171,6 +171,5 @@ public class UdiRelevanceEntity {
 
     @TableField(value = "certIdFk")
     private String certIdFk;
-    @TableField(value = "zdcfsycs")
+
-    private Integer zdcfsycs ;
 }

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -265,5 +265,11 @@ public class IoOrderEntity {
     @TableField(value = "preCurSpaceCode")
     private String preCurSpaceCode;
 
+    /**
+     * 出库病人信息
+     */
+    @TableField(value = "outSickInfo")
+    private String outSickInfo;
+
 
 }

src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java

@@ -9,6 +9,7 @@ public class InnerOrderDetailEntity {
     private String orderIdFk;
     private String productId;
     private String productName;
+    private String nameCode;
     private Integer count;
     private String productDate;
     private String expireDate;

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -30,6 +30,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
 
     private String lastUpdateTime;
     private String zczbhhzbapzbh;
+    private String packLevel;
     private Integer diType;
 
 

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -192,4 +192,9 @@ public class FilterOrderRequest extends ListPageRequest {
 
     private String uploadKey;
     private String invoiceEncode;
+
+    //联合备注字段查询
+    private String unionRemark;
+
+    private String remark;
 }

src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java

@@ -45,6 +45,7 @@ public class innerOrderDetailResponse {
     private int acceptCount;
     private String measname;
     private String supId;
+    private String nameCode;
 
     private String supName;
 }

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

@@ -1,14 +1,17 @@
 package com.glxp.api.service.inout;
 
 import cn.hutool.core.util.StrUtil;
+import com.glxp.api.constant.BusinessType;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.entity.basic.BasicBusTypePreEntity;
+import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.*;
 import com.glxp.api.service.basic.IBasicBusTypePreService;
+import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inv.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -42,7 +45,8 @@ public class IoGenInvService {
     InvUserProductService invUserProductService;
     @Resource
     InvUserProductDetailService invUserProductDetailService;
-
+    @Resource
+    IBasicBussinessTypeService basicBussinessTypeService;
 
     @Resource
     IoChangeInoutService ioChangeInoutService;
@@ -54,6 +58,13 @@ public class IoGenInvService {
         List<IoOrderDetailResultEntity> orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId);
         List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId);
 
+        //补齐单据信息
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+        if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) {
+            orderEntity.setOutSickInfo(orderEntity.getFromCorp());
+            orderService.update(orderEntity);
+        }
+
         //生成库存产品表
         for (IoOrderDetailResultEntity orderDetailResultEntity : orderDetailResultEntities) {
             InvProductEntity invProductEntity = invProductService.selectByUnique(orderDetailResultEntity.getBindRlFk(), orderDetailResultEntity.getBatchNo(), orderDetailResultEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode());

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java

@@ -113,8 +113,11 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             innerOrderPrintEntity.setUpdateUser(customerService.getUserId() + "");
             FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
             filterUdiRelRequest.setId(Long.valueOf(obj.getProductId()));
+            filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode()));
+            System.out.println(filterUdiRelRequest.getPackLevel());
             //查询耗材字典信息
-            UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
+//            UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
+            UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(Integer.parseInt(filterUdiRelRequest.getPackLevel())-1);
             //查询产品信息
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
 

src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java

@@ -117,9 +117,13 @@ public class FilterUdiUtils {
             batchNo = spilts[4];
             if (spilts.length > 6) {
                 serialNo = spilts[5];
-                if (serialNo != null && serialNo.equals("")) {
-                    serialNo = null;
             }
+
+            if (StrUtil.isEmpty(batchNo)) {
+                batchNo = null;
+            }
+            if (StrUtil.isEmpty(serialNo)) {
+                serialNo = null;
             }
 
         }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -121,7 +121,20 @@
         </where>
         ORDER BY modifyTime DESC
     </select>
+    <select id="selectPackLevel" parameterType="java.lang.String"
+            resultType="java.lang.String">
+        select
+        basic_products.packLevel
+        FROM basic_udirel
+        inner JOIN basic_products
+        ON basic_products.uuid = basic_udirel.uuid
+        <where>
+            <if test="nameCode != '' and nameCode != null">
+                AND basic_products.nameCode = #{nameCode}
+            </if>
+        </where>
 
+    </select>
 
     <select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
@@ -1239,9 +1252,6 @@
             <if test="relCode != '' and relCode != null">
                 relCode=#{relCode},
             </if>
-            <if test="zdcfsycs != '' and zdcfsycs != null">
-                zdcfsycs=#{zdcfsycs},
-            </if>
             <if test="needCert != null">
                 needCert=#{needCert},
             </if>

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

@@ -29,6 +29,9 @@
             <if test="action != null and action != ''">
                 AND action = #{action}
             </if>
+            <if test="remark != null and remark != ''">
+                AND remark  like concat('%', #{remark}, '%')
+            </if>
             <if test="mainAction != null and mainAction != ''">
                 AND mainAction = #{mainAction}
             </if>
@@ -77,7 +80,10 @@
                     #{item}
                 </foreach>
             </if>
-
+            <if test="unionRemark != null and unionRemark != ''">
+                AND (io.remark like concat('%', #{unionRemark}, '%')
+                        or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+            </if>
             <if test="statuses != null and statuses.size() != 0">
                 AND status in
                 <foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
@@ -340,6 +346,10 @@
             <if test="syncStatus != null">
                 AND syncStatus = #{syncStatus}
             </if>
+            <if test="unionRemark != null and unionRemark != ''">
+                AND (io.remark like concat('%', #{unionRemark}, '%')
+                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+            </if>
             <if test="busType != null">
                 AND busType = #{busType}
             </if>
@@ -506,6 +516,10 @@
             <if test="mainAction != null and mainAction != ''">
                 AND io.mainAction = #{mainAction}
             </if>
+            <if test="unionRemark != null and unionRemark != ''">
+                AND (io.remark like concat('%', #{unionRemark}, '%')
+                        or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+            </if>
             <if test="billNo != null and billNo != ''">
                 AND io.billNo like concat('%', #{billNo}, '%')
             </if>

src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml

@@ -30,7 +30,7 @@
         replace
         INTO  inv_inner_order_detail
         (
-        orderIdFk,productId,productName,`count`,productDate,expireDate,batchNo
+        orderIdFk,productId,productName,`count`,productDate,expireDate,batchNo,nameCode
         )
         values (
         #{orderIdFk},
@@ -39,7 +39,8 @@
         #{count},
         #{productDate},
         #{expireDate},
-        #{batchNo}
+        #{batchNo},
+        #{nameCode}
         )
     </insert>
 
@@ -75,6 +76,7 @@
             <if test="expireDate != null">expireDate=#{expireDate},</if>
             <if test="productDate != null">productDate=#{productDate},</if>
             <if test="batchNo != null">batchNo=#{batchNo},</if>
+            <if test="nameCode != null">nameCode=#{nameCode},</if>
         </trim>
         WHERE id = #{id}
     </update>

src/main/resources/schemas/schema_v2.1.sql

@@ -513,6 +513,8 @@ CALL Pro_Temp_ColumnWork('basic_products', 'syqsfxyjxmj', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_products', 'mjfs', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_products', 'categoryName', 'varchar(255)', 1);
 
+
+
 CALL Pro_Temp_ColumnWork('thr_system_detail', 'dlLastTime', 'int', 1);
 
 
@@ -595,4 +597,7 @@ CREATE TABLE if not exists `io_destiny_process_detail`
   ROW_FORMAT = Dynamic;
 
 
+CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
+
+