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 | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 371 insertions(+), 30 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 0384f8b..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
@@ -3,10 +3,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
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.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;
@@ -28,12 +32,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.sql.SQLException;
-import java.sql.Wrapper;
+import java.sql.SQLOutput;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.*;
-import java.util.stream.Collectors;
@Service
@DS("mm")
@@ -86,7 +90,7 @@
if (object.get("storageRegion") != null) {
storageRegion = object.get("storageRegion").toString();
}
- if (object.get("container") != null) {
+ if (object.get("container") != null) {//绠卞彿
container = object.get("container").toString();
}
@@ -101,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);
@@ -111,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) {
@@ -118,6 +129,9 @@
Integer calculateType=flowCard.getOrder().getCalculateType();
double deliveryDetailMoney = 0.0;
double deliveryDetailArea = 0.0;
+ if(flowCards.getInventoryQuantity()<=flowCard.getInventoryQuantity()){
+ flowCard.setInventoryQuantity(flowCards.getInventoryQuantity());
+ }
BigDecimal getComputeArea= BigDecimal.valueOf(flowCard.getOrderDetail().getComputeArea());
BigDecimal getQuantity= BigDecimal.valueOf(flowCard.getInventoryQuantity());
BigDecimal getPrice= BigDecimal.valueOf(flowCard.getOrderDetail().getPrice());
@@ -158,8 +172,12 @@
//娣诲姞鍑哄叆搴撹褰�
- finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea);
- Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber());
+ finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea,createTime,getComputeArea.doubleValue());
+ Integer finishedGoodsInventorycount = 0;
+ finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdContainercount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),container);
+
+ //finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber());
+
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(flowCard.getOrder().getOrderId());
Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(flowCard.getOrder().getOrderId());
FlowCard flowCard1=finishedGoodsInventoryMapper.findFlowCard(flowCard);
@@ -181,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);
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
@@ -417,7 +435,7 @@
//娣诲姞棰嗗嚭璁板綍
finishedOperateLogMapper.insertFinishedOperateLogTakeOut(orderDetail,userName,oddNumber,operateType,remarks);
//淇敼搴撳瓨鏁伴噺
- finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
+ finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()), orderDetail.getDeliveryDetail().getBoxNo());
//淇敼璁㈠崟鏄庣粏琛ㄦ暟閲�
finishedGoodsInventoryMapper.updateOutOrderNumberConut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
if (Objects.equals(oldordersum, oldordernumbersum)){
@@ -500,7 +518,7 @@
//娣诲姞棰嗗嚭璁板綍
finishedOperateLogMapper.insertFinishedOperateLogRework(orderDetail,userName,oddNumber,operateType,remarks);
//淇敼搴撳瓨鏁伴噺
- finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
+ finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()), orderDetail.getDeliveryDetail().getBoxNo());
//淇敼璁㈠崟鏄庣粏琛ㄦ暟閲�
finishedGoodsInventoryMapper.updateOutOrderNumberConut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
if (Objects.equals(oldordersum, oldordernumbersum)){
@@ -550,13 +568,13 @@
//瀹℃牳淇敼棰嗗嚭璁板綍
finishedOperateLogMapper.updateToExamine(finishedOperateLog,userName,"宸插鏍�");
//瀹℃牳淇敼搴撳瓨鏁伴噺
- finishedGoodsInventoryMapper.updateInventoryInventoryOut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()));
+ finishedGoodsInventoryMapper.updateInventoryInventoryOut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()),finishedOperateLog.getRemarks());
log.setFunction("updateFinishedGoodsInventoryToExamine瀹℃牳");
} else if (Objects.equals(type, "鍙嶅")) {
//瀹℃牳淇敼棰嗗嚭璁板綍
finishedOperateLogMapper.updateToExamine(finishedOperateLog,userName,"鏈鏍�");
//瀹℃牳淇敼搴撳瓨鏁伴噺
- finishedGoodsInventoryMapper.updateInventoryInventoryInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()));
+ finishedGoodsInventoryMapper.updateInventoryInventoryInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()), finishedOperateLog.getRemarks());
log.setFunction("updateFinishedGoodsInventoryToExamine鍙嶅");
}
@@ -793,6 +811,8 @@
alias="LC";
}else if(Objects.equals(type, "杩斿伐")){
alias="FG";
+ }else if(Objects.equals(type, "璋冩灦")){
+ alias="TJ";
}
//鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
Integer maximum=finishedOperateLogMapper.getmaximum(type);
@@ -854,7 +874,10 @@
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks()));
+ itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(
+ finishedOperateLog.getOrder().getCustomerId(),
+ finishedOperateLog.getOrder().getProject(),
+ finishedOperateLog.getRemarks()));
List<Map<String, Object>> detailList = finishedOperateLogMapper.getDetailList2(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks());
@@ -895,22 +918,53 @@
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);
- Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(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());
-
+ //鑾峰彇璁㈠崟鎬绘暟閲�
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(orderDetail.getDeliveryDetail().getOrderId());
+ //鑾峰彇搴撳瓨鎬绘暟閲�
Integer orderNumberdsum = finishedGoodsInventoryMapper.findOrderNumberdsum(orderDetail.getDeliveryDetail().getOrderId());
+ //鑾峰彇鍙戣揣鎬绘暟閲�
+ Integer orderNumberdDeliverysum = finishedGoodsInventoryMapper.findOrderDeliveryQuantitySum(orderDetail.getDeliveryDetail().getOrderId());
+ //鑾峰彇姝ゅ彂璐у崟 鍙戣揣鎬绘暟閲�
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;
}
- DeliveryDetail deliveryDetail=finishedGoodsInventoryMapper.findDeliverydetail(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getDeliveryId());
+ DeliveryDetail deliveryDetail=finishedGoodsInventoryMapper.
+ findDeliverydetail(orderDetail.getDeliveryDetail().getOrderId(),
+ orderDetail.getDeliveryDetail().getOrderNumber(),
+ orderDetail.getDeliveryDetail().getDeliveryId(),
+ orderDetail.getDeliveryDetail().getBoxNo()
+
+ );
/*System.out.println("璁㈠崟鎬绘暟:" + ordersum + "璁㈠崟搴撳瓨鏁帮細" + orderNumberdsum + "鍑嗗鍑哄簱鏁伴噺" +
orderDetail.getWarehouseNum()+ "鍙戣揣鏁伴噺" + orderDetail.getDeliveryDetail().getQuantity()+ "鍙戣揣鎬绘暟" +
deliverysum+ "宸插彂鏁伴噺" + deliverydetailsum);*/
@@ -920,9 +974,9 @@
if(deliveryDetail==null){
if(orderDetailNew.getWarehouseNum()>=orderDetail.getDeliveryDetail().getQuantity()){
//淇敼搴撳瓨琛ㄥ簱瀛樻暟閲�
- finishedGoodsInventoryMapper.updateInventoryInventoryOut(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getQuantity());
+ finishedGoodsInventoryMapper.updateInventoryInventoryOut(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getQuantity(),orderDetail.getDeliveryDetail().getBoxNo());
//淇敼鍙戣揣鏄庣粏琛ㄧ姸鎬�
- finishedGoodsInventoryMapper.updateDeliveryDetailState(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getDeliveryId(),0);
+ finishedGoodsInventoryMapper.updateDeliveryDetailState(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getDeliveryId(),0, orderDetail.getDeliveryDetail().getBoxNo());
//淇敼鍙戣揣琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDeliveryState(orderDetail.getDeliveryDetail().getDeliveryId(),1);
//淇敼璁㈠崟鏄庣粏琛ㄥ彂璐ф暟閲�
@@ -930,10 +984,11 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (Objects.equals(orderNumberdsum, orderDetail.getWarehouseNum())) {
+ 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()) {
//淇敼鍙戣揣琛ㄧ姸鎬�
@@ -966,9 +1021,80 @@
if(Objects.equals(finishedOperateLog.getOperateType(), "鍏ュ簱")){
Delivery delivery = finishedGoodsInventoryMapper.findOrderDelivery(finishedOperateLog.getOrderId());
- if(delivery==null){
+ FinishedGoodsInventory existFinishedGoodsInventory = finishedGoodsInventoryMapper.
+ selectOne(new LambdaQueryWrapper<FinishedGoodsInventory>()
+ .eq(FinishedGoodsInventory::getOrderId, finishedOperateLog.getOrderId())
+ .eq(FinishedGoodsInventory::getOrderNumber, finishedOperateLog.getOperationNumber())
+ .eq(FinishedGoodsInventory::getBoxNo, finishedOperateLog.getRemarks())
+ );
+ /*if(delivery!=null){
+ return "false1";
+ }*/
+ 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){
@@ -977,7 +1103,7 @@
}
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
- finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
+ finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getCancelAvailable());
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍏ュ簱
if (Objects.equals(ordersum, ordernumbersum)) {
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
@@ -988,9 +1114,7 @@
finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),0);
}
log.setFunction("cancelFinishedGoodsInventoryStorage鍏ュ簱");
- }else{
- return "false1";
- }
+
@@ -998,9 +1122,33 @@
//淇敼璁板綍琛�
finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"宸蹭綔搴�");
//淇敼搴撳瓨琛ㄥ簱瀛樻暟閲�
- finishedGoodsInventoryMapper.updateInventoryInventoryInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
+ finishedGoodsInventoryMapper.updateInventoryInventoryInt(
+ finishedOperateLog.getOrderId(),
+ finishedOperateLog.getOperationNumber(),
+ 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(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getOperationOrderNumber(),1);
+ finishedGoodsInventoryMapper.updateDeliveryDetailState(
+ finishedOperateLog.getOrderId(),
+ finishedOperateLog.getOperationNumber(),
+ finishedOperateLog.getOperationOrderNumber(),
+ 1,
+ finishedOperateLog.getRemarks());
//淇敼鍙戣揣琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOperationOrderNumber(),1);
//淇敼璁㈠崟鏄庣粏琛ㄥ簱鍐呮暟閲�
@@ -1008,7 +1156,7 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (ordersum==finishedOperateLog.getQuantity()+ordernumbersum){
+ if (orderDetail1.getOutStockNum()==0){
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),0);
@@ -1024,4 +1172,197 @@
}
return "true";
}
+
+ public Map<String,Object> changeRack(FinishedGoodsInventory finishedGoodsInventory, String user) {
+ Long id = finishedGoodsInventory.getId();
+ Map<String,Object> map = new HashMap<>();
+ FinishedGoodsInventory oldFinishedGoodsInventory = finishedGoodsInventoryMapper.selectById(finishedGoodsInventory.getId());
+
+ //鏌ヨ姝ゆ搴忓彿绠卞彿鐨勫簱瀛樻槸鍚﹀瓨鍦�
+ FinishedGoodsInventory existFinishedGoodsInventory = finishedGoodsInventoryMapper
+ .selectOne(new LambdaQueryWrapper<FinishedGoodsInventory>()
+ .eq(FinishedGoodsInventory::getOrderId, finishedGoodsInventory.getOrderId())
+ .eq(FinishedGoodsInventory::getOrderNumber, finishedGoodsInventory.getOrderNumber())
+ .eq(FinishedGoodsInventory::getBoxNo, finishedGoodsInventory.getBoxNo())
+ .last("limit 1")
+ );
+ String operationOrderNumber = orderNumberSetting("璋冩灦");
+ FinishedOperateLog finishedOperateLog = new FinishedOperateLog();
+ finishedOperateLog.setOperationOrderNumber(operationOrderNumber);
+ finishedOperateLog.setOrderId(oldFinishedGoodsInventory.getOrderId());
+ finishedOperateLog.setOperationNumber(oldFinishedGoodsInventory.getOrderNumber());
+ finishedOperateLog.setProcessId(oldFinishedGoodsInventory.getProcessId());
+ finishedOperateLog.setOperateType("璋冩灦");
+ finishedOperateLog.setOperator(user);
+ //褰撴垚鍝佺鍙蜂笉瀛樺湪锛屽垯鏂板
+ if(existFinishedGoodsInventory==null){
+ //褰撹浆绉绘暟閲忓ぇ浜庡疄闄呭簱瀛樼鍙锋椂锛屽垯涓嶈兘杞Щ
+ if(oldFinishedGoodsInventory.getQuantityAvailable()<finishedGoodsInventory.getQuantityAvailable()){
+ map.put("code",0);
+ return map;
+ }
+ //鍘熷簱瀛� 鏁伴噺闈㈢Н鍑忓皯
+ 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>()
+ .eq(FinishedGoodsInventory::getId,id)
+ ) ;
+ finishedGoodsInventoryMapper.insert(finishedGoodsInventory);
+
+
+ //寰�鎿嶄綔鏃ュ織琛ㄦ坊鍔犳暟鎹�
+ finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
+ finishedOperateLog.setArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getComputeArea());
+ finishedOperateLog.setComputeArea(finishedGoodsInventory.getComputeArea());
+ finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+finishedGoodsInventory.getBoxNo());
+ finishedOperateLogMapper.insert(finishedOperateLog);
+
+ map.put("code",1);
+ return map;//搴撳瓨杞Щ鎴愬姛锛屾柊澧炵鍙�
+
+ }else{
+ //褰搃d涓嶅彉鏃讹紝淇敼澶囨敞
+ if(Objects.equals(id, existFinishedGoodsInventory.getId())){
+ finishedGoodsInventoryMapper.
+ update(null,new LambdaUpdateWrapper<FinishedGoodsInventory>()
+ .eq(FinishedGoodsInventory::getId,id)
+ .set(FinishedGoodsInventory::getRemark,finishedGoodsInventory.getRemark()));
+ map.put("code",2);
+ return map;//搴撳瓨澶囨敞淇敼鎴愬姛
+ }else{
+ //鍘熷簱瀛� 鏁伴噺闈㈢Н鍑忓皯
+ 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,
+ new LambdaUpdateWrapper<FinishedGoodsInventory>()
+ .eq(FinishedGoodsInventory::getId,id)
+ ) ;
+ finishedGoodsInventoryMapper.
+ update(existFinishedGoodsInventory,
+ new LambdaUpdateWrapper<FinishedGoodsInventory>()
+ .eq(FinishedGoodsInventory::getId,existFinishedGoodsInventory.getId())
+ ) ;
+
+ //寰�鎿嶄綔鏃ュ織琛ㄦ坊鍔犳暟鎹�
+ finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
+ finishedOperateLog.setComputeArea(existFinishedGoodsInventory.getComputeArea());
+ finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+existFinishedGoodsInventory.getBoxNo());
+ finishedOperateLogMapper.insert(finishedOperateLog);
+
+ map.put("code",3);
+ List<String> list = new ArrayList<>();
+ list.add(oldFinishedGoodsInventory.getBoxNo());
+ list.add(existFinishedGoodsInventory.getBoxNo());
+ map.put("msg",list);
+ return map;//搴撳瓨杞Щ鎴愬姛锛屼慨鏀圭鍙�
+ }
+ }
+ }
+
+ public Map<String, Object> getInventoryPrints(List<FinishedGoodsInventory> finishedGoodsInventories) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ if (!finishedGoodsInventories.isEmpty()) {
+ Set<String> processedProcessIds = new HashSet<>();
+ for (FinishedGoodsInventory finishedGoodsInventory : finishedGoodsInventories) {
+ String orderId = finishedGoodsInventory.getOrderId();
+ String boxNo = finishedGoodsInventory.getBoxNo();
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� OrderId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(orderId) && processedProcessIds.contains(boxNo)) {
+ continue;
+ }
+
+ Map<String, Object> itemmap = new HashMap<>();
+ List<Map<String, String>> detail = finishedGoodsInventoryMapper.getPrintTitleByBox(
+ finishedGoodsInventory.getOrder().getCustomerId(),
+ finishedGoodsInventory.getOrder().getProject(),
+ boxNo,
+ orderId
+ );
+
+ itemmap.put("detail",detail);
+ //鑾峰彇搴撳瓨閲岄潰姝よ鍗曟绠卞彿鐨勬墍鏈変骇鍝佷俊鎭�
+ List<Map<String, Object>> detailList = finishedGoodsInventoryMapper
+ .getorderProductByBoxNo(orderId,boxNo);
+
+ List<Map<String, Object>> detailsmaplist = new ArrayList<Map<String, Object>>();
+
+ for(Map<String, Object> details:detailList){
+ Map<String, Object> detailsmap = new HashMap<>();
+ detailsmap.put("product_name",details.get("product_name").toString());
+ //鑾峰彇鏄庣粏鏁版嵁
+ List<Map<String, Object>> orderDetailList = finishedGoodsInventoryMapper
+ .getPrintDetail(
+ orderId,
+ boxNo,
+ Integer.valueOf(details.get("product_id").toString()),
+ details.get("thickness").toString()
+ );
+
+ detailsmap.put("detailList",orderDetailList);
+ detailsmaplist.add(detailsmap);
+
+ }
+ itemmap.put("detailList", detailsmaplist);
+ list.add(itemmap);
+
+
+ processedProcessIds.add(orderId);
+ processedProcessIds.add(boxNo);
+ }
+ }
+ 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