派生自 ERP_override
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -1,26 +1,29 @@ package com.example.erp.service.sd; import com.alibaba.excel.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.dynamic.datasource.annotation.DS; import com.example.erp.entity.sd.Delivery; import com.example.erp.entity.sd.DeliveryDetail; import com.example.erp.entity.sd.Order; import com.example.erp.entity.sd.OrderDetail; import com.example.erp.entity.sd.*; import com.example.erp.entity.userInfo.SysError; import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper; import com.example.erp.mapper.sd.DeliveryDetailMapper; import com.example.erp.mapper.sd.DeliveryMapper; import com.example.erp.mapper.sd.OrderDetailMapper; import com.example.erp.mapper.sd.OrderMapper; import com.example.erp.mapper.sd.*; import com.example.erp.service.userInfo.SysErrorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @Service @DS("sd") @Transactional(rollbackFor = Exception.class) public class DeliveryService { @Autowired DeliveryMapper deliveryMapper; @@ -32,8 +35,13 @@ OrderDetailMapper orderDetailMapper; @Autowired FinishedGoodsInventoryMapper finishedGoodsInventoryMapper; @Autowired DeliveryOtherMoneyMapper deliveryOtherMoneyMapper; @Autowired SysErrorService sysErrorService; public Map<String, Object> getseletShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) { public Map<String, Object> getSelectShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) { Integer offset = (pageNum - 1) * pageSize; String endDate = LocalDate.now().toString(); String startDate = LocalDate.now().minusDays(15).toString(); @@ -46,8 +54,8 @@ } } Map<String, Object> map = new HashMap<>(); map.put("data", deliveryMapper.getseletShippingOrder(offset, pageSize,startDate,endDate, delivery)); map.put("total", deliveryMapper.getseletShippingOrderPageTotal(offset, pageSize,startDate,endDate, delivery)); map.put("data", deliveryMapper.getSelectShippingOrder(offset, pageSize,startDate,endDate, delivery)); map.put("total", deliveryMapper.getSelectShippingOrderPageTotal(offset, pageSize,startDate,endDate, delivery)); List<String> list = new ArrayList<>(); list.add(startDate); list.add(endDate); @@ -55,14 +63,58 @@ return map; } public Map<String, Object> getseletShippingOrderDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) { public Map<String, Object> getSelectDeliveryDetailReport(Integer pageNum, Integer pageSize,List<String> selectDate, DeliveryDetail deliveryDetail) { Integer offset = (pageNum - 1) * pageSize; String endDate = LocalDate.now().toString(); String startDate = LocalDate.now().minusDays(15).toString(); if(selectDate !=null && selectDate.size()==2){ if(!selectDate.get(0).isEmpty()){ startDate = selectDate.get(0); } if(!selectDate.get(1).isEmpty()){ endDate = selectDate.get(1); } } Map<String, Object> map = new HashMap<>(); map.put("data", deliveryDetailMapper.getSelectDeliveryDetailReport(offset, pageSize,startDate,endDate, deliveryDetail)); map.put("total", deliveryDetailMapper.getSelectDeliveryDetailReportPageTotal(offset, pageSize,startDate,endDate, deliveryDetail)); List<String> list = new ArrayList<>(); list.add(startDate); list.add(endDate); map.put("selectDate",list); return map; } public Map<String, Object> getSelectDeliveryDetailProductReport(Integer pageNum, Integer pageSize,List<String> selectDate, DeliveryDetail deliveryDetail) { Integer offset = (pageNum - 1) * pageSize; String endDate = LocalDate.now().toString(); String startDate = LocalDate.now().minusDays(15).toString(); if(selectDate !=null && selectDate.size()==2){ if(!selectDate.get(0).isEmpty()){ startDate = selectDate.get(0); } if(!selectDate.get(1).isEmpty()){ endDate = selectDate.get(1); } } Map<String, Object> map = new HashMap<>(); map.put("data", deliveryDetailMapper.getSelectDeliveryDetailProductReport(offset, pageSize,startDate,endDate, deliveryDetail)); map.put("total", deliveryDetailMapper.getSelectDeliveryDetailProductReportPageTotal(offset, pageSize,startDate,endDate, deliveryDetail)); List<String> list = new ArrayList<>(); list.add(startDate); list.add(endDate); map.put("selectDate",list); return map; } public Map<String, Object> getSelectShippingOrderDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) { Integer offset = (pageNum - 1) * pageSize; Map<String, Object> map = new HashMap<>(); System.out.println(orderDetail.getDeliveryDetail().getMoney()); map.put("data", deliveryDetailMapper.getseletShippingOrderDetail(offset, pageSize, orderDetail)); map.put("delivery", deliveryMapper.getseletShippingOrderDetaildelivery(offset, pageSize, orderDetail)); map.put("total", deliveryDetailMapper.getseletShippingOrderDetailPageTotal(offset, pageSize, orderDetail)); map.put("data", deliveryDetailMapper.getSelectShippingOrderDetail(offset, pageSize, orderDetail)); map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDelivery(offset, pageSize, orderDetail)); map.put("total", deliveryDetailMapper.getSelectShippingOrderDetailPageTotal(offset, pageSize, orderDetail)); map.put("orderOtherMoneyList",deliveryOtherMoneyMapper.findById(orderDetail.getDeliveryDetail().getDeliveryId())); return map; } @@ -89,49 +141,130 @@ return map; } public Map<String, Object> getseletShippingOrderDetails(Integer pageNum, Integer pageSize, OrderDetail orderDetail) { public Map<String, Object> getSelectShippingOrderDetails(Integer pageNum, Integer pageSize, OrderDetail orderDetail) { Integer offset = (pageNum - 1) * pageSize; Map<String, Object> map = new HashMap<>(); map.put("data", deliveryDetailMapper.getseletShippingOrderDetails(offset, pageSize, orderDetail)); map.put("title", deliveryMapper.getseletShippingOrderDetaildeliverys(offset, pageSize, orderDetail)); map.put("total", deliveryDetailMapper.getseletShippingOrderDetailsPageTotal(offset, pageSize, orderDetail)); map.put("data", deliveryDetailMapper.getSelectShippingOrderDetails(offset, pageSize, orderDetail)); map.put("title", deliveryMapper.getSelectShippingOrderDetailDeliverys(offset, pageSize, orderDetail)); map.put("total", deliveryDetailMapper.getSelectShippingOrderDetailsPageTotal(offset, pageSize, orderDetail)); return map; } public Boolean insertDelivery(Map<String,Object> object) { Boolean isinsert=false; Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class); List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class); //获取单号 String oddNumber= orderNumberSetting("发货"); System.out.println(delivery); deliveryMapper.insertDelivery(delivery,oddNumber,orderDetaillist.get(0).getOrderId()); Double area=0.0; Integer quantity=0; Double money=0.0; //获取对象集合循环进行新增修改 if (!orderDetaillist.isEmpty()){ for (OrderDetail orderDetail : orderDetaillist) { quantity+=orderDetail.getDeliveryDetail().getQuantity(); area+=orderDetail.getFinishedGoodsInventory().getActualSignalArea()*orderDetail.getDeliveryDetail().getQuantity(); money+=orderDetail.getPrice()*orderDetail.getDeliveryDetail().getQuantity(); Integer deliveryDetailmaximum=deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber); System.out.println(deliveryDetailmaximum); deliveryDetailMapper.insertDeliveryDetail(orderDetail,oddNumber,deliveryDetailmaximum); deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail); //修改库存表出库数量 finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getDeliveryDetail().getQuantity()); isinsert=true; boolean saveState = true; //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); String deliveryId=""; String oddNumber; if (object.get("deliveryId") != null) { deliveryId = object.get("deliveryId").toString(); } else { deliveryId = ""; } System.out.println("面积"+area+"数量"+quantity+"金额"+money); deliveryMapper.updatedelivery(area,quantity,money,oddNumber); return isinsert; }else{ return false; } Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class); List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class); List<DeliveryOtherMoney> deliveryOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(object.get("otherMoney")), DeliveryOtherMoney.class); //查询发货单是否存在 Integer deliveryConut = deliveryMapper.getDeliveryConut(deliveryId); if (deliveryConut != 0) { //编辑还原数据 String deliveryDetailNumber = ""; if (!orderDetaillist.isEmpty()) { for (OrderDetail orderDetail : orderDetaillist) { if (orderDetaillist.size() - 1 == orderDetaillist.indexOf(orderDetail)) { deliveryDetailNumber += orderDetail.getDeliveryDetail().getDeliveryNumber(); } else { deliveryDetailNumber += orderDetail.getDeliveryDetail().getDeliveryNumber() + "|"; } } } List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId); if (!deliveryDetaillist.isEmpty()) { for (DeliveryDetail deliveryDetail : deliveryDetaillist) { //还原库存数以及订单明细的发货数 finishedGoodsInventoryMapper.updateInventoryquantityInt(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity()); deliveryDetailMapper.updateIsNotOrderDetailDeliveryNum(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity()); } } //还原发货表的面积数量金额 deliveryMapper.updatedelivery(0.0, 0, 0.0,0.0, deliveryId); //删除发货明细的数据 deliveryDetailMapper.deleteDeliveryDetail(deliveryId); //删除订单额外金额的数据 deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId); oddNumber = deliveryId; } else { //获取单号 oddNumber = orderNumberSetting("发货"); //新增发货表数据 deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId()); } double area = 0.0; Integer quantity = 0; double money = 0.0; AtomicReference<Double> otherMoney = new AtomicReference<>(0.0); //先把其他金额副表的金额与数量置0 deliveryOtherMoneyList.forEach(deliveryOtherMoney -> { deliveryOtherMoney.setQuantity(0.0); }); //获取对象集合循环进行新增修改 if (!orderDetaillist.isEmpty()) { for (OrderDetail orderDetail : orderDetaillist) { quantity += orderDetail.getDeliveryDetail().getQuantity(); area += orderDetail.getFinishedGoodsInventory().getActualSignalArea() * orderDetail.getDeliveryDetail().getQuantity(); money += orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity(); Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber); Map<String,Double> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, Double>>(){}); if(otherColumns!=null){ otherColumns.forEach((key, value) ->{ if(value!=null) { deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{ if(deliveryOtherMoney.getColumn().equals(key)){ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+(value * orderDetail.getDeliveryDetail().getQuantity())); } }); } }); } //新增发货明细数据 deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1); //修改订单明细 deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail); //修改库存表出库数量 finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity()); } //往订单其他金额副表传入数据 deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{ deliveryOtherMoney.setId(null); deliveryOtherMoney.setDeliveryId(oddNumber); if(deliveryOtherMoney.getQuantity()!=null && deliveryOtherMoney.getPrice()!=null){ deliveryOtherMoney.setMoney((deliveryOtherMoney.getQuantity()*deliveryOtherMoney.getPrice())); otherMoney.updateAndGet(v -> new Double((double) (v + deliveryOtherMoney.getMoney()))); deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney); } }); //修改发货明细累加面积数量金额 deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), otherMoney.get(), oddNumber); } else { return false; } return saveState; } @@ -147,7 +280,6 @@ type = Integer.parseInt(object.get("type").toString()); } System.out.println(deliveryId); deliveryMapper.updateDeliveryToExamine(deliveryId,type); return true; @@ -156,20 +288,304 @@ } public Boolean deleteDelivery(Map<String,Object> object) { boolean saveState = true; //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); try { String deliveryId = ""; if (object.get("deliveryId") != null) { deliveryId = object.get("deliveryId").toString(); } deliveryDetailMapper.deleteDeliveryDetail(deliveryId); deliveryMapper.deleteDelivery(deliveryId); return true; }catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysErrorService.insert(sysError); saveState = false; } return saveState; } public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) { Map<String, Object> map = new HashMap<>(); List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//最终结果 List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliveryDetail); for (DeliveryDetail detail : deliveryDetailList) { Map<String, Object> itemmap = new HashMap<>(); List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(), detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId()); itemmap.put("DeliveryDetail", detail); itemmap.put("DeliveryDetailList", deliveryDetailList2); list.add(itemmap); } Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail); map.put("data", list); map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail)); map.put("money", toChinese(delivery.getMoney().toString(), false)); return map; } private static final String[] NUMBERS = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"}; private static final String[] IUNIT = {"元", "拾", "佰", "仟", "万", "拾", "佰", "仟", "亿", "拾", "佰", "仟"}; private static final String[] DUNIT = {"角", "分"}; private static final String[] CN_NUMBERS = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"}; private static final String[] CN_IUNIT = {"", "十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千"}; /** * 转换为大写的中文金额,支持负数 * @param amount 金额 * @param isSimplified 是否简体中文：true:简体，false：繁体 * @return */ public static String toChinese(String amount, boolean isSimplified) { // 判断输入的金额字符串是否符合要求 if (StringUtils.isBlank(amount) || !amount.matches("(-)?[\\d]*(.)?[\\d]*")) { throw new RuntimeException("请输入数字"); } if ("0".equals(amount) || "0.00".equals(amount) || "0.0".equals(amount)) { return isSimplified ? "零" : "零元"; } // 判断金额数字中是否存在负号"-" boolean flag = false; if (amount.startsWith("-")) { // 标志位，标志此金额数字为负数 flag = true; amount = amount.replaceAll("-", ""); } // 去掉金额数字中的逗号"," amount = amount.replaceAll(",", ""); // 初始化：分离整数部分和小数部分 String[] separateNum = separateNum(amount); // 整数部分数字 String integerStr = separateNum[0]; // 小数部分数字 String decimalStr = separateNum[1]; // beyond超出计算能力，直接返回 if (integerStr.length() > IUNIT.length) { throw new RuntimeException("输入数字超限"); } // 整数部分数字 int[] integers = toIntArray(integerStr); // 判断整数部分是否存在输入012的情况 if (integers.length > 1 && integers[0] == 0) { throw new RuntimeException("输入数字不符合要求"); } // 设置万单位 boolean isWan = isWan5(integerStr); // 小数部分数字 int[] decimals = toIntArray(decimalStr); // 返回最终的大写金额 String result = ""; String chineseInteger = getChineseInteger(integers, isWan, isSimplified); String chineseDecimal = getChineseDecimal(decimals, isSimplified); if (decimals.length > 0 && isSimplified) { result = chineseInteger; if (!chineseDecimal.equals("零零")) { result = result + "点" + chineseDecimal; } } else { result = chineseInteger + chineseDecimal; } if (flag) { // 如果是负数，加上"负" return "负" + result; } else { return result; } } /** * 分离整数部分和小数部分 * @param str * @return */ private static String[] separateNum(String str) { String integerStr;// 整数部分数字 String decimalStr;// 小数部分数字 if (str.indexOf('.') >= 1) { integerStr = str.substring(0, str.indexOf('.')); decimalStr = str.substring(str.indexOf('.') + 1); if (decimalStr.length() > 2) { decimalStr = decimalStr.substring(0, 2); } } else if (str.indexOf('.') == 0) { integerStr = ""; decimalStr = str.substring(1); } else { integerStr = str; decimalStr = ""; } return new String[] {integerStr, decimalStr}; } /** * 将字符串转为int数组 * @param number 数字 * @return */ private static int[] toIntArray(String number) { int[] array = new int[number.length()]; for (int i = 0; i < number.length(); i++) { array[i] = Integer.parseInt(number.substring(i, i + 1)); } return array; } /** * 将整数部分转为大写的金额 * @param integers 整数部分数字 * @param isWan 整数部分是否已经是达到【万】 * @return */ private static String getChineseInteger(int[] integers, boolean isWan, boolean isSimplified) { int length = integers.length; if (!isSimplified && length == 1 && integers[0] == 0) { return ""; } if (!isSimplified) { return traditionalChineseInteger(integers, isWan); } else { return simplifiedChineseInteger(integers, isWan); } } /** * 繁体中文整数 * @param integers * @param isWan * @return */ private static String traditionalChineseInteger(int[] integers, boolean isWan) { StringBuilder chineseInteger = new StringBuilder(""); int length = integers.length; for (int i = 0; i < length; i++) { String key = ""; if (integers[i] == 0) { if ((length - i) == 13)// 万（亿） key = IUNIT[4]; else if ((length - i) == 9) {// 亿 key = IUNIT[8]; } else if ((length - i) == 5 && isWan) {// 万 key = IUNIT[4]; } else if ((length - i) == 1) {// 元 key = IUNIT[0]; } if ((length - i) > 1 && integers[i + 1] != 0) { key += NUMBERS[0]; } } chineseInteger.append(integers[i] == 0 ? key : (NUMBERS[integers[i]] + IUNIT[length - i - 1])); } return chineseInteger.toString(); } /** * 简体中文整数 * @param integers * @param isWan * @return */ private static String simplifiedChineseInteger(int[] integers, boolean isWan) { StringBuilder chineseInteger = new StringBuilder(""); int length = integers.length; for (int i = 0; i < length; i++) { String key = ""; if (integers[i] == 0) { if ((length - i) == 13) {// 万（亿） key = CN_IUNIT[4]; } else if ((length - i) == 9) {// 亿 key = CN_IUNIT[8]; } else if ((length - i) == 5 && isWan) {// 万 key = CN_IUNIT[4]; } else if ((length - i) == 1) {// 元 key = CN_IUNIT[0]; } if ((length - i) > 1 && integers[i + 1] != 0) { key += CN_NUMBERS[0]; } if (length == 1 && integers[i] == 0) { key += CN_NUMBERS[0]; } } chineseInteger.append(integers[i] == 0 ? key : (CN_NUMBERS[integers[i]] + CN_IUNIT[length - i - 1])); } return chineseInteger.toString(); } /** * 将小数部分转为大写的金额 * @param decimals 小数部分的数字 * @return */ private static String getChineseDecimal(int[] decimals, boolean isSimplified) { StringBuilder chineseDecimal = new StringBuilder(""); if (!isSimplified) { for (int i = 0; i < decimals.length; i++) { String key = ""; if ((decimals.length - i) > 1 && decimals[i + 1] != 0) { key += NUMBERS[0]; } chineseDecimal.append(decimals[i] == 0 ? key : (NUMBERS[decimals[i]] + DUNIT[i])); } } else { for (int i = 0; i < decimals.length; i++) { chineseDecimal.append(CN_NUMBERS[decimals[i]]); } } return chineseDecimal.toString(); } /** * 判断当前整数部分是否已经是达到【万】 * @param integerStr 整数部分数字 * @return */ private static boolean isWan5(String integerStr) { int length = integerStr.length(); if (length > 4) { String subInteger = ""; if (length > 8) { subInteger = integerStr.substring(length - 8, length - 4); } else { subInteger = integerStr.substring(0, length - 4); } return Integer.parseInt(subInteger) > 0; } else { return false; } } public String orderNumberSetting(String type) { //根据类型自动生成不同的操作单号 String alias=""; if(Objects.equals(type, "发货")){ alias="FH"; }else if(Objects.equals(type, "出库")){ alias="CK"; }else if(Objects.equals(type, "调拨")){ alias="DB"; }else if(Objects.equals(type, "领出")){ alias="LC"; }else if(Objects.equals(type, "返工")){ alias="FG"; } //查询当天的最大数量 Integer maximum=deliveryMapper.getmaximum(type);
