From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +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/mm/FinishedGoodsInventoryService.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 156 insertions(+), 14 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 ab2fa8d..3074266 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,6 +6,7 @@
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;
@@ -30,8 +31,10 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.*;
@Service
@@ -100,6 +103,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 +118,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 +170,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 +197,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);
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
@@ -799,6 +809,8 @@
alias="LC";
}else if(Objects.equals(type, "杩斿伐")){
alias="FG";
+ }else if(Objects.equals(type, "璋冩灦")){
+ alias="TJ";
}
//鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
Integer maximum=finishedOperateLogMapper.getmaximum(type);
@@ -860,7 +872,10 @@
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrder().getCustomerName(),finishedOperateLog.getOrder().getProject(),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());
@@ -901,10 +916,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());
@@ -919,6 +944,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;
}
@@ -949,10 +982,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()) {
//淇敼鍙戣揣琛ㄧ姸鎬�
@@ -985,7 +1019,19 @@
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.getQuantity()){
+ return "false2";
+ }
+
//淇敼璁板綍琛�
finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"宸蹭綔搴�");
//淇敼搴撳瓨琛ㄥ叆搴撴暟閲�
@@ -1007,9 +1053,7 @@
finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),0);
}
log.setFunction("cancelFinishedGoodsInventoryStorage鍏ュ簱");
- }else{
- return "false1";
- }
+
@@ -1023,6 +1067,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(),
@@ -1037,7 +1095,7 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (ordersum==finishedOperateLog.getQuantity()+ordernumbersum){
+ if (orderDetail1.getOutStockNum()==0){
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),0);
@@ -1054,7 +1112,7 @@
return "true";
}
- public Map<String,Object> changeRack(FinishedGoodsInventory finishedGoodsInventory) {
+ 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());
@@ -1067,6 +1125,14 @@
.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){
//褰撹浆绉绘暟閲忓ぇ浜庡疄闄呭簱瀛樼鍙锋椂锛屽垯涓嶈兘杞Щ
@@ -1078,18 +1144,29 @@
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;//搴撳瓨杞Щ鎴愬姛锛屾柊澧炵鍙�
@@ -1107,10 +1184,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,
@@ -1123,6 +1202,12 @@
.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());
@@ -1132,4 +1217,61 @@
}
}
}
+
+ 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;
+ }
}
--
Gitblit v1.8.0