!30 修改新增采购订单、销售订单的功能数据插入方式

Merge pull request !30 from 乾坤平台/master

src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java

 package com.jsh.erp.datasource.mappers;
 
 import com.jsh.erp.datasource.entities.Depot;
+import com.jsh.erp.datasource.entities.DepotEx;
 import com.jsh.erp.datasource.entities.DepotExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface DepotMapperEx {
 
@@ -15,8 +17,11 @@ public interface DepotMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByDepot(
+    Long countsByDepot(
             @Param("name") String name,
             @Param("type") Integer type,
             @Param("remark") String remark);
+
+    List<DepotEx> getDepotList(Map<String, Object> params);
+    Long getDepotListCount(Map<String, Object> params);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java

@@ -14,7 +14,7 @@ public interface FunctionsMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByFunctions(
+    Long countsByFunctions(
             @Param("name") String name,
             @Param("type") String type);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java

@@ -15,7 +15,7 @@ public interface InOutItemMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByInOutItem(
+    Long countsByInOutItem(
             @Param("name") String name,
             @Param("type") String type,
             @Param("remark") String remark);

src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java

@@ -20,7 +20,7 @@ public interface LogMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByLog(
+    Long countsByLog(
             @Param("operation") String operation,
             @Param("usernameID") Integer usernameID,
             @Param("clientIp") String clientIp,

src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java

@@ -20,7 +20,7 @@ public interface MaterialCategoryMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByMaterialCategory(
+    Long countsByMaterialCategory(
             @Param("name") String name,
             @Param("parentId") Integer parentId);
 

src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java

@@ -23,7 +23,7 @@ public interface MaterialMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByMaterial(
+    Long countsByMaterial(
             @Param("name") String name,
             @Param("model") String model,
             @Param("categoryId") Long categoryId,

src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java

@@ -13,5 +13,5 @@ public interface MaterialPropertyMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByMaterialProperty(@Param("name") String name);
+    Long countsByMaterialProperty(@Param("name") String name);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java

@@ -14,7 +14,7 @@ public interface PersonMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByPerson(
+    Long countsByPerson(
             @Param("name") String name,
             @Param("type") String type);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java

@@ -13,6 +13,6 @@ public interface RoleMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByRole(
+    Long countsByRole(
             @Param("name") String name);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java

@@ -20,7 +20,7 @@ public interface SerialNumberMapperEx {
     /**
      * 根据条件查询序列号数量
      * */
-     int countSerialNumber(@Param("serialNumber")String serialNumber,@Param("materialName")String materialName);
+    Long countSerialNumber(@Param("serialNumber")String serialNumber,@Param("materialName")String materialName);
      /**
       * 通过id查询序列号复合信息
       * */

src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java

@@ -17,7 +17,7 @@ public interface SupplierMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsBySupplier(
+    Long countsBySupplier(
             @Param("supplier") String supplier,
             @Param("type") String type,
             @Param("phonenum") String phonenum,

src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java

@@ -12,5 +12,5 @@ public interface SystemConfigMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsBySystemConfig();
+    Long countsBySystemConfig();
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java

@@ -13,6 +13,6 @@ public interface UnitMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByUnit(
+    Long countsByUnit(
             @Param("name") String name);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java

@@ -14,7 +14,7 @@ public interface UserMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int countsByUser(
+    Long countsByUser(
             @Param("userName") String userName,
             @Param("loginName") String loginName);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/service/CommonQueryManager.java

 package com.jsh.erp.service;
 
+import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.datasource.entities.Log;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.LogMapper;
@@ -60,11 +61,11 @@ public class CommonQueryManager {
      * @param parameterMap
      * @return
      */
-    public int counts(String apiName, Map<String, String> parameterMap) {
+    public Long counts(String apiName, Map<String, String> parameterMap) {
         if (StringUtil.isNotEmpty(apiName)) {
             return container.getCommonQuery(apiName).counts(parameterMap);
         }
-        return 0;
+        return BusinessConstants.DEFAULT_LIST_NULL_NUMBER;
     }
 
     /**

src/main/java/com/jsh/erp/service/ICommonQuery.java

@@ -34,7 +34,7 @@ public interface ICommonQuery {
      * @param parameterMap 查询参数
      * @return 查询结果
      */
-    int counts(Map<String, String> parameterMap);
+    Long counts(Map<String, String> parameterMap);
 
     /**
      * 新增数据

src/main/java/com/jsh/erp/service/InterfaceContainer.java

@@ -34,8 +34,9 @@ public class InterfaceContainer {
     }
 
     public int getResourceType(String apiName) {
-        if (!nameTypeMap.containsKey(apiName))
+        if (!nameTypeMap.containsKey(apiName)) {
             throw new RuntimeException("资源:" + apiName + "的组件不存在");
+        }
         return nameTypeMap.get(apiName);
     }
 

src/main/java/com/jsh/erp/service/account/AccountComponent.java

@@ -40,7 +40,7 @@ public class AccountComponent implements ICommonQuery {
     }
 
     @Override
-    public int counts(Map<String, String> map) {
+    public Long counts(Map<String, String> map) {
         String search = map.get(Constants.SEARCH);
         String name = StringUtil.getInfo(search, "name");
         String serialNo = StringUtil.getInfo(search, "serialNo");

src/main/java/com/jsh/erp/service/account/AccountService.java

@@ -70,7 +70,7 @@ public class AccountService {
         return resList;
     }
 
-    public int countAccount(String name, String serialNo, String remark) {
+    public Long countAccount(String name, String serialNo, String remark) {
         return accountMapperEx.countsByAccount(name, serialNo, remark);
     }
 

src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java

@@ -39,7 +39,7 @@ public class AccountHeadComponent implements ICommonQuery {
     }
 
     @Override
-    public int counts(Map<String, String> map) {
+    public Long counts(Map<String, String> map) {
         String search = map.get(Constants.SEARCH);
         String type = StringUtil.getInfo(search, "type");
         String billNo = StringUtil.getInfo(search, "billNo");