From f0420251442ac6f7bfb6beafa37ad045b4f6478a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 31 十二月 2025 15:49:05 +0800
Subject: [PATCH] 报工多工序，用户多工序修改
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 3e6dd5a..5ba8efb 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
@@ -6,7 +6,9 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.example.erp.dto.sd.DeliveryDetailDTO;
import com.example.erp.dto.sd.DeliveryDetailProductDTO;
@@ -60,6 +62,8 @@
SysErrorService sysErrorService;
@Autowired
FinishedGoodsInventoryService finishedGoodsInventoryService;
+ @Autowired
+ OrderOtherMoneyMapper orderOtherMoneyMapper;
public Map<String, Object> getSelectShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Map<String,Object> config) throws JsonProcessingException {
@@ -224,6 +228,7 @@
//杩樺師搴撳瓨鏁颁互鍙婅鍗曟槑缁嗙殑鍙戣揣鏁�
finishedGoodsInventoryMapper.updateInventoryquantityIntBybox(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity(),deliveryDetail.getBoxNo());
deliveryDetailMapper.updateIsNotOrderDetailDeliveryNum(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
+
}
}
//杩樺師鍙戣揣琛ㄧ殑闈㈢Н鏁伴噺閲戦
@@ -329,6 +334,27 @@
deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
}*/
+
+ List<OrderOtherMoney> orderOtherMoneyList = orderOtherMoneyMapper.selectList(
+ new QueryWrapper<OrderOtherMoney>()
+ .eq("order_id",orderDetail.getOrderId())
+ .eq("delivery_state",0)
+ .isNull("`column`")
+ );
+
+ if(orderOtherMoneyList.size()>0){
+ for (OrderOtherMoney orderOtherMoney:orderOtherMoneyList){
+ otherMoneys=otherMoneys+orderOtherMoney.getMoney();
+ deliveryDetailMapper.insertDeliveryOtherMoney(orderOtherMoney,oddNumber);
+ }
+ orderOtherMoneyMapper.update(null, new LambdaUpdateWrapper<OrderOtherMoney>()
+ .set(OrderOtherMoney::getDeliveryState, 1)
+ .eq(OrderOtherMoney::getOrderId, orderDetail.getOrderId())
+ .isNull(OrderOtherMoney::getColumn)
+ );
+ }
+
+
@@ -570,12 +596,15 @@
List<Map<String, Object>> deliveryDetailList2;
if(state==3){
+ //娲涢槼鏈夐噾棰�
deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingMoneySpecifications(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
}else if(state==4){
+ //娲涢槼鏃犻噾棰�
deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingNoMoneySpecifications(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
}else{
+ //閫氱敤
deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
}
--
Gitblit v1.8.0