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

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

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

@@ -55,7 +55,7 @@ public class AccountHeadService {
         return resList;
     }
 
-    public int countAccountHead(String type, String billNo, String beginTime, String endTime) {
+    public Long countAccountHead(String type, String billNo, String beginTime, String endTime) {
         return accountHeadMapperEx.countsByAccountHead(type, billNo, beginTime, endTime);
     }
 

src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java

@@ -38,7 +38,7 @@ public class AccountItemComponent 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");
         Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type"));

src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java

@@ -45,7 +45,7 @@ public class AccountItemService {
         return accountItemMapperEx.selectByConditionAccountItem(name, type, remark, offset, rows);
     }
 
-    public int countAccountItem(String name, Integer type, String remark) {
+    public Long countAccountItem(String name, Integer type, String remark) {
         return accountItemMapperEx.countsByAccountItem(name, type, remark);
     }
 

src/main/java/com/jsh/erp/service/app/AppComponent.java

@@ -37,7 +37,7 @@ public class AppComponent 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 type = StringUtil.getInfo(search, "type");

src/main/java/com/jsh/erp/service/app/AppService.java

@@ -60,7 +60,7 @@ public class AppService {
         return appMapperEx.selectByConditionApp(name, type, offset, rows);
     }
 
-    public int countApp(String name, String type) {
+    public Long countApp(String name, String type) {
         return appMapperEx.countsByApp(name, type);
     }
 

src/main/java/com/jsh/erp/service/depot/DepotComponent.java

@@ -39,7 +39,7 @@ public class DepotComponent 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");
         Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type"));

src/main/java/com/jsh/erp/service/depot/DepotService.java

@@ -2,6 +2,7 @@ package com.jsh.erp.service.depot;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.Depot;
+import com.jsh.erp.datasource.entities.DepotEx;
 import com.jsh.erp.datasource.entities.DepotExample;
 import com.jsh.erp.datasource.mappers.DepotMapper;
 import com.jsh.erp.datasource.mappers.DepotMapperEx;
@@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class DepotService {
@@ -44,7 +46,7 @@ public class DepotService {
         return depotMapperEx.selectByConditionDepot(name, type, remark, offset, rows);
     }
 
-    public int countDepot(String name, Integer type, String remark) {
+    public Long countDepot(String name, Integer type, String remark) {
         return depotMapperEx.countsByDepot(name, type, remark);
     }
 
@@ -97,4 +99,8 @@ public class DepotService {
         return list;
     }
 
+    public List<DepotEx> getDepotList(Map<String, Object> parameterMap) {
+        return depotMapperEx.getDepotList(parameterMap);
+    }
+
 }

src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java

@@ -41,7 +41,7 @@ public class DepotHeadComponent 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 subType = StringUtil.getInfo(search, "subType");

src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java

@@ -95,7 +95,7 @@ public class DepotHeadService {
 
 
 
-    public int countDepotHead(String type, String subType, String number, String beginTime, String endTime, String dhIds) {
+    public Long countDepotHead(String type, String subType, String number, String beginTime, String endTime, String dhIds) {
         return depotHeadMapperEx.countsByDepotHead(type, subType, number, beginTime, endTime, dhIds);
     }
 

src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java

@@ -38,7 +38,7 @@ public class DepotItemComponent 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");
         Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type"));

src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java

@@ -68,7 +68,7 @@ public class DepotItemService {
         return depotItemMapperEx.selectByConditionDepotItem(name, type, remark, offset, rows);
     }
 
-    public int countDepotItem(String name, Integer type, String remark) {
+    public Long countDepotItem(String name, Integer type, String remark) {
         return depotItemMapperEx.countsByDepotItem(name, type, remark);
     }
 
@@ -118,7 +118,7 @@ public class DepotItemService {
         return depotItemMapperEx.findDetailByTypeAndMaterialIdList(mId, QueryUtils.offset(map), QueryUtils.rows(map));
     }
 
-    public int findDetailByTypeAndMaterialIdCounts(Map<String, String> map) {
+    public Long findDetailByTypeAndMaterialIdCounts(Map<String, String> map) {
         String mIdStr = map.get("mId");
         Long mId = null;
         if(!StringUtil.isEmpty(mIdStr)) {
@@ -137,7 +137,7 @@ public class DepotItemService {
         return depotItemMapperEx.findStockNumByMaterialIdList(mId, monthTime, QueryUtils.offset(map), QueryUtils.rows(map));
     }
 
-    public int findStockNumByMaterialIdCounts(Map<String, String> map) {
+    public Long findStockNumByMaterialIdCounts(Map<String, String> map) {
         String mIdStr = map.get("mId");
         Long mId = null;
         if(!StringUtil.isEmpty(mIdStr)) {

src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java

@@ -39,7 +39,7 @@ public class FunctionsComponent 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 type = StringUtil.getInfo(search, "type");

src/main/java/com/jsh/erp/service/functions/FunctionsService.java

@@ -38,7 +38,7 @@ public class FunctionsService {
         return functionsMapperEx.selectByConditionFunctions(name, type, offset, rows);
     }
 
-    public int countFunctions(String name, String type) {
+    public Long countFunctions(String name, String type) {
         return functionsMapperEx.countsByFunctions(name, type);
     }
 

src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java

@@ -38,7 +38,7 @@ public class InOutItemComponent 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 type = StringUtil.getInfo(search, "type");

src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java

@@ -38,7 +38,7 @@ public class InOutItemService {
         return inOutItemMapperEx.selectByConditionInOutItem(name, type, remark, offset, rows);
     }
 
-    public int countInOutItem(String name, String type, String remark) {
+    public Long countInOutItem(String name, String type, String remark) {
         return inOutItemMapperEx.countsByInOutItem(name, type, remark);
     }
 

src/main/java/com/jsh/erp/service/log/LogComponent.java

@@ -43,7 +43,7 @@ public class LogComponent implements ICommonQuery {
     }
 
     @Override
-    public int counts(Map<String, String> map) {
+    public Long counts(Map<String, String> map) {
         String search = map.get(Constants.SEARCH);
         String operation = StringUtil.getInfo(search, "operation");
         Integer usernameID = StringUtil.parseInteger(StringUtil.getInfo(search, "usernameID"));

src/main/java/com/jsh/erp/service/log/LogService.java

@@ -44,7 +44,7 @@ public class LogService {
                             contentdetails, offset, rows);
     }
 
-    public int countLog(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime,
+    public Long countLog(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime,
                         String contentdetails) {
         return logMapperEx.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails);
     }

src/main/java/com/jsh/erp/service/material/MaterialComponent.java

@@ -42,7 +42,7 @@ public class MaterialComponent 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 model = StringUtil.getInfo(search, "model");

src/main/java/com/jsh/erp/service/material/MaterialService.java

@@ -73,7 +73,7 @@ public class MaterialService {
         return resList;
     }
 
-    public int countMaterial(String name, String model,Long categoryId, String categoryIds,String mpList) {
+    public Long countMaterial(String name, String model,Long categoryId, String categoryIds,String mpList) {
         return materialMapperEx.countsByMaterial(name, model,categoryId,categoryIds,mpList);
     }
 

src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java

@@ -39,7 +39,7 @@ public class MaterialCategoryComponent 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");
         Integer parentId = StringUtil.parseInteger(StringUtil.getInfo(search, "parentId"));