9/25 药品层级优化

src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -67,4 +68,19 @@ public class BasicCollectUserController extends BaseController {
     }
 
 
+    @GetMapping("/udiwms/sysWorkplace/getUserWorkByWorkplaceCode")
+    public BaseResponse getUserWorkByWorkplaceCode(BasicCollectUserRequest request) {
+        if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1) {
+            request.setUserId(String.valueOf(getUserId()));
+        }
+        BasicCollectUserEntity user = basicCollectUserService.getOne(new LambdaQueryWrapper<BasicCollectUserEntity>()
+                .eq(BasicCollectUserEntity::getWorkplaceCode,request.getWorkplaceCode())
+                .eq(BasicCollectUserEntity::getUserId,request.getUserId()));
+        if (user == null){
+            return ResultVOUtils.error(500,"当前用户工位已被移除");
+        }
+        return ResultVOUtils.success();
+    }
+
+
 }

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -257,6 +257,7 @@ public class UdiRelevanceController extends BaseController {
                 BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse);
                 BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
                 udiRelevanceResponse.setFlbm(udiProductEntity.getFlbm());
+                udiRelevanceResponse.setProductId(udiProductEntity.getId());
                 udiRelevanceResponses.add(udiRelevanceResponse);
             }
         }

src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java

@@ -71,7 +71,7 @@ public class IoCollectOriginController extends BaseController {
     @PostMapping("/udiwms/basic/collect/origin/order/getThrOrderPage")
     public BaseResponse getThrOrders(@RequestBody CollectOrderRequest collectOrderRequest) {
         String busType = collectOrderRequest.getBusType();
-        if (StrUtil.isBlank(busType)) return ResultVOUtils.error("请选择业务类型");
+        if (StrUtil.isBlank(busType)) return ResultVOUtils.error("请选择业务名称");
 
         if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
             GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();

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

@@ -1484,6 +1484,7 @@ public class IoCodeTempController extends BaseController {
                 orderEntity.setWorkPlaceCode(addOrderRequest.getWorkPlaceCode());
                 orderEntity.setSplitBusType(addOrderRequest.getSplitBusType());
                 orderEntity.setFifoSplit(addOrderRequest.getFifoSplit());
+                orderEntity.setSplitBusType(addOrderRequest.getSplitBusType());
                 orderEntity.setProductType(2);
                 orderService.insertOrder(orderEntity);
             }

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

@@ -31,6 +31,7 @@ public class UpdateLevelDrugRequest {
      */
     private Integer bhxjsl;
     private Long relId;
+    private Long productId;
     private String uuid;
 
     public Integer getMyBhxjsl() {

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -255,6 +255,11 @@ public class UdiRelevanceResponse {
      */
     private Integer bhsycjsl;
 
+    /**
+     * 当前层级包含使用层级数量
+     */
+    private Long productId;
+
     /**
      * 工位预警数量
      */

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -283,6 +283,12 @@ public class IoOrderResponse {
 
     private String splitBusTypeName;
 
+
+    /**
+     * 业务类型名称
+     */
+    private String busName;
+
     public String getFromName() {
 
         if (StrUtil.isNotEmpty(fromCorpName))

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -466,20 +466,16 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
 
             List<UdiProductEntity> byUuids = udiProductDao.findByUuids(updateLevelDrugRequest.getUuid());
             UdiProductEntity udiProductEntity1 = null;
-            if (byUuids.size() == 1) {
-                //只有一条药品数据
+            if (updateLevelDrugRequest.getProductId() != null){
                 udiProductEntity1 = byUuids.get(0);
-                if (udiProductEntity1 != null && udiProductEntity1.getNameCode() == null) {
-                    //更新
-                    udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
-                    udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
-                    udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
-                    udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
-                    udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
-                    udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
-                    udiProductDao.updateById(udiProductEntity1);
-                    return;
-                }
+                udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode());
+                udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
+                udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
+                udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
+                udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
+                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
+                udiProductDao.updateById(udiProductEntity1);
+                return;
             }
             udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());
             //有药品数据 但是nameCode如果为空的话 院内新增的 更改nameCode

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

@@ -568,6 +568,7 @@
         basic_products.syqsfxyjxmj,
         basic_products.mjfs,
         basic_products.bzgg,
+        basic_products.id as productId,
         basic_products.categoryName,
         basic_products.catalogname1,
         basic_products.catalogname2,