From 9b9fdcb4711279a303cf8da9ce9e3ff30b1bf6e0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 三月 2025 16:45:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 776 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 713 insertions(+), 63 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 4dc53cb..8898736 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -1,27 +1,36 @@
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.dto.mm.FinishedOperateLogDTO;
+import com.example.erp.dto.sd.DeliveryDetailDTO;
+import com.example.erp.dto.sd.DeliveryDetailProductDTO;
+import com.example.erp.entity.mm.FinishedOperateLog;
+import com.example.erp.entity.sd.*;
+import com.example.erp.entity.userInfo.Log;
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.mm.FinishedOperateLogMapper;
+import com.example.erp.mapper.sd.*;
+import com.example.erp.service.mm.FinishedGoodsInventoryService;
+import com.example.erp.service.userInfo.LogService;
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.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
@Service
@DS("sd")
@@ -38,7 +47,15 @@
@Autowired
FinishedGoodsInventoryMapper finishedGoodsInventoryMapper;
@Autowired
+ FinishedOperateLogMapper finishedOperateLogMapper;
+ @Autowired
+ DeliveryOtherMoneyMapper deliveryOtherMoneyMapper;
+ @Autowired
+ LogService logService;
+ @Autowired
SysErrorService sysErrorService;
+ @Autowired
+ FinishedGoodsInventoryService finishedGoodsInventoryService;
public Map<String, Object> getSelectShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) {
@@ -75,10 +92,31 @@
endDate = selectDate.get(1);
}
}
- System.out.println(pageSize);
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);
@@ -93,6 +131,7 @@
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;
}
@@ -128,22 +167,31 @@
return map;
}
- public Boolean insertDelivery(Map<String,Object> object) {
+ public String insertDelivery(Map<String,Object> object) {
- boolean saveState = true;
+ String saveState = "true";
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
- try {
- String deliveryId = "";
+ try {
+ String deliveryId="";
String oddNumber;
if (object.get("deliveryId") != null) {
deliveryId = object.get("deliveryId").toString();
+ } else {
+ deliveryId = "";
}
+ String deliveryIdType = object.get("deliveryIdType").toString();
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);
+
+ Log log = new Log();
+ log.setOperator(delivery.getCreator());
+ log.setOperatorId(delivery.getCreatorId());
+ log.setContent(object.toString());
if (deliveryConut != 0) {
//缂栬緫杩樺師鏁版嵁
@@ -158,7 +206,8 @@
}
}
- List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId);
+
+ List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
if (!deliveryDetaillist.isEmpty()) {
for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
//杩樺師搴撳瓨鏁颁互鍙婅鍗曟槑缁嗙殑鍙戣揣鏁�
@@ -167,72 +216,256 @@
}
}
//杩樺師鍙戣揣琛ㄧ殑闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(0.0, 0, 0.0, deliveryId);
+ deliveryMapper.updatedelivery(0.0, 0, 0.0,0.0, deliveryId);
//鍒犻櫎鍙戣揣鏄庣粏鐨勬暟鎹�
deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
+ //鍒犻櫎璁㈠崟棰濆閲戦鐨勬暟鎹�
+ deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
oddNumber = deliveryId;
+ deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
+ log.setFunction("insertDelivery淇敼:"+oddNumber);
} else {
//鑾峰彇鍗曞彿
- oddNumber = orderNumberSetting("鍙戣揣");
+ oddNumber = orderNumberSetting("鍙戣揣",deliveryIdType);
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
+ log.setFunction("insertDelivery鏂板:"+oddNumber);
}
- System.out.println(4);
- Double area = 0.0;
+ double area = 0.0;
Integer quantity = 0;
- Double money = 0.0;
- //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ double money = 0.0;
+ AtomicReference<Double> otherMoney = new AtomicReference<>(0.0);
+ //鍏堟妸鍏朵粬閲戦鍓〃鐨勯噾棰濅笌鏁伴噺缃�0
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
+ deliveryOtherMoney.setQuantity(0.0);
+ });
+ double otherMoneys=0.0;
+
+ List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
+ if(orderDetail.getDeliveryDetail().getQuantity()>0){
+ OrderDetail orderDetails =deliveryDetailMapper.selectOrderDetailDeliveryCount(orderDetail);
+ Boolean aBoolean1 =orderDetails.getQuantity()>= orderDetail.getDeliveryDetail().getQuantity()+orderDetails.getDeliveryNum();
+ Boolean aBoolean2 = !Integer.valueOf(orderDetails.getQuantity().toString()).equals(orderDetails.getDeliveryNum());
+ //鍒ゆ柇鏄惁宸茬粡鍙戣揣
+ if(aBoolean1 && aBoolean2){
+ double deliveryDetailotherMoneys=0.0;
+ Integer calculateType=0;
- quantity += orderDetail.getDeliveryDetail().getQuantity();
- area += orderDetail.getFinishedGoodsInventory().getActualSignalArea() * orderDetail.getDeliveryDetail().getQuantity();
- money += orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity();
- Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
- //鏂板鍙戣揣鏄庣粏鏁版嵁
- deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1);
- //淇敼璁㈠崟鏄庣粏
- deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
- //淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
- finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
+ if (orderDetail.getOrder().getOrderId()==null){
+ Order order=deliveryMapper.selectOrderId(orderDetail.getOrderId());
+ calculateType=order.getCalculateType();
+ }else{
+ calculateType=orderDetail.getOrder().getCalculateType();
+ }
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 0.0;
+ BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getDeliveryDetail().getQuantity());
+ BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
+ BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
+ BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
+ BigDecimal singlePieceArea =getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ if (calculateType==1){
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+
+ }else if (calculateType==2){
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())&&Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())){
+ deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ }else{
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ }else if (calculateType==3){
+ deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+
+ }else if (calculateType==4){
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())&&Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())){
+ deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
+ divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ }else{
+ deliveryDetailMoney=getComputeArea.multiply(getQuantity).multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ }
+ /*if (calculateType==1){
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }else if (calculateType==2){
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getWidth()*orderDetail.getHeight()*orderDetail.getDeliveryDetail().getQuantity()/1000000)
+ )*orderDetail.getPrice()));
+ }else{
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }
+ }else if (calculateType==3){
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
+
+ }*/
+
+
+
+ if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
+ JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
+ for(String key : jsonObject.keySet()){
+ boolean isnull = key.contains("M");
+ if(isnull) {
+ Map<String, Object> moneryItemmap = new HashMap<>();
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(),
+ key, Double.valueOf(jsonObject.get(key).toString()));
+ if(deliveryDetailOtherMoney.get("monery")!=null){
+ otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return "false1";
+ }
+ }
+ }
+
+ }
+
+
+ //瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
+ quantity += orderDetail.getDeliveryDetail().getQuantity();
+ area += deliveryDetailArea;
+ money += deliveryDetailMoney;
+ Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
+
+ //棰濆閲戦淇敼
+ Map<String,String> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, String>>(){});
+ if(otherColumns!=null){
+ otherColumns.forEach((key, value) ->{
+ boolean isnull = key.contains("M");
+ if(isnull){
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ if(deliveryOtherMoney.getColumn().equals(key)){
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+( Double.valueOf(value)* orderDetail.getDeliveryDetail().getQuantity()));
+ }
+ });
+
+ }
+ });
+ }
+ //鏂板鍙戣揣鏄庣粏鏁版嵁
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys,deliveryDetailArea);
+ //淇敼璁㈠崟鏄庣粏
+ deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
+ //淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
+ finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return "false2";
+ }
+ }
}
- //淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), oddNumber);
+ //寰�璁㈠崟鍏朵粬閲戦鍓〃浼犲叆鏁版嵁
+ 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);
+ }
+ });
+ double freight=0.0;
+ if (delivery.getFreightPrice()!=null&&delivery.getFreightQuantity()!=null){
+ freight=delivery.getFreightPrice()*delivery.getFreightQuantity();
+ }
+ int intMoney= (int) Math.round(money+freight+otherMoneys);
+ //淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
+ deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoneys, oddNumber);
+ logService.saveLog(log);
} else {
- return false;
+ return "false3";
}
- } catch (Exception e) {
+ }catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("insertDelivery");
sysErrorService.insert(sysError);
- saveState = false;
+ saveState = "false4";
}
+
return saveState;
}
- public Boolean updateDeliveryToExamine(Map<String,Object> object) {
- Boolean isinsert=false;
- String deliveryId = "";
- int type =3;
- if (object.get("deliveryId") != null) {
- deliveryId = object.get("deliveryId").toString();
+ public String updateDeliveryToExamine(Map<String,Object> object) {
+ String saveState = "true";
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try {
+ Log log = new Log();
+ String deliveryId = "";
+ int type =3;
+ if (object.get("deliveryId") != null) {
+ deliveryId = object.get("deliveryId").toString();
+ }
+
+ if (object.get("type") != null) {
+ type = Integer.parseInt(object.get("type").toString());
+ }
+
+ if(Boolean.parseBoolean(object.get("deliveryOutbound").toString())){
+ if(type==2){
+ List<OrderDetail> orderDetaillist=finishedGoodsInventoryMapper.getSelectDeliveryDetailDeliveryId(deliveryId);
+ if(!Objects.equals(finishedGoodsInventoryService.deliveryDetailLogic(orderDetaillist,savePoint,object.get("userName").toString()), "true")){
+ return finishedGoodsInventoryService.deliveryDetailLogic(orderDetaillist,savePoint,object.get("userName").toString());
+ }
+ }else{
+ List<FinishedOperateLog> finishedOperateLogslist=finishedOperateLogMapper.getSelectStorageRecordDeliveryId(deliveryId,"鍑哄簱");
+ if(!Objects.equals(finishedGoodsInventoryService.cancelDeliveryDetailLogic(finishedOperateLogslist,savePoint,object.get("userName").toString(),log), "true")){
+ return finishedGoodsInventoryService.cancelDeliveryDetailLogic(finishedOperateLogslist,savePoint,object.get("userName").toString(),log);
+ }
+
+ }
+
+ }
+
+ deliveryMapper.updateDeliveryToExamine(deliveryId,type);
+
+
+ log.setOperatorId(object.get("userId").toString());
+ log.setOperator(object.get("userName").toString());
+ log.setContent(object.toString());
+ log.setFunction("updateDeliveryToExamine淇敼:"+deliveryId);
+ logService.saveLog(log);
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("addDeliveryDetail");
+ sysErrorService.insert(sysError);
+ saveState = "false";
+
}
-
- if (object.get("type") != null) {
- type = Integer.parseInt(object.get("type").toString());
- }
-
- deliveryMapper.updateDeliveryToExamine(deliveryId,type);
-
- return true;
+ return saveState;
@@ -247,16 +480,33 @@
if (object.get("deliveryId") != null) {
deliveryId = object.get("deliveryId").toString();
}
+ List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
+ if (!deliveryDetaillist.isEmpty()) {
+ for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
+ //杩樺師搴撳瓨鏁颁互鍙婅鍗曟槑缁嗙殑鍙戣揣鏁�
+ finishedGoodsInventoryMapper.updateInventoryquantityInt(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
+ deliveryDetailMapper.updateIsNotOrderDetailDeliveryNum(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
+ }
+ }
+ //鍒犻櫎璁㈠崟棰濆閲戦鐨勬暟鎹�
+ deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
deliveryMapper.deleteDelivery(deliveryId);
+
+ Log log = new Log();
+ log.setOperatorId(object.get("userId").toString());
+ log.setOperator(object.get("userName").toString());
+ log.setContent(object.toString());
+ log.setFunction("deleteDelivery鍒犻櫎:"+deliveryId);
+ logService.saveLog(log);
return true;
}catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("deleteDelivery");
sysErrorService.insert(sysError);
saveState = false;
@@ -265,22 +515,422 @@
}
+ public List<Map<String, Object>> getSelectDeliveryPrinting(Map<String,Object> object) throws IllegalAccessException {
+ List<Delivery> deliveries = JSONArray.parseArray(JSONObject.toJSONString(object.get("deliveryId")), Delivery.class);
+ String type = "";
+ if (object.get("type") != null) {
+ type = object.get("type").toString();
+ }
+ List <Map<String, Object>> list1=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ for(Delivery deliverys:deliveries){
- public String orderNumberSetting(String type) {
+ Map<String, Object> map = new HashMap<>();
+ List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliverys.getDeliveryId(),type);
+ String orderId="";
+ double otherMoney=0.0;
+ for (DeliveryDetail detail : deliveryDetailList) {
+ orderId=detail.getOrderDetail().getOrderId();
+ Map<String, Object> itemmap = new HashMap<>();
+
+ List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
+ detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
+
+ for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
+ if(stringObjectMap.get("other_columns")!=null){
+ JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());
+ for(String key : jsonObject.keySet()){
+ boolean isnull = key.contains("M");
+ if(isnull) {
+ Map<String, Object> moneryItemmap = new HashMap<>();
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),
+ detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key,Double.valueOf(jsonObject.get(key).toString()));
+ Double sss= Double.valueOf(jsonObject.get(key).toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }
+ }
+
+ }
+ }
+ itemmap.put("DeliveryDetail", detail);
+ itemmap.put("DeliveryDetailList", deliveryDetailList2);
+ list.add(itemmap);
+
+ }
+ /*Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
+ delivery.setMoney(delivery.getMoney()+otherMoney);
+ map.put("data", list);
+ map.put("otherMoney",moneryList);
+ map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));
+ map.put("money", toChinese(delivery.getMoney().toString(), false));*/
+
+ deliverys.setMoney(deliverys.getMoney()+otherMoney);
+ map.put("data", list);
+ map.put("otherMoney",moneryList);
+ map.put("delivery",deliverys );
+ map.put("money", toChinese(deliverys.getMoney().toString(), false));
+ list1.add(map);
+ }
+
+
+ return list1;
+
+ }
+
+ public Map<String, Object> getSelectOrderPrinting(OrderDetail orderDetail,List<String> productId) {
+ Map<String, Object> map = new HashMap<>();
+ List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<Map<String,Object>> orderProductDistinct;
+ if (!Objects.equals(productId.get(0), "null")){
+ orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderDetail.getOrderId(),productId);
+ }else{
+ orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderDetail.getOrderId());
+ }
+ BigDecimal areSum=new BigDecimal("0");
+ BigDecimal grossAmount=new BigDecimal("0");
+ int quantity=0;
+ for (Map<String, Object> maps : orderProductDistinct) {
+ List<OrderDetail> orderDetails = deliveryDetailMapper.getSelectOrderPrinting(maps.get("productId"),orderDetail.getOrderId());
+ for (OrderDetail detail : orderDetails) {
+
+ areSum=areSum.add(BigDecimal.valueOf(detail.getArea()));
+ quantity+=detail.getQuantity();
+ grossAmount=grossAmount.add(BigDecimal.valueOf(detail.getGrossAmount()));
+
+ Map<String, Object> itemmap = new HashMap<>();
+ List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectOrderDetailPrinting(
+ detail.getProductId(), detail.getOrderId());
+ for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
+
+ if(stringObjectMap.get("other_columns")!=null){
+ JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());
+ for(String key : jsonObject.keySet()){
+ boolean isnull = key.contains("M");
+ if(isnull){
+ Map<String, Object> moneryItemmap = new HashMap<>();
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString())
+ ,key,Double.valueOf(jsonObject.get(key).toString()));
+ grossAmount=grossAmount.add(BigDecimal.valueOf(Double.parseDouble(deliveryDetailOtherMoney.get("monery").toString())));
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }
+
+ }
+
+ }
+ }
+ itemmap.put("productId",maps.get("productId"));
+ itemmap.put("productName",maps.get("productName"));
+ itemmap.put("remarks",maps.get("remarks"));
+ itemmap.put("DeliveryDetail", detail);
+ itemmap.put("DeliveryDetailList", deliveryDetailList2);
+ list.add(itemmap);
+
+ }
+ }
+
+ Order order=deliveryMapper.getSelectShippingOrderDetailPrinting(orderDetail);
+ order.setMoney((double) Math.round(grossAmount.doubleValue()));
+ order.setQuantity((long) quantity);
+ order.setArea(areSum.doubleValue());
+ map.put("data", list);
+ map.put("otherMoney",moneryList);
+ map.put("delivery", order);
+ map.put("money", toChinese(order.getMoney().toString(), false));
+ return map;
+
+ }
+
+ public List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates) {
+ return deliveryDetailMapper.exportDeliveryDetailReport(dates);
+ }
+
+ public List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates) {
+ return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
+ }
+
+ public boolean updateDeliveryPrintNumber(String deliveryId) {
+ return deliveryMapper.updateDeliveryPrintNumber(deliveryId);
+ }
+
+
+
+
+
+ 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 deliveryIdType) {
//鏍规嵁绫诲瀷鑷姩鐢熸垚涓嶅悓鐨勬搷浣滃崟鍙�
String alias="";
if(Objects.equals(type, "鍙戣揣")){
alias="FH";
}
- //鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
- Integer maximum=deliveryMapper.getmaximum(type);
- //璁剧疆涓や綅涓嶅琛�0
- String formattedNumber = String.format("%02d", maximum+1);
- //鏍煎紡鍖栧綋鍓嶆棩鏈�
- Date currentDate = new Date();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
- String formattedDate = dateFormat.format(currentDate);
- String oddNumbers = alias+formattedDate+formattedNumber;
+ String oddNumbers="";
+
+ if(deliveryIdType.equals("day")){
+ //鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
+ Integer maximum=deliveryMapper.getmaximum(type);
+ //璁剧疆涓や綅涓嶅琛�0
+ String formattedNumber = String.format("%02d", maximum+1);
+ //鏍煎紡鍖栧綋鍓嶆棩鏈�
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+ String formattedDate = dateFormat.format(currentDate);
+ oddNumbers = alias+formattedDate+formattedNumber;
+ }else if(deliveryIdType.equals("month")){
+ Integer maximum = deliveryMapper.getmaximumMonth();
+ String formattedNumber = String.format("%04d", maximum+1);
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMM");
+ String formattedDate = dateFormat.format(currentDate);
+ oddNumbers = alias+formattedDate+formattedNumber;
+
+ }
+
return oddNumbers;
}
}
--
Gitblit v1.8.0