对外查询药液订单接口

op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java

@@ -8,6 +8,7 @@ import com.op.common.core.utils.StringUtils;
 import com.op.common.core.web.controller.BaseController;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.datasource.creator.DynamicDatasourceCreator;
+import com.op.open.domain.MedicationOrder;
 import com.op.open.hr.domain.HrQuery;
 import com.op.open.nhApi.domain.NhQuery;
 import com.op.open.service.OpenService;
@@ -320,4 +321,13 @@ public class OpenController extends BaseController {
     public AjaxResult getClassInfoListByCheckType(String checkType) {
         return openService.getClassInfoListByCheckType(checkType);
     }
+
+    /**
+     * 对外查询药液订单接口
+     * **/
+    @GetMapping("/getMedicationOrder")
+    public AjaxResult getMedicationOrder(MedicationOrder order) {
+        return AjaxResult.success(openService.getMedicationOrder(order));
+    }
+
 }

op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrder.java

@@ -0,0 +1,30 @@
+package com.op.open.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * remark
+ *
+ * @author 019117
+ * @date
+ */
+@Data
+public class MedicationOrder {
+
+    private String orderCode;
+
+    private String materialCode;
+
+    private String materialName;
+
+    private String amount;
+
+    private String unit;
+
+    private String productDate;
+
+    private List<MedicationOrderDetail> list;
+
+}

op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrderDetail.java

@@ -0,0 +1,23 @@
+package com.op.open.domain;
+
+import lombok.Data;
+
+/**
+ * remark
+ *
+ * @author 019117
+ * @date
+ */
+@Data
+public class MedicationOrderDetail {
+
+    private String materialCode;
+
+    private String materialName;
+
+    private String amount;
+
+    private String unit;
+
+
+}

op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java

@@ -4,6 +4,8 @@ package com.op.open.mapper;
 
 import com.op.open.domain.EquEquipmentBo;
 import com.op.open.domain.EquRepairWorkOrderBo;
+import com.op.open.domain.MedicationOrder;
+import com.op.open.domain.MedicationOrderDetail;
 import com.op.system.api.domain.SysNoticeGroup;
 import com.op.system.api.domain.SysSapLog;
 import com.op.system.api.domain.device.DeviceRepairOrder;
@@ -119,5 +121,10 @@ public interface OpenMapper {
 //    int updateEquBatchs(@Param("list") List<EquEquipmentDTO> updates);
 //
 //    int addEquBatchs(@Param("list") List<EquEquipmentDTO> everyList);
+
+    MedicationOrder getMedicationOrder(MedicationOrder order);
+
+    List<MedicationOrderDetail> getMedicationOrderDetail(MedicationOrder order);
+
 }
 

op-modules/op-open/src/main/java/com/op/open/service/OpenService.java

@@ -1,6 +1,7 @@
 package com.op.open.service;
 
 import com.op.common.core.web.domain.AjaxResult;
+import com.op.open.domain.MedicationOrder;
 import com.op.open.hr.domain.HrQuery;
 import com.op.open.nhApi.domain.NhQuery;
 import com.op.system.api.domain.device.EquEquipmentDTO;
@@ -61,4 +62,6 @@ public interface OpenService {
     AjaxResult getAttRecord(HrQuery paramMap);
 
     AjaxResult getClassInfoListByCheckType(String checkType);
+
+    MedicationOrder getMedicationOrder(MedicationOrder order);
 }

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -3,6 +3,7 @@ package com.op.open.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.constant.Constants;
 import com.op.common.core.utils.DateUtils;
@@ -16,6 +17,8 @@ import com.op.common.security.utils.SecurityUtils;
 
 import com.op.open.domain.EquEquipmentBo;
 import com.op.open.domain.EquRepairWorkOrderBo;
+import com.op.open.domain.MedicationOrder;
+import com.op.open.domain.MedicationOrderDetail;
 import com.op.open.hr.HrApi;
 import com.op.open.hr.domain.HrQuery;
 import com.op.open.mapper.OpenMapper;
@@ -1079,4 +1082,24 @@ public class OpenServiceImpl implements OpenService {
         }
 
     }
+
+    @Override
+    @DS("#header.poolName")
+    public MedicationOrder getMedicationOrder(MedicationOrder order) {
+
+        if (StringUtils.isBlank(order.getOrderCode())){
+            throw new RuntimeException("订单号不能为空");
+        }
+
+        MedicationOrder medicationOrder = openMapper.getMedicationOrder(order);
+
+        if (medicationOrder == null){
+            throw new RuntimeException("订单不存在");
+        }
+
+        List<MedicationOrderDetail> details = openMapper.getMedicationOrderDetail(order);
+        medicationOrder.setList(details);
+
+        return medicationOrder;
+    }
 }

op-modules/op-open/src/main/resources/bootstrap.yml

@@ -15,13 +15,13 @@ spring:
       discovery:
         #命名空间
         namespace: lanju-op-test
-        group: test
+        group: fcd
         # 服务注册地址
         server-addr: 192.168.202.20:8848
       config:
         #命名空间
         namespace: lanju-op-test
-        group: test
+        group: fcd
         # 服务注册地址
         server-addr: 192.168.202.20:8848
         # 配置文件格式

op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml

@@ -635,4 +635,28 @@
         order by sort
     </select>
 
+    <select id="getMedicationOrder" parameterType="com.op.open.domain.MedicationOrder" resultType="com.op.open.domain.MedicationOrder">
+        select
+            order_code orderCode,
+            material_code materialCode,
+            material_name materialName,
+            amount,
+            unit,
+            production_date productDate
+        from pro_medication_order
+        where order_code like concat('%', #{orderCode}, '%') and  production_date = #{productDate} and material_code like concat('%', #{materialCode}, '%')
+
+    </select>
+
+
+    <select id="getMedicationOrderDetail" parameterType="com.op.open.domain.MedicationOrder" resultType="com.op.open.domain.MedicationOrderDetail">
+        select
+            material_code materialCode,
+            material_name materialName,
+            input_amount amount,
+            unit
+        from pro_medication_order_detail
+        where order_code like concat('%', #{orderCode}, '%') and production_date = #{productDate}
+    </select>
+
 </mapper>