11/25 申购查询显示优化1.0

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

@@ -1170,6 +1170,7 @@ public class IoOrderController extends BaseController {
         IoOrderEntity originOrder = orderService.findByBillNo(addOrderChangeRequest.getOrderId());
         IoOrderEntity newOrder = new IoOrderEntity();
         List<IoCodeEntity> originCodes = codeService.findByOrderId(originOrder.getBillNo());
+        newOrder.setProductType(originOrder.getProductType());
         newOrder.setCreateTime(new Date());
         newOrder.setFromCorp(addOrderChangeRequest.getFromCorp());
 

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

@@ -849,6 +849,8 @@ public class IoCheckInoutService {
         List<IoOrderCheckResultResponse> orderCheckResultResponses = new ArrayList<>();
 
         for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+            //药品数据把药品数据补齐 bzgg 制剂规格 剂型
+            UdiProductEntity product = udiProductService.findProductByNameCode(bizEntity.getNameCode());
             boolean isPass = false;
             for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
                 if (!codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null
@@ -860,6 +862,11 @@ public class IoCheckInoutService {
                     ioOrderCheckResultResponse.setBBatchNo(bizEntity.getBatchNo());
                     ioOrderCheckResultResponse.setBProductDate(bizEntity.getProductDate());
                     ioOrderCheckResultResponse.setBExpireDate(bizEntity.getExpireDate());
+                    if (product.getProductsType() == 2){
+                        ioOrderCheckResultResponse.setBzgg(product.getBzgg());
+                        ioOrderCheckResultResponse.setPrepnSpec(product.getPrepnSpec());
+                        ioOrderCheckResultResponse.setPrepnUnit(product.getPrepnUnit());
+                    }
 
                     ioOrderCheckResultResponse.setSBatchNo(codeEntity.getBatchNo());
                     ioOrderCheckResultResponse.setSProductDate(codeEntity.getProductDate());

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -85,12 +85,12 @@
     <insert id="insert" keyProperty="id" useGeneratedKeys="false"
             parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
         replace INTO pur_apply_detail
-                (orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh,destinyId)
+                (orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh,destinyId,measname)
         values (#{orderIdFk},
                 #{productId},
                 #{productName},
                 #{count},
-                #{supId}, #{zczbhhzbapzbh}, #{destinyId})
+                #{supId}, #{zczbhhzbapzbh}, #{destinyId},#{measname})
     </insert>