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

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

@@ -264,4 +264,11 @@ public class IoOrderEntity {
     @TableField(value = "rmInvCode")
     private String rmInvCode;
 
+    /**
+     * 出库病人信息
+     */
+    @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 invoiceEncode;
 
+    //联合备注字段查询
+    private String unionRemark;
+
 }

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

@@ -52,7 +52,8 @@ public class IoGenInvService {
     IoCodeService codeService;
     @Resource
     IBasicBusTypePreService basicBusTypePreService;
-
+    @Resource
+    IBasicBussinessTypeService basicBussinessTypeService;
 
     @Resource
     IoChangeInoutService ioChangeInoutService;
@@ -64,6 +65,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/application-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

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

@@ -53,6 +53,10 @@
             <if test="relKey != null">
                 AND relKey = #{relKey}
             </if>
+            <if test="unionRemark != null and unionRemark != ''">
+                AND (io.remark like concat('%', #{unionRemark}, '%')
+                        or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>
@@ -205,6 +209,10 @@
             <if test="relKey != null">
                 AND relKey = #{relKey}
             </if>
+            <if test="unionRemark != null and unionRemark != ''">
+                AND (io.remark like concat('%', #{unionRemark}, '%')
+                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>
@@ -313,6 +321,10 @@
             <if test="fromCorp != null and fromCorp != ''">
                 AND fromCorp = #{fromCorp}
             </if>
+            <if test="unionRemark != null and unionRemark != ''">
+                AND (io.remark like concat('%', #{unionRemark}, '%')
+                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+            </if>
             <if test="customerId != null and customerId != ''">
                 AND customerId = #{customerId}
             </if>
@@ -460,6 +472,10 @@
             <if test="busType != null">
                 AND io.busType = #{busType}
             </if>
+            <if test="unionRemark != null and unionRemark != ''">
+                AND (io.remark like concat('%', #{unionRemark}, '%')
+                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+            </if>
             <if test="inCodeStatus != null">
                 AND io.inCodeStatus = #{inCodeStatus}
             </if>
@@ -556,6 +572,4 @@
             </otherwise>
         </choose>
     </select>
-
-
 </mapper>

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

@@ -436,3 +436,6 @@ VALUES (20059, 0, '是否允许编辑第三方产品信息', 'enable_edit_third'
 CALL Pro_Temp_ColumnWork('io_order', 'rmFromCorp', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
+