自动审核码包

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -88,6 +88,17 @@ public class FactoryServiceImpl implements FactoryService {
         if (CollectionUtil.isNotEmpty(checkFactoryList)) {
             throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "供应商ID已存在");
         }
+        //名称不能重复
+        factoryQw = new QueryWrapper<>();
+        factoryQw.eq("factory_name", req.getFactoryName());
+        factoryQw.eq("is_delete", 0);
+        if (req.getId() != null) {
+            factoryQw.ne("id", req.getId());
+        }
+        checkFactoryList = baseFactoryMapper.selectList(factoryQw);
+        if (CollectionUtil.isNotEmpty(checkFactoryList)) {
+            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "供应商ID已存在");
+        }
 
         //1-声明对象
         BaseFactory factory = null;
@@ -119,18 +130,8 @@ public class FactoryServiceImpl implements FactoryService {
 
         //3-新增or修改
         if (req.getId() != null) {
-            //判断供应商名称是否存在
-            BaseFactory checkFactoryName = checkFactoryName(factory.getFactoryName());
-            if (!checkFactoryName.getId().equals(req.getId())) {
-                throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "供应商名称已存在");
-            }
             baseFactoryMapper.updateById(factory);
         } else {
-            //判断供应商名称是否存在
-            BaseFactory baseFactory = checkFactoryName(factory.getFactoryName());
-            if (Objects.nonNull(baseFactory)) {
-                throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "供应商名称已存在");
-            }
             baseFactoryMapper.insert(factory);
         }
 
@@ -490,15 +491,7 @@ public class FactoryServiceImpl implements FactoryService {
         return factory;
     }
 
-    private BaseFactory checkFactoryName(String factoryName) {
 
-        QueryWrapper<BaseFactory> qw = new QueryWrapper<>();
-        qw.eq("factory_name", factoryName);
-        qw.eq("is_delete", 0);
-        BaseFactory baseFactory = baseFactoryMapper.selectOne(qw);
-
-        return baseFactory;
-    }
 
     /**
      * 是否加密

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -176,6 +176,9 @@ public class QrPackageServiceImpl implements QrPackageService {
     @Autowired
     private QrPackageBookingOrderService qrPackageBookingOrderService;
 
+    @Autowired
+    private QrPackageService qrPackageService;
+
     @Autowired
     private ApplicationContext applicationContext;
 
@@ -208,6 +211,24 @@ public class QrPackageServiceImpl implements QrPackageService {
 
         //4-保存码包批次子表信息
         saveQrPackageBatch(qrPackage, isAdd, req);
+
+        //5-如果是sap单号，且额外申请原因为空，则自动通过（因为原因为空的肯定是不超过的）
+        autoPass(qrPackage);
+    }
+
+    /**
+     * 如果符合条件则自动审核通过
+     * @param qrPackage
+     */
+    private void autoPass(QrPackage qrPackage){
+        // 如果是sap单号，且额外申请原因为空，则自动通过（因为原因为空的肯定是不超过的）
+        if(CodePackageOrderTypeEnum.SAP_ORDER.is(qrPackage.getOrderType())
+            && StringUtils.isBlank(qrPackage.getReasonApply())){
+            // 符合条件、通过
+            PassQrPackageReq req = new PassQrPackageReq();
+            req.setId(qrPackage.getId());
+            qrPackageService.passQrPackage(req);
+        }
     }
 
     /**