异常码修改

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -30,10 +30,13 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BIZ_RELDELETE_UPDATEPROD(79307,"存在关联单据,不允许更新"),
     BIZ_RELDELETE_DELETEPROD(79308,"存在关联单据,不允许删除"),
     BIZ_PRODWHCODE_REPEAT(79309, "明细仓库重复"),
+    BIZ_UNENDPRODUCT(79310,"系统还未记账，不能反记账"),
     NO_OPRATIONDATA(79400,"无可操作单据"),
     BOM_SAVE(79401, "产品编号+版本号已存在"),
     REPEAT_NAME(79501, "名称重复"),
     REPEAT_CODE(79502, "编号重复"),
+    REPEAT_CUSTOMERCODE(79503, "客户名称或编号重复"),
+    REPEAT_TEL(79504, "电话号码重复"),
     NO_DATA(79998, "未找到数据"),
     ILLEGAL_ID(79999, "id不正确"),
     PRODUCT_HAS_WAREHOUSE(79502, "存在物料默认仓库资料为该仓库资料,无法删除"),
@@ -44,7 +47,8 @@ public enum BizExceptionCode implements BaseExceptionCode {
 
     //采购 70000-71999
     PURCCHECKIN_POST_ERROR(70000,""),
-    PURCHASE_UNAUDIT_ERROR(72006,"采购订单已转采购验收单,无法反审核"),
+    PURCHASE_UNAUDIT_ERROR(71001,"采购订单已转采购验收单,无法反审核"),
+    PURCHASE_DETAIL_OVERNUM(70001, "明细行数量超过来源采购验收单明细行数量"),
 
 
     //销售

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/EndProductServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.dto.MessagelogDTO;
+import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.mapper.EndProductMapper;
 import com.usoftchina.saas.commons.mapper.MessagelogMapper;
 import com.usoftchina.saas.commons.po.Operation;
@@ -72,7 +73,7 @@ public class EndProductServiceImpl implements EndProductService {
     public void unEndAccount() {
         String period = endProductMapper.selectUnPeriod(BaseContextHolder.getCompanyId());
         if (StringUtils.isEmpty(period)){
-            throw new BizException(79306,"系统还未结账，不能反结账");
+            throw new BizException(BizExceptionCode.BIZ_UNENDPRODUCT);
         }else{
             endProductMapper.updatePeriodStatus(0L, period, BaseContextHolder.getCompanyId());
             messageLogService.customizeLog(generateMsgObj(Long.parseLong(period)), Operation.UNENDPRODUCT);

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -102,7 +102,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
     @Transactional
     public DocBaseDTO saveFormData(CustomerFormDTO data) {
         if (null == data || null == data.getMain()){
-            throw new BizException(500, "数据为空，请填写后再保存");
+            throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();
@@ -140,7 +140,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
             //检查名称和编号
             int count = getMapper().validNameAndCodeWhenInsert(customer);
             if (count>0) {
-                throw new BizException(500, "客户名称或编号重复");
+                throw new BizException(BizExceptionCode.REPEAT_CUSTOMERCODE);
             }
             //插入操作
             getMapper().insertSelective(customer);
@@ -179,7 +179,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         //检查名称和编号
         int count = getMapper().validNameAndCodeWhenUpdate(customer);
         if (count>0) {
-            throw new BizException(500, "客户名称或编号重复");
+            throw new BizException(BizExceptionCode.REPEAT_CUSTOMERCODE);
         }
 
         //检查期初日期是否已结转
@@ -329,7 +329,6 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         }
     }
 
-    @Transactional
     private DocBaseDTO singleOpen(Long id) {
         DocBaseDTO docBaseDTO = null;
         if (null!=id) {

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/EmployeeServiceImpl.java

@@ -73,7 +73,7 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
             //检查电话号码
             int count = getMapper().validatePhoneWhenInsert(employee.getEm_mobile(),BaseContextHolder.getCompanyId());
             if (count>0) {
-                throw new BizException(500, "电话号码重复");
+                throw new BizException(BizExceptionCode.REPEAT_TEL);
             }
             getMapper().insertSelective(employee);
             docBaseDTO = generateMsgObj(employee.getId(), code);
@@ -85,7 +85,7 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
             //检查电话号码
             int count = getMapper().validatePhoneWhenUpdate(employee.getEm_mobile(),employee.getId(),BaseContextHolder.getCompanyId());
             if (count>0) {
-                throw new BizException(500, "电话号码重复");
+                throw new BizException(BizExceptionCode.REPEAT_TEL);
             }
             getMapper().updateByPrimaryKeySelective(employee);
             docBaseDTO = generateMsgObj(employee.getId(), employee.getEm_code());

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -103,7 +103,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
     public DocBaseDTO saveFormData(VendorListDTO vendorListDTO) {
         Long companyId = BaseContextHolder.getCompanyId();
         if (null == vendorListDTO || null == vendorListDTO.getMain()){
-            throw new BizException(500, "数据为空，请填写后再保存");
+            throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         Vendor main = vendorListDTO.getMain();
         String code = null;
@@ -113,11 +113,11 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             code = pushMaxnubmer(main.getVe_code(), main.getId());
             int count = getMapper().getCountByCode(code, companyId);
             if(count > 0){
-                throw new BizException(500, "编号重复!");
+                throw new BizException(BizExceptionCode.REPEAT_NAME);
             }
             count = getMapper().getCountByName(main.getVe_name(), companyId);
             if (count > 0){
-                throw new BizException(500, "名称重复!");
+                throw new BizException(BizExceptionCode.REPEAT_NAME);
             }
             //保存主表信息
             main.setVe_code(code);
@@ -147,13 +147,13 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             int count = getMapper().getCountByCode(code, companyId);
             if (!code.equals(oldVendor.getVe_code())){
                 if (count > 0){
-                    throw new BizException(500, "编号重复!");
+                    throw new BizException(BizExceptionCode.REPEAT_CODE);
                 }
             }
             if (!main.getVe_name().equals(oldVendor.getVe_name())){
                 count = getMapper().getCountByName(main.getVe_name(), companyId);
                 if (count > 0){
-                    throw new BizException(500, "名称重复!");
+                    throw new BizException(BizExceptionCode.REPEAT_CODE);
                 }
             }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -115,7 +115,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     @Transactional
     public DocBaseDTO saveFormData(ProdInOutFormDTO formdata) {
         if (null == formdata || null == formdata.getMain()){
-            throw new BizException(500, "数据为空，请填写后再保存");
+            throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();
@@ -393,7 +393,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         if ("采购验退单".equals(pi_class)) {
             count = getMapper().checkQtyFromProdIn(pu_code);
             if (count>0){
-                throw new BizException(500, "明细行数量超过来源采购验收单明细行数量");
+                throw new BizException(BizExceptionCode.PURCHASE_DETAIL_OVERNUM);
             }
         }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -105,7 +105,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     @Transactional
     public DocBaseDTO saveFormData(PurchaseFormDTO formdata) {
         if (null == formdata || null == formdata.getMain()){
-            throw new BizException(500, "数据为空，请填写后再保存");
+            throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();
@@ -265,7 +265,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         String code = purchaseMapper.validateUnAudit(id);
         if (null != code) {
-            throw new BizException(500, "单据:" + code + " 未审核,无法反审核");
+            throw new BizException(BizExceptionCode.BIZ_UNAUDITED);
         }
         singleUnAudit(id);
     }
@@ -482,7 +482,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Transactional
-    private Result singleAudit(Long id) {
+    public Result singleAudit(Long id) {
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         Result result = Result.success(docBaseDTO);
         //检查最小包装数
@@ -506,7 +506,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Transactional
-    private void singleUnAudit(Long id) {
+    public void singleUnAudit(Long id) {
         Purchase purchase = new Purchase();
         //检查是否已转验收单
         Integer num = getMapper().checkTurnInstatus(id);
@@ -527,7 +527,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Transactional
-    private void singleDelete(Long id) {
+    public void singleDelete(Long id) {
         if (null != id) {
             //从表删除
             purchasedetailMapper.deleteByForeignKey(id);
@@ -588,7 +588,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Transactional
-    private void calcPurchase(Long pu_id) {
+    public void calcPurchase(Long pu_id) {
         purchasedetailMapper.calcPurchase(pu_id);
     }
 

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ProdInOutServiceImpl.java

@@ -70,7 +70,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     public DocBaseDTO saveFormData(ProdInOutFormDTO formdata) {
 
         if (null == formdata || null == formdata.getMain()){
-            throw new BizException(500, "数据为空，请填写后再保存");
+            throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -95,7 +95,7 @@ public class SaleServiceImpl implements SaleService{
     @Transactional
     public DocBaseDTO saveFormData(SaleFormDTO formdata) {
         if (null == formdata || null == formdata.getMain()){
-            throw new BizException(500, "数据为空，请填写后再保存");
+            throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInOutServiceImpl.java

@@ -105,7 +105,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     @Transactional
     public DocBaseDTO saveFormData(ProdInOutFormDTO formdata) {
         if (null == formdata || null == formdata.getMain()){
-            throw new BizException(500, "数据为空，请填写后再保存");
+            throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();

base-servers/file/file-server/src/main/java/com/usoftchina/saas/file/FileApplication.java

@@ -10,6 +10,7 @@ import org.springframework.context.annotation.EnableMBeanExport;
 import org.springframework.context.annotation.Import;
 import org.springframework.jmx.support.RegistrationPolicy;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * @author yingp
@@ -22,6 +23,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableAuthClient
 @Import(FdfsClientConfig.class)
 @EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
+@EnableSwagger2
 public class FileApplication {
     public static void main(String[] args) {
         SpringApplication.run(FileApplication.class, args);