新增备注字段查询时查备注或病人信息

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

@@ -133,10 +133,10 @@ public class IoOrderController extends BaseController {
         }
         if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
             //要是不存在要查询的单据类型就直接放回空
-          if(orderService.setActions(filterOrderRequest) == null){
+            if (orderService.setActions(filterOrderRequest) == null) {
-              PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(new ArrayList<>());
+                PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(new ArrayList<>());
-              return ResultVOUtils.page(pageInfo);
+                return ResultVOUtils.page(pageInfo);
-          }
+            }
 
         }
 
@@ -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) {
@@ -1058,12 +1058,12 @@ public class IoOrderController extends BaseController {
         //这个不等于空表示要查询发票对应的单据
         if (filterOrderRequest.getInvoiceEncode() != null) {
             //查询发票详情
-            QueryWrapper<IoOrderInvoiceEntity> ew=new QueryWrapper<IoOrderInvoiceEntity>();
+            QueryWrapper<IoOrderInvoiceEntity> ew = new QueryWrapper<IoOrderInvoiceEntity>();
-            ew.eq("invoiceEncode",filterOrderRequest.getInvoiceEncode());
+            ew.eq("invoiceEncode", filterOrderRequest.getInvoiceEncode());
             List<IoOrderInvoiceEntity> ioOrderInvoiceEntity = orderInvoiceService.list(ew);
             List<String> orderIds = ioOrderInvoiceEntity.stream().map(IoOrderInvoiceEntity::getOrderIdFk).collect(Collectors.toList());
             filterOrderRequest.setOrderIds(orderIds);
-            if(CollectionUtils.isEmpty(orderIds)){
+            if (CollectionUtils.isEmpty(orderIds)) {
                 PageInfo<IoOrderResponse> pageInfo = new PageInfo<>();
                 return ResultVOUtils.page(pageInfo);
             }

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/req/inout/FilterOrderRequest.java

@@ -136,7 +136,7 @@ public class FilterOrderRequest extends ListPageRequest {
      * 校验异常：checkedError
      * 已校验：checkSuccess
      * 已审核：audited
-     *   * 预验收入库单  preInOrder
+     * * 预验收入库单  preInOrder
      */
     private String statusType;
 
@@ -192,4 +192,7 @@ public class FilterOrderRequest extends ListPageRequest {
 
     private String uploadKey;
     private String invoiceEncode;
+
+    //联合备注字段查询
+    private String unionRemark;
 }

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/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -14,7 +14,7 @@
                (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
                (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
                (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
-        from io_order as io
+                from io_order as io
         <if test="uploadKey != null and uploadKey != ''">
             INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
         </if>
@@ -77,7 +77,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=",">
@@ -139,8 +142,8 @@
             </if>
         </where>
         <choose>
-            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
-                order by ${orderBy}   ${sort}
+                order by ${orderBy} ${sort}
             </when>
             <otherwise>
                 order by updateTime desc
@@ -294,8 +297,8 @@
             </if>
         </where>
         <choose>
-            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
-                order by ${orderBy}   ${sort}
+                order by ${orderBy} ${sort}
             </when>
             <otherwise>
                 order by updateTime desc
@@ -340,6 +343,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>
@@ -441,7 +448,7 @@
             <if test="thirdSys != null and thirdSys != ''">
                 AND t1.thirdSys = #{thirdSys}
             </if>
-            <if test="orderStartTime != null ">
+            <if test="orderStartTime != null">
                 <![CDATA[
                 and updateTime >= DATE_FORMAT(#{orderStartTime}, '%Y-%m-%d %H:%i:%S')
                 ]]>
@@ -462,43 +469,43 @@
 
     <select id="selectOrderIdList" resultType="java.lang.String">
         SELECT billNo
-           FROM io_order
+        FROM io_order
-        LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
+                     LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
         WHERE basic_bussiness_type.inStock = 1
           and io_order.`status` = 7
-          AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data},'%Y-%m-%d')
+          AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data}, '%Y-%m-%d')
     </select>
 
     <select id="selectOrderfirstAndLastIdList" resultType="java.lang.String">
         SELECT billNo
         FROM io_order
-        LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
+                     LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
         WHERE basic_bussiness_type.inStock = 1
-        and io_order.`status` = 7
+          and io_order.`status` = 7
-        AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{lastData}, '%Y-%m-%d') and
+          AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{lastData}, '%Y-%m-%d') and
-        date_format(#{firstData}, '%Y-%m-%d')
+                date_format(#{firstData}, '%Y-%m-%d')
     </select>
 
 
     <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
         SELECT io.*,
-        bus.NAME AS billTypeName,
+               bus.NAME AS billTypeName,
-        ad.NAME  AS deptName,
+               ad.NAME  AS deptName,
-        aw.NAME  AS invName,
+               aw.NAME  AS invName,
-        bc.NAME  AS fromCorpName
+               bc.NAME  AS fromCorpName
         FROM io_order io
-        LEFT JOIN basic_bussiness_type bus ON io.action = bus.action
+                     LEFT JOIN basic_bussiness_type bus ON io.action = bus.action
-        LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE
+                     LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE
-        LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE
+                     LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE
-        LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
+                     LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
-        LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
+                     LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
         <where>
             <if test="id != null and id != ''">
                 AND io.id = #{id}
             </if>
             <if test="corpName != null and corpName != ''">
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
-                concat('%', #{corpName}, '%')
+                    concat('%', #{corpName}, '%')
             </if>
             <if test="action != null and action != ''">
                 AND io.action = #{action}
@@ -506,6 +513,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>
@@ -586,12 +597,12 @@
 
                 <if test="invoiceActions1 == null and invoiceActions2 != null">
                     and (
-                    io.`action` in
+                            io.`action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                     and io.status = 7
-                    )
+                            )
                 </if>
 
                 <if test="invoiceActions1 != null and invoiceActions2 != null">
@@ -600,13 +611,13 @@
                         #{item}
                     </foreach>
                     and io.status = 10)
-                    or (
+                            or (
-                    io.`action` in
+                            io.`action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                     and io.status = 7)
-                    )
+                            )
                 </if>
             </if>
         </where>

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);
+
+