From 8d6b17bfa56fd767c6f9de666eb0dd44c6b032cd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 五月 2025 15:42:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 203 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 143 insertions(+), 60 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 3df2aca..404611c 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
@@ -9,11 +9,14 @@
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.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;
@@ -44,11 +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) {
@@ -269,7 +276,8 @@
deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
}else if (calculateType==2){
- if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ 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();
@@ -281,6 +289,16 @@
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(
@@ -309,7 +327,8 @@
boolean isnull = key.contains("M");
if(isnull) {
Map<String, Object> moneryItemmap = new HashMap<>();
- Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(),
+ key, Double.valueOf(jsonObject.get(key).toString()),orderDetail.getDeliveryDetail().getQuantity());
if(deliveryDetailOtherMoney.get("monery")!=null){
otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
@@ -376,7 +395,7 @@
int intMoney= (int) Math.round(money+freight+otherMoneys);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
+ deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoneys, oddNumber);
logService.saveLog(log);
} else {
return "false3";
@@ -396,21 +415,57 @@
}
- 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;
@@ -438,6 +493,13 @@
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);
@@ -453,49 +515,67 @@
}
- public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) throws IllegalAccessException {
- 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(deliveryDetail);
- 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, jsonObject.get(key).toString());
-
- moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
- moneryList.add(moneryItemmap);
- }
- }
-
- }
- }
- itemmap.put("DeliveryDetail", detail);
- itemmap.put("DeliveryDetailList", deliveryDetailList2);
- list.add(itemmap);
-
+ 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();
}
- 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));
- return map;
+ List <Map<String, Object>> list1=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ for(Delivery deliverys:deliveries){
+
+ 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;
}
@@ -531,7 +611,8 @@
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,jsonObject.get(key).toString());
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoneys(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);
@@ -543,6 +624,7 @@
}
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);
@@ -577,6 +659,7 @@
+
private static final String[] NUMBERS = {"闆�", "澹�", "璐�", "鍙�", "鑲�", "浼�", "闄�", "鏌�", "鎹�", "鐜�"};
private static final String[] IUNIT = {"鍏�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�", "浜�", "鎷�", "浣�", "浠�"};
--
Gitblit v1.8.0