Merge branch 'master' of https://gitee.com/jishenghua/JSH_ERP

src/main/java/com/jsh/erp/controller/AccountHeadController.java

@@ -79,13 +79,9 @@ public class AccountHeadController {
                 i = -1;
             }
             //收付款部分
-//            sum = sum + (allMoney(getS, "付款", "合计",endTime) + allMoney(getS, "付款", "实际",endTime)) * i;
             sum = sum.add((allMoney(getS, "付款", "合计",endTime).add(allMoney(getS, "付款", "实际",endTime))).multiply(new BigDecimal(i)));
-//            sum = sum - (allMoney(getS, "收款", "合计",endTime) + allMoney(getS, "收款", "实际",endTime)) * i;
             sum = sum.subtract((allMoney(getS, "收款", "合计",endTime).add(allMoney(getS, "收款", "实际",endTime))).multiply(new BigDecimal(i)));
-//            sum = sum + (allMoney(getS, "收入", "合计",endTime) - allMoney(getS, "收入", "实际",endTime)) * i;
             sum = sum.add((allMoney(getS, "收入", "合计",endTime).subtract(allMoney(getS, "收入", "实际",endTime))).multiply(new BigDecimal(i)));
-//            sum = sum - (allMoney(getS, "支出", "合计",endTime) - allMoney(getS, "支出", "实际",endTime)) * i;
             sum = sum.subtract((allMoney(getS, "支出", "合计",endTime).subtract(allMoney(getS, "支出", "实际",endTime))).multiply(new BigDecimal(i)));
             outer.put("getAllMoney", sum);
             map.put("rows", outer);

src/main/java/com/jsh/erp/controller/DepotHeadController.java

