From 5232d8b5939cb832c3d17c2aa1d6eaf66e5acb74 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 25 十二月 2025 14:11:05 +0800
Subject: [PATCH] 出入库历史 +月结管理 按钮权限+sql
---
src/main/java/com/zy/asrs/service/impl/MonthlySettleServiceImpl.java | 252 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 229 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MonthlySettleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MonthlySettleServiceImpl.java
index 4dd63c1..f615603 100644
--- a/src/main/java/com/zy/asrs/service/impl/MonthlySettleServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MonthlySettleServiceImpl.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.MonthlySettle;
import com.zy.asrs.entity.MonthlySettleDetail;
+import com.zy.asrs.entity.result.MaterialInOutRawDTO;
import com.zy.asrs.entity.result.MaterialInOutStatDTO;
import com.zy.asrs.entity.result.MonthlySettleResultVO;
import com.zy.asrs.entity.result.MonthlySettleStatisticsVO;
@@ -90,12 +92,21 @@
cal.set(Calendar.MILLISECOND, 999);
endDate = cal.getTime();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ // 娉ㄦ剰锛歰rder_time 鏄� varchar 绫诲瀷锛岄渶瑕佹牸寮忓寲涓哄畬鏁寸殑鏃ユ湡鏃堕棿瀛楃涓茶繘琛屾瘮杈�
SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String startDateStr = dateFormat.format(startDate);
+ // 璧峰鏃ユ湡璁剧疆涓哄綋澶╃殑 00:00:00
+ Calendar startCal = Calendar.getInstance();
+ startCal.setTime(startDate);
+ startCal.set(Calendar.HOUR_OF_DAY, 0);
+ startCal.set(Calendar.MINUTE, 0);
+ startCal.set(Calendar.SECOND, 0);
+ startCal.set(Calendar.MILLISECOND, 0);
+ String startDateStr = dateTimeFormat.format(startCal.getTime());
String endDateStr = dateTimeFormat.format(endDate);
- int count = this.baseMapper.countUnfinishedOrdersInRange(startDateStr, endDateStr);
- return count > 0;
+ // 鍒嗕袱娆℃煡璇細鍏ュ簱鍜屽嚭搴�
+ int pakinCount = this.baseMapper.countUnfinishedOrdersInRangePakin(startDateStr, endDateStr);
+ int pakoutCount = this.baseMapper.countUnfinishedOrdersInRangePakout(startDateStr, endDateStr);
+ return (pakinCount + pakoutCount) > 0;
}
@Override
@@ -139,21 +150,91 @@
throw new CoolException("鏈堢粨鏃堕棿鑼冨洿鍐呭瓨鍦ㄦ湭瀹屾垚鐨勮鍗曪紝鏃犳硶杩涜鏈堢粨");
}
- // 缁熻鐗╂枡鍑哄叆搴撴暟閲忥紙鍚堝苟鍏ュ簱鍜屽嚭搴擄級
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ // 缁熻鐗╂枡鍑哄叆搴撴暟閲忥紙鍒嗗埆鏌ヨ涓や釜琛紝鍦↗ava浠ｇ爜涓悎骞讹級
+ // 娉ㄦ剰锛歰rder_time 鏄� varchar 绫诲瀷锛岄渶瑕佹牸寮忓寲涓哄畬鏁寸殑鏃ユ湡鏃堕棿瀛楃涓茶繘琛屾瘮杈�
SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String startDateStr = dateFormat.format(startDate);
+ // 璧峰鏃ユ湡璁剧疆涓哄綋澶╃殑 00:00:00
+ Calendar startCal = Calendar.getInstance();
+ startCal.setTime(startDate);
+ startCal.set(Calendar.HOUR_OF_DAY, 0);
+ startCal.set(Calendar.MINUTE, 0);
+ startCal.set(Calendar.SECOND, 0);
+ startCal.set(Calendar.MILLISECOND, 0);
+ String startDateStr = dateTimeFormat.format(startCal.getTime());
String endDateStr = dateTimeFormat.format(endDate);
- List<MaterialInOutStatDTO> materialStats = this.baseMapper.statisticsMaterialInOut(startDateStr, endDateStr);
+
+ // 鍒嗗埆鏌ヨ鍏ュ簱琛ㄥ拰鍑哄簱琛�
+ List<MaterialInOutRawDTO> pakinDataList = this.baseMapper.statisticsMaterialInOutFromPakin(startDateStr, endDateStr);
+ List<MaterialInOutRawDTO> pakoutDataList = this.baseMapper.statisticsMaterialInOutFromPakout(startDateStr, endDateStr);
+
+ // 鍚堝苟涓や釜琛ㄧ殑鏁版嵁
+ List<MaterialInOutRawDTO> rawDataList = new java.util.ArrayList<>();
+ if (pakinDataList != null && !pakinDataList.isEmpty()) {
+ rawDataList.addAll(pakinDataList);
+ }
+ if (pakoutDataList != null && !pakoutDataList.isEmpty()) {
+ rawDataList.addAll(pakoutDataList);
+ }
// 妫�鏌ユ槸鍚︽湁鍑哄叆搴撳巻鍙茶鍗�
- if (materialStats == null || materialStats.isEmpty()) {
+ if (rawDataList == null || rawDataList.isEmpty()) {
throw new CoolException("鏈堢粨鏃堕棿鑼冨洿鍐呮病鏈夊嚭鍏ュ簱鍘嗗彶璁㈠崟锛屾棤娉曡繘琛屾湀缁�");
}
+
+ // 鍦↗ava浠ｇ爜涓鐞嗗垎绫荤粺璁￠�昏緫
+ // 1. 澶勭悊NULL鍊硷紙batch銆乥rand銆乵aktx锛�
+ // 2. 鏍规嵁鐗╂枡缂栫爜銆佹壒娆°�佸搧鐗屽垎缁�
+ // 3. 鏍规嵁 pakin_pakout_status 鍖哄垎鍏ュ簱鍜屽嚭搴�
+ Map<String, MaterialInOutStatDTO> materialStatsMap = new HashMap<>();
+ Map<String, String> maktxMap = new HashMap<>(); // 瀛樺偍鐗╂枡鍚嶇О锛堝彇绗竴涓潪绌哄�硷級
+
+ for (MaterialInOutRawDTO raw : rawDataList) {
+ // 澶勭悊NULL鍊�
+ String matnr = raw.getMatnr();
+ String batch = raw.getBatch() != null ? raw.getBatch() : "";
+ String brand = raw.getBrand() != null ? raw.getBrand() : "";
+ String maktx = raw.getMaktx() != null ? raw.getMaktx() : "";
+ String key = matnr + "_" + batch + "_" + brand;
+
+ // 淇濆瓨鐗╂枡鍚嶇О锛堝彇绗竴涓潪绌哄�硷級
+ if (maktx != null && !maktx.isEmpty() && !maktxMap.containsKey(key)) {
+ maktxMap.put(key, maktx);
+ }
+
+ MaterialInOutStatDTO stat = materialStatsMap.get(key);
+ if (stat == null) {
+ stat = new MaterialInOutStatDTO();
+ stat.setMatnr(matnr);
+ stat.setMaktx(maktxMap.getOrDefault(key, ""));
+ stat.setBatch(batch);
+ stat.setBrand(brand);
+ stat.setInQty(BigDecimal.ZERO);
+ stat.setOutQty(BigDecimal.ZERO);
+ materialStatsMap.put(key, stat);
+ }
+
+ // 鏍规嵁 pakin_pakout_status 鍒嗙被缁熻
+ // 1 = 鍏ュ簱锛�2 = 鍑哄簱锛�0 = 鏈煡锛堝凡鍦⊿QL涓繃婊わ級
+ BigDecimal qty = raw.getQty() != null ? raw.getQty() : BigDecimal.ZERO;
+ Integer status = raw.getPakinPakoutStatus();
+ if (status != null && qty.compareTo(BigDecimal.ZERO) > 0) {
+ if (status == 1) {
+ // 鍏ュ簱
+ stat.setInQty(stat.getInQty().add(qty));
+ } else if (status == 2) {
+ // 鍑哄簱
+ stat.setOutQty(stat.getOutQty().add(qty));
+ }
+ }
+ }
+
+ // 杞崲涓篖ist
+ List<MaterialInOutStatDTO> materialStats = new java.util.ArrayList<>(materialStatsMap.values());
- // 鑾峰彇涓婁竴涓湀缁撹褰曪紙鐢ㄤ簬璁＄畻鏈熷垵搴撳瓨锛�
- MonthlySettle previousSettle = getLatestSettle();
+ // 鑾峰彇涓婁竴涓湀缁撹褰曪紙鐢ㄤ簬璁＄畻鏈熷垵搴撳瓨鍜屾壙鎺ヤ笂涓�鏈熺殑鐗╂枡锛�
+ MonthlySettle previousSettle = getLatestSettle();
Map<String, BigDecimal> previousEndingQtyMap = new HashMap<>();
+ Map<String, PreviousSettleEndingQtyDTO> previousDetailMap = new HashMap<>(); // 瀛樺偍涓婁竴鏈熺殑瀹屾暣鏄庣粏淇℃伅
if (previousSettle != null) {
List<PreviousSettleEndingQtyDTO> previousDetails = this.baseMapper.getPreviousSettleEndingQty(previousSettle.getId());
for (PreviousSettleEndingQtyDTO detail : previousDetails) {
@@ -162,6 +243,7 @@
(detail.getBrand() != null ? detail.getBrand() : "");
BigDecimal endingQty = detail.getEndingQty() != null ? detail.getEndingQty() : BigDecimal.ZERO;
previousEndingQtyMap.put(key, endingQty);
+ previousDetailMap.put(key, detail); // 淇濆瓨瀹屾暣淇℃伅锛岀敤浜庡悗缁垱寤烘槑缁�
}
}
@@ -184,7 +266,20 @@
BigDecimal totalOutQty = BigDecimal.ZERO;
int materialCount = 0;
- // 鍒涘缓鏈堢粨鏄庣粏
+ // 鍒涘缓 Map 瀛樺偍鏈湡鏈夊嚭鍏ュ簱鐨勭墿鏂欙紙鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕佷粠涓婁竴鏈熺户鎵匡級
+ Map<String, MaterialInOutStatDTO> currentMaterialMap = new HashMap<>();
+ for (MaterialInOutStatDTO stat : materialStats) {
+ String matnr = stat.getMatnr();
+ String batch = stat.getBatch() != null ? stat.getBatch() : "";
+ String brand = stat.getBrand() != null ? stat.getBrand() : "";
+ String key = matnr + "_" + batch + "_" + brand;
+ currentMaterialMap.put(key, stat);
+ }
+
+ // 鏀堕泦鎵�鏈夋槑缁嗚褰曪紝鐢ㄤ簬鎵归噺鎻掑叆
+ List<MonthlySettleDetail> detailList = new java.util.ArrayList<>();
+
+ // 1. 澶勭悊鏈湡鏈夊嚭鍏ュ簱鐨勭墿鏂�
for (MaterialInOutStatDTO stat : materialStats) {
// 1. 鎻愬彇鍩虹淇℃伅
String matnr = stat.getMatnr();
@@ -199,21 +294,76 @@
// 3. 璁＄畻搴撳瓨鐩稿叧鏁伴噺
BigDecimal beginningQty = getBeginningQty(matnr, batch, brand, previousEndingQtyMap);
BigDecimal endingQty = calculateEndingQty(beginningQty, inQty, outQty);
- BigDecimal stockQtyDecimal = getCurrentStockQty(matnr, batch);
- BigDecimal diffQty = calculateDiffQty(stockQtyDecimal, endingQty);
+ // 宸紓鏁伴噺 = 鏈熸湯搴撳瓨 - 鏈熷垵搴撳瓨锛堟湡鏈ぇ浜庢湡鍒濇椂涓烘鏁帮級
+ BigDecimal diffQty = calculateDiffQty(beginningQty, endingQty);
- // 4. 鍒涘缓骞朵繚瀛樻槑缁嗚褰�
+ // 4. 鍒涘缓鏄庣粏璁板綍锛堟殏涓嶆彃鍏ワ級
MonthlySettleDetail detail = buildMonthlySettleDetail(
monthlySettle.getId(), settleNo, matnr, batch, maktx, brand,
- beginningQty, inQty, outQty, endingQty, stockQtyDecimal, diffQty
+ beginningQty, inQty, outQty, endingQty, diffQty
);
detail.setIsDeleted(0); // 鏈垹闄�
- monthlySettleDetailMapper.insert(detail);
+ detailList.add(detail);
// 5. 绱缁熻
totalInQty = totalInQty.add(inQty);
totalOutQty = totalOutQty.add(outQty);
materialCount++;
+ }
+
+ // 2. 澶勭悊涓婁竴鏈熷瓨鍦ㄤ絾鏈湡娌℃湁鍑哄叆搴撶殑鐗╂枡锛堥渶瑕佹壙鎺ユ樉绀猴級
+ if (previousSettle != null && !previousDetailMap.isEmpty()) {
+ for (Map.Entry<String, PreviousSettleEndingQtyDTO> entry : previousDetailMap.entrySet()) {
+ String key = entry.getKey();
+ // 濡傛灉鏈湡娌℃湁鍑哄叆搴擄紝浣嗕笂涓�鏈熸湁鏈熸湯搴撳瓨锛堜笖涓嶄负0锛夛紝鍒欓渶瑕佸垱寤轰竴鏉¤褰�
+ if (!currentMaterialMap.containsKey(key)) {
+ PreviousSettleEndingQtyDTO previousDetail = entry.getValue();
+ BigDecimal previousEndingQty = previousDetail.getEndingQty() != null ? previousDetail.getEndingQty() : BigDecimal.ZERO;
+
+ // 濡傛灉涓婁竴鏈熺殑鏈熸湯搴撳瓨涓嶄负0锛屾垨鑰呭嵆浣夸负0涔熻鏄剧ず锛堢敤浜庡姣旓級
+ // 杩欓噷鎴戜滑鎬绘槸鍒涘缓璁板綍锛屽嵆浣夸笂涓�鏈熸湡鏈簱瀛樹负0锛屽洜涓虹敤鎴疯姹�"濡傛灉涓婁竴鏈熷瓨鍦ㄨ繃锛屾湰鏈熷簱瀛樺綊闆朵篃瑕佹樉绀轰竴鏉′负0鐨勮褰�"
+ String matnr = previousDetail.getMatnr();
+ String batch = previousDetail.getBatch() != null ? previousDetail.getBatch() : "";
+ String brand = previousDetail.getBrand() != null ? previousDetail.getBrand() : "";
+ String maktx = previousDetail.getMaktx() != null ? previousDetail.getMaktx() : "";
+
+ // 鏈湡娌℃湁鍑哄叆搴擄紝鎵�浠ュ叆搴撳拰鍑哄簱鏁伴噺閮戒负0
+ BigDecimal inQty = BigDecimal.ZERO;
+ BigDecimal outQty = BigDecimal.ZERO;
+
+ // 鏈熷垵搴撳瓨 = 涓婁竴鏈熺殑鏈熸湯搴撳瓨
+ BigDecimal beginningQty = previousEndingQty;
+ // 鏈熸湯搴撳瓨 = 鏈熷垵 + 鍏ュ簱 - 鍑哄簱 = 鏈熷垵锛堝洜涓烘湰鏈熸病鏈夊嚭鍏ュ簱锛�
+ BigDecimal endingQty = beginningQty;
+ // 宸紓鏁伴噺 = 鏈熷垵搴撳瓨 - 鏈熸湯搴撳瓨锛堟湡鍒濆ぇ浜庢湡鏈椂涓烘鏁帮級
+ BigDecimal diffQty = calculateDiffQty(beginningQty, endingQty);
+
+ // 鍒涘缓鏄庣粏璁板綍锛堟殏涓嶆彃鍏ワ級
+ MonthlySettleDetail detail = buildMonthlySettleDetail(
+ monthlySettle.getId(), settleNo, matnr, batch, maktx, brand,
+ beginningQty, inQty, outQty, endingQty, diffQty
+ );
+ detail.setIsDeleted(0); // 鏈垹闄�
+ detailList.add(detail);
+
+ // 绱缁熻锛堣櫧鐒跺叆搴撳拰鍑哄簱涓�0锛屼絾涔熻璁″叆鐗╂枡绉嶇被鏁帮級
+ materialCount++;
+ }
+ }
+ }
+
+ // 鍒嗘壒鎻掑叆锛屾瘡鎵�1000鏉★紝閬垮厤涓�娆℃�ф彃鍏ヨ繃澶氭暟鎹�
+ if (!detailList.isEmpty()) {
+ int batchSize = 1000;
+ for (int i = 0; i < detailList.size(); i += batchSize) {
+ int end = Math.min(i + batchSize, detailList.size());
+ List<MonthlySettleDetail> batch = detailList.subList(i, end);
+ for (MonthlySettleDetail detail : batch) {
+ if (monthlySettleDetailMapper.insert(detail) <= 0) {
+ throw new CoolException("鎻掑叆鏈堢粨鏄庣粏澶辫触");
+ }
+ }
+ }
}
// 鏇存柊鏈堢粨涓昏褰�
@@ -311,18 +461,21 @@
}
/**
- * 鑾峰彇褰撳墠瀹為檯搴撳瓨鏁伴噺
+ * 鑾峰彇褰撳墠瀹為檯搴撳瓨鏁伴噺锛堝凡搴熷純锛屾敼鐢ㄦ壒閲忔煡璇級
+ * @deprecated 浣跨敤鎵归噺鏌ヨ鏂规硶鏇夸唬锛岄伩鍏峃+1鏌ヨ闂
*/
+ @Deprecated
private BigDecimal getCurrentStockQty(String matnr, String batch) {
Double stockQty = manLocDetlService.queryStockAnfme(matnr, batch);
return stockQty != null ? BigDecimal.valueOf(stockQty) : BigDecimal.ZERO;
}
/**
- * 璁＄畻宸紓鏁伴噺锛堝疄闄呭簱瀛�-鏈熸湯搴撳瓨锛�
+ * 璁＄畻宸紓鏁伴噺锛堟湡鏈簱瀛�-鏈熷垵搴撳瓨锛�
+ * 鏈熸湯澶т簬鏈熷垵鏃朵负姝ｆ暟锛岃〃绀哄簱瀛樺鍔�
*/
- private BigDecimal calculateDiffQty(BigDecimal stockQty, BigDecimal endingQty) {
- return stockQty.subtract(endingQty);
+ private BigDecimal calculateDiffQty(BigDecimal beginningQty, BigDecimal endingQty) {
+ return endingQty.subtract(beginningQty);
}
/**
@@ -331,7 +484,7 @@
private MonthlySettleDetail buildMonthlySettleDetail(
Long settleId, String settleNo, String matnr, String batch, String maktx, String brand,
BigDecimal beginningQty, BigDecimal inQty, BigDecimal outQty, BigDecimal endingQty,
- BigDecimal stockQty, BigDecimal diffQty) {
+ BigDecimal diffQty) {
MonthlySettleDetail detail = new MonthlySettleDetail();
// 鍩烘湰淇℃伅
detail.setSettleId(settleId);
@@ -345,7 +498,6 @@
detail.setInQty(inQty);
detail.setOutQty(outQty);
detail.setEndingQty(endingQty);
- detail.setStockQty(stockQty);
detail.setDiffQty(diffQty);
// 鏃堕棿淇℃伅
detail.setCreateTime(new Date());
@@ -381,5 +533,59 @@
settle.setUpdateTime(new Date());
this.updateById(settle);
}
+
+ @Override
+ public boolean isOrderTimeInSettledRange(String orderTime) {
+ if (Cools.isEmpty(orderTime)) {
+ return false;
+ }
+ try {
+ // 瑙ｆ瀽璁㈠崟涓氬姟鏃堕棿
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date orderDate = sdf.parse(orderTime);
+
+ // 鏌ヨ鎵�鏈夊凡鏈堢粨鐨勮褰曪紙status=1涓旀湭鍒犻櫎锛�
+ EntityWrapper<MonthlySettle> wrapper = new EntityWrapper<>();
+ wrapper.eq("status", 1);
+ wrapper.eq("is_deleted", 0);
+ List<MonthlySettle> settledList = this.selectList(wrapper);
+
+ if (settledList == null || settledList.isEmpty()) {
+ return false;
+ }
+
+ // 妫�鏌ヨ鍗曟椂闂存槸鍚﹀湪浠讳綍宸叉湀缁撶殑鍖洪棿鍐�
+ for (MonthlySettle settle : settledList) {
+ Date startDate = settle.getStartDate();
+ Date endDate = settle.getEndDate();
+
+ // 纭繚startDate鏄綋澶╃殑00:00:00
+ Calendar startCal = Calendar.getInstance();
+ startCal.setTime(startDate);
+ startCal.set(Calendar.HOUR_OF_DAY, 0);
+ startCal.set(Calendar.MINUTE, 0);
+ startCal.set(Calendar.SECOND, 0);
+ startCal.set(Calendar.MILLISECOND, 0);
+
+ // 纭繚endDate鏄綋澶╃殑23:59:59.999
+ Calendar endCal = Calendar.getInstance();
+ endCal.setTime(endDate);
+ endCal.set(Calendar.HOUR_OF_DAY, 23);
+ endCal.set(Calendar.MINUTE, 59);
+ endCal.set(Calendar.SECOND, 59);
+ endCal.set(Calendar.MILLISECOND, 999);
+
+ // 鍒ゆ柇璁㈠崟鏃堕棿鏄惁鍦ㄥ尯闂村唴锛歔startDate鐨�00:00:00, endDate鐨�23:59:59.999]
+ if (!orderDate.before(startCal.getTime()) && !orderDate.after(endCal.getTime())) {
+ return true;
+ }
+ }
+
+ return false;
+ } catch (Exception e) {
+ log.error("妫�鏌ヨ鍗曟椂闂存槸鍚﹀湪宸叉湀缁撳尯闂村唴澶辫触", e);
+ return false;
+ }
+ }
}
--
Gitblit v1.9.1