From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 208 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index b946507..478ac43 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -10,6 +10,7 @@
import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.mm.FinishedOperateLog;
+import com.example.erp.entity.mm.MaterialInventory;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.DeliveryDetail;
@@ -20,6 +21,7 @@
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
import com.example.erp.mapper.mm.FinishedOperateLogMapper;
+import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
import com.example.erp.service.userInfo.LogService;
@@ -32,6 +34,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.SQLOutput;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -52,6 +55,8 @@
@Autowired
OrderMapper orderMapper;
@Autowired
+ FlowCardMapper flowCardMapper;
+ @Autowired
SysErrorService sysErrorService;
@Autowired
LogService logService;
@@ -69,6 +74,19 @@
Map<String, Object> map = new HashMap<>();
map.put("data", finishedGoodsInventoryMapper.getSelectWarehousing(offset, pageSize, flowCard));
map.put("total", finishedGoodsInventoryMapper.getSelectWarehousingPageTotal(offset, pageSize, flowCard));
+
+ return map;
+ }
+
+ public Map<String, Object> getSelectWarehousingApp(String processId) {
+ Map<String, Object> map = new HashMap<>();
+ FlowCard flowCard=new FlowCard();
+ if(processId!=null){
+ flowCard.setProcessId(processId.substring(0,14));
+ map.put("data", finishedGoodsInventoryMapper.getSelectWarehousing(0, 999999999, flowCard));
+ map.put("total", finishedGoodsInventoryMapper.getSelectWarehousingPageTotal(0, 999999999, flowCard));
+ }
+
return map;
}
@@ -118,6 +136,8 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<FlowCard> flowCardlist = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
if (!flowCardlist.isEmpty()){
+ //鍒犻櫎涓�骞村墠涓斿彂璐х殑璁㈠崟搴撳瓨淇℃伅
+ finishedGoodsInventoryMapper.deleteFinishedGoodsInventoryDate();
//鑾峰彇鍗曞彿
String oddNumber= orderNumberSetting("鍏ュ簱");
for (FlowCard flowCards : flowCardlist) {
@@ -244,6 +264,14 @@
Map<String, Object> map = new HashMap<>();
map.put("data", finishedGoodsInventoryMapper.getSelectDeliveryDetail(offset, pageSize, orderDetail));
map.put("total", finishedGoodsInventoryMapper.getSelectDeliveryDetailPageTotal(offset, pageSize, orderDetail));
+ return map;
+ }
+
+ public Map<String, Object> getSelectDeliveryDetailApp() {
+ Map<String, Object> map = new HashMap<>();
+ OrderDetail orderDetail=new OrderDetail();
+ map.put("data", finishedGoodsInventoryMapper.getSelectDeliveryDetail(0, 999999999, orderDetail));
+ map.put("total", finishedGoodsInventoryMapper.getSelectDeliveryDetailPageTotal(0, 999999999, orderDetail));
return map;
}
@@ -735,16 +763,92 @@
if(order.getWarehousing()!=2){
List<OrderDetail> orderDetailList=finishedGoodsInventoryMapper.getSelectOrderDetail(orderId);
for (OrderDetail orderDetail:orderDetailList){
+ FlowCard flowCard =flowCardMapper.selectOne(
+ new LambdaQueryWrapper<FlowCard>()
+ .eq(FlowCard::getOrderId, orderDetail.getOrderId())
+ .eq(FlowCard::getOrderNumber, orderDetail.getOrderNumber())
+ .groupBy(FlowCard::getOrderId,FlowCard::getOrderNumber));
FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(),orderDetail.getOrderNumber());
- if(finishedGoodsInventory!=null){
- finishedOperateLogMapper.updateOrderFinishedOperateLog(orderDetail,userName,oddNumber);
- //淇敼搴撳瓨琛ㄥ叆搴撴暟閲�
+
+
+ // 璁＄畻鍓╀綑鏁伴噺
+ long quantity;
+ if (flowCard != null) {
+ quantity = flowCard.getQuantity() - flowCard.getReceivedQuantity();
+ } else {
+ quantity = orderDetail.getQuantity() - orderDetail.getWarehouseNum();
+ }
+
+ if (quantity <= 0) continue ;
+
+ int calculateType=order.getCalculateType();
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 0.0;
+
+ BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getQuantity= BigDecimal.valueOf(quantity);
+ 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();
+ }
+ }
+
+ // 鏇存柊璁㈠崟鏄庣粏
+ orderDetail.setQuantity(quantity);
+ orderDetail.setGrossAmount(deliveryDetailMoney);
+ orderDetail.setComputeGrossArea(deliveryDetailArea);
+
+ // 鏇存柊搴撳瓨
+ if (finishedGoodsInventory != null) {
finishedGoodsInventoryMapper.updateOrderInventory(orderDetail);
- }else{
+ } else {
finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
}
- finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail,userName,oddNumber);
- finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getQuantity());
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ String processId = flowCard != null ? flowCard.getProcessId() : "";
+ finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail, userName, oddNumber, processId);
+ finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getQuantity());
+
+ // 鏇存柊娴佺▼鍗�
+ if (flowCard != null) {
+ flowCard.setInventoryQuantity((int) quantity);
+ Order order1 = new Order();
+ order1.setOrderId(flowCard.getOrderId());
+ flowCard.setOrder(order1);
+ finishedGoodsInventoryMapper.updateflowcard(flowCard);
+ }
+
}
finishedGoodsInventoryMapper.updateOrderWarehousingState(orderId,2);
}
@@ -1023,15 +1127,74 @@
.eq(FinishedGoodsInventory::getOrderNumber, finishedOperateLog.getOperationNumber())
.eq(FinishedGoodsInventory::getBoxNo, finishedOperateLog.getRemarks())
);
- if(delivery!=null){
+ /*if(delivery!=null){
return "false1";
- }
- if(existFinishedGoodsInventory.getQuantityAvailable()<finishedOperateLog.getQuantity()){
+ }*/
+ if(existFinishedGoodsInventory.getQuantityAvailable()<finishedOperateLog.getCancelAvailable()){
return "false2";
}
-
//淇敼璁板綍琛�
- finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"宸蹭綔搴�");
+ if(existFinishedGoodsInventory.getQuantityAvailable()>finishedOperateLog.getCancelAvailable()
+ && finishedOperateLog.getQuantity()>finishedOperateLog.getCancelAvailable()){
+
+ Order order=orderMapper.selectOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId,finishedOperateLog.getOrderId()));
+ OrderDetail orderDetail=orderDetailMapper.selectOne(new LambdaQueryWrapper<OrderDetail>()
+ .eq(OrderDetail::getOrderId,finishedOperateLog.getOrderId())
+ .eq(OrderDetail::getOrderNumber,finishedOperateLog.getOperationNumber())
+ );
+ if(order != null && orderDetail != null){
+ Integer calculateType=order.getCalculateType();
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 0.0;
+
+ BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getQuantity= BigDecimal.valueOf(finishedOperateLog.getCancelAvailable());
+ 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();
+ }
+ }
+
+ finishedOperateLogMapper.updateFinishedOperateLogQuantity(finishedOperateLog,deliveryDetailMoney,deliveryDetailArea);
+ }else{
+ return "false3";
+ }
+
+
+
+ }else{
+ finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"宸蹭綔搴�");
+ }
//淇敼搴撳瓨琛ㄥ叆搴撴暟閲�
finishedGoodsInventoryMapper.updateInventoryOut(finishedOperateLog);
if(finishedOperateLog.getProcessId()!=null){
@@ -1040,12 +1203,10 @@
}
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
- finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
- //鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍏ュ簱
- if (Objects.equals(ordersum, ordernumbersum)) {
- //淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
- finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),1);
- }
+ finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getCancelAvailable());
+
+ //淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
+ finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),1);
if (ordernumbersum-finishedOperateLog.getQuantity()==0) {
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),0);
@@ -1272,4 +1433,34 @@
map.put("data", list);
return map;
}
+
+
+ public Map<String, Object> appFinishedGoodsInventoryList() {
+ Map<String, Object> map = new HashMap<>();
+ Map<String, Object> totalSum = new HashMap<>();
+ Integer inventory = 0;
+ Integer quantityAvailable = 0;
+ Double area = 0.00;
+ Double computeGrossArea = 0.00;
+
+ List<FinishedGoodsInventory> finishedGoodsInventoryList=finishedGoodsInventoryMapper.getFinishedGoodsInventoryList();
+ if(!finishedGoodsInventoryList.isEmpty()){
+ for(FinishedGoodsInventory finishedGoodsInventory:finishedGoodsInventoryList){
+ inventory += finishedGoodsInventory.getInventory();
+ quantityAvailable += finishedGoodsInventory.getQuantityAvailable();
+ area += finishedGoodsInventory.getArea();
+ computeGrossArea+=finishedGoodsInventory.getComputeGrossArea();
+ }
+ DecimalFormat df = new DecimalFormat("#.00");
+ totalSum.put("inventory",inventory);
+ totalSum.put("quantityAvailable",quantityAvailable);
+ totalSum.put("area", df.format(area));
+ totalSum.put("computeGrossArea", df.format(computeGrossArea));
+
+ map.put("data", finishedGoodsInventoryList);
+ map.put("total", totalSum);
+ }
+
+ return map;
+ }
}
--
Gitblit v1.8.0