@@ -81,7 +81,6 @@ public class DepotHeadController {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<String, Object>();
         try {
-//            String number = depotHeadService.buildNumber(type, subType, beginTime, endTime);
             String number = depotHeadService.buildOnlyNumber();
             map.put("DefaultNumber", number);
             res.code = 200;
@@ -359,13 +358,9 @@ public class DepotHeadController {
                 i = -1;
             }
             //进销部分
-//            sum = sum - (allMoney(getS, "入库", "采购", "合计",endTime) - allMoney(getS, "入库", "采购", "实际",endTime)) * i;
             sum = sum.subtract((allMoney(getS, "入库", "采购", "合计",endTime).subtract(allMoney(getS, "入库", "采购", "实际",endTime))).multiply(new BigDecimal(i)));
-//            sum = sum - (allMoney(getS, "入库", "销售退货", "合计",endTime) - allMoney(getS, "入库", "销售退货", "实际",endTime)) * i;
             sum = sum.subtract((allMoney(getS, "入库", "销售退货", "合计",endTime).subtract(allMoney(getS, "入库", "销售退货", "实际",endTime))).multiply(new BigDecimal(i)));
-//            sum = sum + (allMoney(getS, "出库", "销售", "合计",endTime) - allMoney(getS, "出库", "销售", "实际",endTime)) * i;
             sum = sum.add((allMoney(getS, "出库", "销售", "合计",endTime).subtract(allMoney(getS, "出库", "销售", "实际",endTime))).multiply(new BigDecimal(i)));
-//            sum = sum + (allMoney(getS, "出库", "采购退货", "合计",endTime) - allMoney(getS, "出库", "采购退货", "实际",endTime)) * i;
             sum = sum.add((allMoney(getS, "出库", "采购退货", "合计",endTime).subtract(allMoney(getS, "出库", "采购退货", "实际",endTime))).multiply(new BigDecimal(i)));
             outer.put("getAllMoney", sum);
             map.put("rows", outer);

src/main/java/com/jsh/erp/controller/UserController.java

@@ -41,13 +41,6 @@ public class UserController {
         try {
             String username = loginame.trim();
             password = password.trim();
-            //因密码用MD5加密，需要对密码进行转化
-//            try {
-//                password = Tools.md5Encryp(password);
-//            } catch (NoSuchAlgorithmException e) {
-//                e.printStackTrace();
-//                logger.error(">>>>>>>>>>>>>>转化MD5字符串错误 ：" + e.getMessage(), e);
-//            }
             //判断用户是否已经登录过，登录过不再处理
             Object userInfo = request.getSession().getAttribute("user");
             User sessionUser = new User();

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

@@ -1,6 +1,5 @@
 package com.jsh.erp.service.depotHead;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.datasource.entities.DepotHead;
@@ -19,11 +18,8 @@ import com.jsh.erp.service.serialNumber.SerialNumberService;
 import com.jsh.erp.service.supplier.SupplierService;
 import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.StringUtil;
-import com.jsh.erp.utils.Tools;
-import lombok.Synchronized;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -174,43 +170,6 @@ public class DepotHeadService {
         }
     }
 
-
-    public String buildNumber(String type, String subType, String beginTime, String endTime) {
-        String newNumber = "0001"; //新编号
-        try {
-            DepotHeadExample example = new DepotHeadExample();
-            example.createCriteria().andTypeEqualTo(type).andSubtypeEqualTo(subType)
-                    .andOpertimeGreaterThanOrEqualTo(StringUtil.getDateByString(beginTime,null))
-                    .andOpertimeLessThanOrEqualTo(StringUtil.getDateByString(endTime,null));
-            example.setOrderByClause("Id desc");
-            List<DepotHead> dataList = depotHeadMapper.selectByExample(example);
-            //存放数据json数组
-            if (null != dataList && dataList.size() > 0) {
-                DepotHead depotHead = dataList.get(0);
-                if (depotHead != null) {
-                    String number = depotHead.getDefaultnumber(); //最大的单据编号
-                    if (number != null) {
-                        Integer lastNumber = Integer.parseInt(number.substring(12, 16)); //末四尾
-                        lastNumber = lastNumber + 1;
-                        Integer nLen = lastNumber.toString().length();
-                        if (nLen == 1) {
-                            newNumber = "000" + lastNumber.toString();
-                        } else if (nLen == 2) {
-                            newNumber = "00" + lastNumber.toString();
-                        } else if (nLen == 3) {
-                            newNumber = "0" + lastNumber.toString();
-                        } else if (nLen == 4) {
-                            newNumber = lastNumber.toString();
-                        }
-                    }
-                }
-            }
-        } catch (DataAccessException e) {
-            logger.error(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
-        }
-        return newNumber;
-    }
-
     public Long getMaxId() {
         return depotHeadMapperEx.getMaxId();
     }
@@ -315,29 +274,9 @@ public class DepotHeadService {
         //判断用户是否已经登录过，登录过不再处理
         User userInfo=userService.getCurrentUser();
         depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
-        /**
-         * 2019-02-02
-         * 使用最新生成的唯一单据编号，理论上可以保证唯一性
-         * 保存时就不再加判断，提高程序的效率
-         * */
-//        //构造新的编号
-//        String dNumber = depotHead.getDefaultnumber();
-//        String number = dNumber.substring(0, 12); //截取前缀
-//        String beginTime = Tools.getNow() + " 00:00:00";
-//        String endTime = Tools.getNow() + " 23:59:59";
-//        String newNumber = buildNumber(depotHead.getType(), depotHead.getSubtype(), beginTime, endTime);  //从数据库查询最新的编号+1,这样能防止重复
-//        String allNewNumber = number + newNumber;
-//        String frontNumber = depotHead.getNumber();
-//        if(frontNumber.indexOf(number) > -1) {
-//            depotHead.setNumber(allNewNumber); //从后台取值
-//        } else {
-//            depotHead.setNumber(frontNumber); //从前端文本框里面获取
-//        }
-//        depotHead.setDefaultnumber(allNewNumber); //初始编号，一直都从后台取值
         depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
         depotHead.setStatus(false);
         depotHeadMapperEx.adddepotHead(depotHead);
-
         /**入库和出库处理预付款信息*/
         if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
             if(depotHead.getOrganid()!=null) {

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

@@ -217,13 +217,6 @@ public class DepotItemService {
         }
     }
 
-    public BigDecimal findGiftByType(String subType, Integer ProjectId, Long MId, String type) {
-        if (IN.equals(type)) {
-            return depotItemMapperEx.findGiftByTypeIn(subType, ProjectId, MId);
-        } else {
-            return depotItemMapperEx.findGiftByTypeOut(subType, ProjectId, MId);
-        }
-    }
     /**
      * 2019-02-02修改
      * 我之前对操作数量的理解有偏差