修改药品第一次选入流通失效

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -22,18 +22,22 @@ import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.auth.FilterAuthUserRequest;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.SysWorkplaceRequest;
+import com.glxp.api.req.basic.BasicCollectUserRequest;
 import com.glxp.api.req.dev.DeviceInfoDetailQuery;
 import com.glxp.api.req.system.PrintLabelRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.SysWorkplaceResponse;
+import com.glxp.api.res.basic.UserWorkResponse;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.auth.WarehouseUserService;
+import com.glxp.api.service.basic.BasicCollectUserService;
 import com.glxp.api.service.system.SystemPDFModuleService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
 import com.glxp.api.util.JasperUtils;
 import com.glxp.api.vo.dev.DeviceInfoVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.Offset;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -59,6 +63,9 @@ public class SysWorkplaceController extends BaseController {
     @Resource
     SysWorkplaceService sysWorkplaceService;
 
+    @Resource
+    private BasicCollectUserService basicCollectUserService;
+
 
     @PostMapping("/udiwms/sysWorkplace/page")
     public BaseResponse page(@RequestBody SysWorkplaceRequest request) {
@@ -120,6 +127,12 @@ public class SysWorkplaceController extends BaseController {
 
     @PostMapping("/udiwms/sysWorkplace/deleteWorkplace")
     public BaseResponse deleteWorkplace(@RequestBody SysWorkplace sysWorkplace) {
+        BasicCollectUserRequest basicCollectUserRequest = new BasicCollectUserRequest();
+        basicCollectUserRequest.setWorkplaceCode(sysWorkplace.getOrderId());
+        List<UserWorkResponse> userWorkResponses = basicCollectUserService.filterList(basicCollectUserRequest);
+        if (userWorkResponses != null || userWorkResponses.size() >0){
+            return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除");
+        }
         boolean save = sysWorkplaceService.removeById(sysWorkplace);
         if (!save) {
             return ResultVOUtils.error("删除错误");

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

@@ -20,6 +20,7 @@ import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.util.*;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.poi.ss.formula.functions.Offset;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -292,6 +293,25 @@ public class UdiProductService {
             udiRelevanceEntity.setAttributeType(addProductRequest.getAttributeType());
             udiRelevanceEntity.setHcType(addProductRequest.getHcType());
             udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
+            if (addProductRequest.getDistributeLevelDi() != null){
+                udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi());
+            }
+            if (addProductRequest.getDistributeLevelCount() != null){
+                udiRelevanceEntity.setDistributeLevelCount(addProductRequest.getDistributeLevelCount());
+            }
+            if (addProductRequest.getDistributeLevelUnit() != null){
+                udiRelevanceEntity.setDistributeLevelUnit(addProductRequest.getDistributeLevelUnit());
+            }
+
+            if (addProductRequest.getUseLevelDi() != null){
+                udiRelevanceEntity.setUseLevelDi(addProductRequest.getUseLevelDi());
+            }
+            if (addProductRequest.getUseLevelUnit() != null){
+                udiRelevanceEntity.setUseLevelUnit(addProductRequest.getUseLevelUnit());
+            }
+            if (addProductRequest.getUseLeverCount() != null){
+                udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount());
+            }
 
             if (CollUtil.isNotEmpty(addProductRequest.getDrugLevelLists())) {
                 for (UpdateLevelDrugRequest updateLevelDrugRequest : addProductRequest.getDrugLevelLists()) {

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

@@ -1279,7 +1279,7 @@
                  updateTime, modifyTime,
                  createUser,
                  updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert, isStack)
+                 remark, useExpireTime, dispatch, groupBuy, needCert, isStack,distributeLevelDi,distributeLevelUnit,distributeLevelCount,useLevelDi,useLevelUnit,useLeverCount)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -1302,7 +1302,8 @@
                 #{modifyTime},
                 #{createUser},
                 #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{isStack})
+                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{isStack},#{distributeLevelDi},#{distributeLevelUnit},#{distributeLevelCount},#{useLevelDi}
+                   ,#{useLevelUnit},#{useLeverCount})
     </insert>
 
     <insert id="insertUdiRelevanceignore"