From 71a4444510d9067654705f0c5803d5f12a21a092 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 11 十一月 2025 09:17:34 +0800
Subject: [PATCH] 添加流程卡进度接口信息
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 185 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 161 insertions(+), 24 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 a6ac03e..77d5dff 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
@@ -6,9 +6,11 @@
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.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;
@@ -30,8 +32,11 @@
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;
import java.util.*;
@Service
@@ -100,6 +105,11 @@
if (object.get("decValue") != null) {
decValue = Integer.parseInt(object.get("decValue").toString());
}
+ String createTime = null;
+ if(object.get("createTime")!=null){
+ createTime = object.get("createTime").toString();
+ }
+
Log log = new Log();
log.setOperator(userName);
log.setOperatorId(userId);
@@ -110,6 +120,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) {
@@ -160,7 +172,7 @@
//娣诲姞鍑哄叆搴撹褰�
- finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea);
+ finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea,createTime,getComputeArea.doubleValue());
Integer finishedGoodsInventorycount = 0;
finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdContainercount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),container);
@@ -187,7 +199,7 @@
finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),2);
}
} else {
- if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark,container)) {
+ if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark,container,getComputeArea.doubleValue())) {
//淇敼娴佺▼鍗¤〃鍏ュ簱鏁伴噺
finishedGoodsInventoryMapper.updateflowcard(flowCard);
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
@@ -906,10 +918,20 @@
for (OrderDetail orderDetail : list) {
//鑾峰彇鍗曞彿
String oddNumber= orderNumberSetting("鍑哄簱");
- OrderDetail orderDetailNew= finishedGoodsInventoryMapper.findOrderDetailNumberd(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber());
+ OrderDetail orderDetailNew= finishedGoodsInventoryMapper.
+ findOrderDetailNumberd(
+ orderDetail.getDeliveryDetail().getOrderId(),
+ orderDetail.getDeliveryDetail().getOrderNumber());
+
+
//娣诲姞鍑哄叆搴撹褰�
finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber,orderDetail.getDeliveryDetail().getBoxNo());
-
+ orderDetailMapper.update(null,
+ new UpdateWrapper<OrderDetail>()
+ .setSql("out_stock_num = ifnull(out_stock_num,0)+"+orderDetail.getDeliveryDetail().getQuantity())
+ .eq("order_id",orderDetail.getDeliveryDetail().getOrderId())
+ .eq("order_number",orderDetail.getDeliveryDetail().getOrderNumber())
+ );
//鍒ゆ柇鍙戣揣鍗曠殑搴撳瓨鏄惁瀛樺湪
Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getBoxNo());
@@ -924,6 +946,14 @@
Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());
//鑾峰彇宸茬粡鍑哄簱鐨勬暟閲�
Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);
+ //鑾峰彇璁㈠崟宸茬粡鍑哄簱鐨勬暟閲�
+ OrderDetail orderDetail1 = orderDetailMapper.
+ selectOne(new QueryWrapper<OrderDetail>()
+ .select("ifnull(sum(out_stock_num),0) as out_stock_num")
+ .eq("order_id",orderDetail.getDeliveryDetail().getOrderId())
+ );
+
+
if(deliverydetailsum==null){
deliverydetailsum=0;
}
@@ -954,10 +984,11 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (orderNumberdsum==orderNumberdDeliverysum) {
+ if (Objects.equals(ordersum, orderDetail1.getOutStockNum())) {
//if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
- finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
+ finishedGoodsInventoryMapper.
+ updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
}
if (deliverysum==deliverydetailsum+orderDetail.getDeliveryDetail().getQuantity()) {
//淇敼鍙戣揣琛ㄧ姸鎬�
@@ -996,15 +1027,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){
@@ -1013,7 +1103,7 @@
}
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
- finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
+ finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getCancelAvailable());
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍏ュ簱
if (Objects.equals(ordersum, ordernumbersum)) {
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
@@ -1038,6 +1128,20 @@
finishedOperateLog.getQuantity(),
finishedOperateLog.getRemarks()
);
+ //淇敼璁㈠崟鏄庣粏 鍑哄簱鏁伴噺
+ orderDetailMapper.update(null,
+ new LambdaUpdateWrapper<OrderDetail>().
+ setSql("out_stock_num = ifnull(out_stock_num,0)-"+finishedOperateLog.getQuantity())
+ .eq(OrderDetail::getOrderId, finishedOperateLog.getOrderId())
+ .eq(OrderDetail::getOrderNumber, finishedOperateLog.getOperationNumber())
+ );
+
+ OrderDetail orderDetail1 = orderDetailMapper.
+ selectOne(new QueryWrapper<OrderDetail>()
+ .select("ifnull(sum(out_stock_num),0) as out_stock_num")
+ .eq("order_id",finishedOperateLog.getOrderId())
+ );
+
//淇敼鍙戣揣鏄庣粏琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDetailState(
finishedOperateLog.getOrderId(),
@@ -1052,7 +1156,7 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (ordersum==finishedOperateLog.getQuantity()+ordernumbersum){
+ if (orderDetail1.getOutStockNum()==0){
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),0);
@@ -1101,12 +1205,14 @@
oldFinishedGoodsInventory.setInventory(oldFinishedGoodsInventory.getInventory()-finishedGoodsInventory.getQuantityAvailable());
oldFinishedGoodsInventory.setQuantityAvailable(oldFinishedGoodsInventory.getQuantityAvailable()-finishedGoodsInventory.getQuantityAvailable());
oldFinishedGoodsInventory.setArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getActualSignalArea());
+ oldFinishedGoodsInventory.setComputeGrossArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getComputeArea());
//鏂板簱瀛樻暟鎹鍔�
finishedGoodsInventory.setId(null);
finishedGoodsInventory.setInventory(finishedGoodsInventory.getQuantityAvailable());
finishedGoodsInventory.setArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getActualSignalArea());
-
+ finishedGoodsInventory.setComputeGrossArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getComputeArea());
+ finishedGoodsInventory.setEnterStorageTime(null);
finishedGoodsInventoryMapper.
update(oldFinishedGoodsInventory,
new LambdaUpdateWrapper<FinishedGoodsInventory>()
@@ -1117,6 +1223,8 @@
//寰�鎿嶄綔鏃ュ織琛ㄦ坊鍔犳暟鎹�
finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
+ finishedOperateLog.setArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getComputeArea());
+ finishedOperateLog.setComputeArea(finishedGoodsInventory.getComputeArea());
finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+finishedGoodsInventory.getBoxNo());
finishedOperateLogMapper.insert(finishedOperateLog);
@@ -1137,10 +1245,12 @@
oldFinishedGoodsInventory.setInventory(oldFinishedGoodsInventory.getInventory()-finishedGoodsInventory.getQuantityAvailable());
oldFinishedGoodsInventory.setQuantityAvailable(oldFinishedGoodsInventory.getQuantityAvailable()-finishedGoodsInventory.getQuantityAvailable());
oldFinishedGoodsInventory.setArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getActualSignalArea());
+ oldFinishedGoodsInventory.setComputeGrossArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getComputeArea());
existFinishedGoodsInventory.setInventory(existFinishedGoodsInventory.getInventory()+finishedGoodsInventory.getQuantityAvailable());
existFinishedGoodsInventory.setQuantityAvailable(existFinishedGoodsInventory.getQuantityAvailable()+finishedGoodsInventory.getQuantityAvailable());
existFinishedGoodsInventory.setArea(existFinishedGoodsInventory.getInventory()*existFinishedGoodsInventory.getActualSignalArea());
+ existFinishedGoodsInventory.setComputeGrossArea(existFinishedGoodsInventory.getInventory()*existFinishedGoodsInventory.getComputeArea());
finishedGoodsInventoryMapper.
update(oldFinishedGoodsInventory,
@@ -1155,6 +1265,7 @@
//寰�鎿嶄綔鏃ュ織琛ㄦ坊鍔犳暟鎹�
finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
+ finishedOperateLog.setComputeArea(existFinishedGoodsInventory.getComputeArea());
finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+existFinishedGoodsInventory.getBoxNo());
finishedOperateLogMapper.insert(finishedOperateLog);
@@ -1183,11 +1294,14 @@
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("detail",finishedGoodsInventoryMapper.getPrintTitleByBox(
+ List<Map<String, String>> detail = finishedGoodsInventoryMapper.getPrintTitleByBox(
finishedGoodsInventory.getOrder().getCustomerId(),
finishedGoodsInventory.getOrder().getProject(),
- boxNo
- ) );
+ boxNo,
+ orderId
+ );
+
+ itemmap.put("detail",detail);
//鑾峰彇搴撳瓨閲岄潰姝よ鍗曟绠卞彿鐨勬墍鏈変骇鍝佷俊鎭�
List<Map<String, Object>> detailList = finishedGoodsInventoryMapper
.getorderProductByBoxNo(orderId,boxNo);
@@ -1197,13 +1311,6 @@
for(Map<String, Object> details:detailList){
Map<String, Object> detailsmap = new HashMap<>();
detailsmap.put("product_name",details.get("product_name").toString());
- /*finishedOperateLogMapper
- .getDetailLists(
- finishedOperateLog.getOrderId(),
- finishedOperateLog.getRemarks(),
- Integer.valueOf(details.get("product_id").toString()),
- details.get("thickness").toString()
- );*/
//鑾峰彇鏄庣粏鏁版嵁
List<Map<String, Object>> orderDetailList = finishedGoodsInventoryMapper
.getPrintDetail(
@@ -1228,4 +1335,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