1.修复数据校验问题

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java

@@ -111,7 +111,7 @@ public class BasicThirdSysController {
                 }
             }
 
-            if (temp.getMainSys() && !temp.getEnabled()) {
+            if (basicThirdSysEntity.getMainSys() && !basicThirdSysEntity.getEnabled()) {
                 return ResultVOUtils.error(500, "主系统必须启用");
             }
 

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java

@@ -238,6 +238,11 @@ public class BussinessTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
+        BaseResponse baseResponse = bussinessTypeService.verifyBussinessType(bussinessTypeEntity);
+        if (!baseResponse.getCode().equals(20000)) {
+            return baseResponse;
+        }
+
         if (bussinessTypeEntity != null) {
             bussinessTypeEntity.setAction("SC" + CustomUtil.getId());
             bussinessTypeEntity.setUpdateTime(new Date());

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -47,8 +47,6 @@ import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -337,6 +335,10 @@ public class WareHouseController {
             }
         }
 
+        if (warehouseEntity.getCount() != null && warehouseEntity.getCount() <= 0) {
+            return ResultVOUtils.error(500, "数量不能小于0");
+        }
+
 
         boolean b = codesTempService.update(warehouseEntity);
         if (b)

api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java

@@ -61,4 +61,11 @@ public interface BussinessTypeDao {
      * @return
      */
     String selectSupplementTypeByBillNo(@Param("stockOrderBillNo") String stockOrderBillNo);
+
+    /**
+     * 根据名称统计单据类型数量
+     * @param name
+     * @return
+     */
+    int countByName(@Param("name") String name);
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicUnitMaintainEntity.java

@@ -2,7 +2,7 @@ package com.glxp.sale.admin.entity.basic;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 @Data
@@ -11,14 +11,14 @@ public class BasicUnitMaintainEntity {
     private Integer id;
     private String erpId;
 
-    @NotEmpty(message = "往来单位名称不能为空！")
+    @NotBlank(message = "往来单位名称不能为空！")
     private String name;
     private String spell;
     private String addr;
     private String status;
     private String type;
 
-    @NotEmpty(message = "统一社会信用号不能为空！")
+    @NotBlank(message = "统一社会信用号不能为空！")
     private String creditNo;
     private String contact;
     private String mobile;

api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java

@@ -4,6 +4,7 @@ import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
 import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
 import com.glxp.sale.admin.res.basic.BussinessTypResponse;
+import com.glxp.sale.common.res.BaseResponse;
 
 import java.util.List;
 
@@ -42,4 +43,11 @@ public interface BussinessTypeService {
      * @return
      */
     List<BussinessTypeEntity> candidateBussinessType(String id);
+
+    /**
+     * 校验单据类型相关参数
+     * @param bussinessTypeEntity
+     * @return
+     */
+    BaseResponse verifyBussinessType(BussinessTypeEntity bussinessTypeEntity);
 }

api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java

@@ -10,6 +10,8 @@ import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
 import com.glxp.sale.admin.res.basic.BussinessTypResponse;
 import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService;
 import com.glxp.sale.admin.service.basic.BussinessTypeService;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -176,4 +178,14 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
         }
         return bussinessTypeDao.selectCandidateBussinsessTypes(mainAction);
     }
+
+    @Override
+    public BaseResponse verifyBussinessType(BussinessTypeEntity bussinessTypeEntity) {
+        int count = bussinessTypeDao.countByName(bussinessTypeEntity.getName());
+        if (count > 0) {
+            return ResultVOUtils.error(500, "单据类型名称重复");
+        }
+        return ResultVOUtils.success();
+    }
+
 }

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -384,4 +384,8 @@
                                     from stock_order
                                     where billNo = #{stockOrderBillNo}))
     </select>
+
+    <select id="countByName" resultType="java.lang.Integer">
+        select count(*) from basic_bussiness_type where name = #{name}
+    </select>
 </mapper>