From f8193b239dac7276cb9203af51ad9b424fa5e90d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 28 二月 2026 15:17:25 +0800
Subject: [PATCH] 发货时间限制
---
src/main/java/com/zy/asrs/controller/PlaController.java | 141 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 136 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 441dba3..55473bc 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -14,12 +14,17 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.mapper.ManPakOutMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.PlaExcelListener;
import com.zy.asrs.utils.SaasUtils;
import com.zy.common.CodeRes;
import com.zy.common.entity.PlaExcel;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
+import com.zy.system.entity.OperateLog;
+import com.zy.system.service.OperateLogService;
+import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -28,10 +33,14 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@Slf4j
@@ -54,6 +63,34 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Resource
+ private OperateLogService operateLogService;
+ @Autowired
+ private ConfigServiceImpl configService;
+
+ // 鑾峰彇涓嬫媺閫夋嫨妗嗗�煎垪琛�
+ @GetMapping(value = "/pla/dropdownValues/list")
+ @ManagerAuth
+ public R list() {
+ List<DropdownValuesDto> list = plaService.getDropdownValues();
+ Map<String, List<String>> map = new HashMap<>();
+
+ // owner 鍘婚噸骞跺姞鍏� map
+ List<String> owners = list.stream()
+ .filter(dropdownValuesDto -> dropdownValuesDto.getType().equals("owner"))
+ .map(DropdownValuesDto::getValue)
+ .collect(Collectors.toList());
+ map.put("owner", owners);
+
+ // workshop 鍘婚噸骞跺姞鍏� map
+ List<String> workshops = list.stream()
+ .filter(dropdownValuesDto -> dropdownValuesDto.getType().equals("workshop"))
+ .map(DropdownValuesDto::getValue)
+ .collect(Collectors.toList());
+ map.put("workshop", workshops);
+ return R.ok(map);
+ }
+
@RequestMapping(value = "/pla/list/auth")
@ManagerAuth
@@ -67,6 +104,11 @@
if (!Cools.isEmpty(param.get("brand"))) {
wrapper.eq("brand", param.get("brand"));
param.remove("brand");
+ }
+ // 浠撳簱绮剧‘鍖归厤
+ if (!Cools.isEmpty(param.get("stash"))) {
+ wrapper.eq("stash", param.get("stash"));
+ param.remove("stash");
}
// 娌℃湁閫夋嫨鐨勬椂鍊欓粯璁や笉鏄剧ず宸插嚭搴撶殑鐗╂枡
if (Cools.isEmpty(param.get("status"))) {
@@ -98,7 +140,48 @@
@RequestMapping(value = "/pla/update/auth")
@ManagerAuth
public R update(@RequestBody List<Pla> plas) {
- log.info(plas.toString());
+ Date date = new Date();
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "pla_status"));
+ String value;
+ if (config != null && config.getStatus() == 1) {
+ value = config.getValue();
+ } else {
+ value = "";
+ }
+ plas.forEach(pla -> {
+ Pla plaSave = plaService.selectById(pla.getId());
+ String status = plaSave.getStatus();
+ if (status != null && !Cools.isEmpty(value) && value.indexOf(status) == -1) {
+ throw new CoolException("淇敼" + plaSave.getBatch() + "鎵瑰彿鏉冮檺涓嶈冻锛岃鑱旂郴绠＄悊鍛樿繘琛屼慨鏀�");
+ }
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+
+ PlaLog plaLog = new PlaLog();
+ BeanUtils.copyProperties(plaSave, plaLog);
+ plaLog.setId(null);
+ plaLog.setCreateTime(date);
+ plaLog.setModifyUser(getUser().getUsername());
+ plaLogService.insert(plaLog);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ OperateLog operateLog = new OperateLog();
+ operateLog.setAction("鑱氫钩閰稿簱瀛樻槑缁嗕慨鏀�");
+ operateLog.setUserId(getUserId());
+ operateLog.setIp(request.getRemoteAddr());
+ operateLog.setRequest(pla.toString());
+ operateLog.setResponse(plaSave.toString());
+ operateLog.setCreateTime(new Date());
+ operateLogService.insert(operateLog);
+
+ });
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pla/updateByAdmin/auth")
+ @ManagerAuth
+ public R updateByAdmin(@RequestBody List<Pla> plas) {
+ Date date = new Date();
plas.forEach(pla -> {
Pla plaSave = plaService.selectById(pla.getId());
pla.setModifyTime(new Date());
@@ -107,9 +190,19 @@
PlaLog plaLog = new PlaLog();
BeanUtils.copyProperties(plaSave, plaLog);
plaLog.setId(null);
- plaLog.setCreateTime(new Date());
+ plaLog.setCreateTime(date);
plaLog.setModifyUser(getUser().getUsername());
plaLogService.insert(plaLog);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ OperateLog operateLog = new OperateLog();
+ operateLog.setAction("鑱氫钩閰稿簱瀛樻槑缁嗕慨鏀�");
+ operateLog.setUserId(getUserId());
+ operateLog.setIp(request.getRemoteAddr());
+ operateLog.setRequest(pla.toString());
+ operateLog.setResponse(plaSave.toString());
+ operateLog.setCreateTime(new Date());
+ operateLogService.insert(operateLog);
});
return R.ok();
@@ -144,11 +237,43 @@
return R.ok(plaQtyService.getDeliveryDate());
}
+ @Resource
+ private ManPakOutMapper manPakOutMapper;
+
@RequestMapping(value = "/pla/sellout/auth")
@ManagerAuth(memo = "sellout")
@Transactional
@Synchronized
public R sellout(@RequestBody List<Pla> plas) {
+ // 鍒ゆ柇鍙戣揣鏃堕棿娈靛唴锛屾槸鍚﹁秴
+ String pakoutTime = plas.get(0).getPakoutTime().split("\\(")[0];
+ if (!Cools.isEmpty(pakoutTime)) {
+ // 鑾峰彇鏃堕棿娈靛唴鍙戣揣閲嶉噺闄愰
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "MAX_WEIGHT_PER_HOUR").eq("status", 1));
+ if (config != null) {
+ pakoutTime = pakoutTime.split("\\(")[0].trim();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ // 瑙ｆ瀽
+ LocalDateTime dateTime = LocalDateTime.parse(pakoutTime, formatter);
+
+ // 褰撳皬鏃惰捣鐐�
+ LocalDateTime startHour = dateTime.withMinute(0).withSecond(0);
+
+ // 涓嬩竴涓皬鏃�
+ LocalDateTime endHour = startHour.plusHours(1); // 鑷姩澶勭悊璺ㄥぉ
+
+ // 杞洖瀛楃涓�
+ String startStr = startHour.format(formatter); // 2026-01-28 23:00:00
+ String endStr = endHour.format(formatter); // 2026-01-29 00:00:00
+
+ long anfme = manPakOutMapper.maxWeightPerHour(startStr, endStr);
+ long weightMax = Long.parseLong(config.getValue());
+ if (anfme + plas.get(0).getOrderWeight().longValue() > weightMax) {
+ throw new CoolException("瓒呭皬鏃堕噸閲忛檺棰�:" + weightMax + "锛岃灏忔椂鍙戣揣閲忓凡鏈夛細" + anfme);
+ }
+ }
+ }
String orderNo = plas.get(0).getOrderNo();
String maktx = plas.get(0).getBrand();
@@ -157,7 +282,11 @@
OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMaktx(orderNo, maktx);
for (Pla pla : plas) {
-
+ // 鑾峰彇鏈�鏂板喕缁撶姸鎬�
+ Pla pla1 = plaService.selectOne(new EntityWrapper<Pla>().setSqlSelect("stock_freeze as stockFreeze,stock_freeze_by as stockFreezeBy,stock_freeze_date as stockFreezeDate").eq("id", pla.getId()));
+ pla.setStockFreeze(pla1.getStockFreeze());
+ pla.setStockFreezeBy(pla1.getStockFreezeBy());
+ pla.setStockFreezeDate(pla1.getStockFreezeDate());
if (pla.getStockFreeze() == 0) {
// throw new CoolException("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
log.info("璇ュ簱瀛樺凡琚叾浠栫敤鎴峰喕缁擄紝璇烽噸鏂伴�夋嫨;{},{}", pla.getStockFreezeBy(), getUser().getUsername());
@@ -171,12 +300,13 @@
if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) {
throw new CoolException("鎵瑰彿:" + pla.getBatch() + "锛屽寘鍙�:" + pla.getPackageNo() + " 鍓╀綑鍙嚭搴撻噸閲忎笉瓒筹紝璇疯皟鏁村嚭搴撻噸閲�");
}
- if (Cools.isEmpty(pla.getMassState())){
+ if (Cools.isEmpty(pla.getMassState())) {
throw new CoolException("璐ㄩ噺鎸囨爣涓轰笂浼�");
}
pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
pla.setHandlerBy(getUser().getUsername());
pla.setStatus(GlobleParameter.PLA_STATUS_2);
+ log.info("淇敼涓哄緟鍑哄簱锛屽湴鍧�锛歿},鏁版嵁:{}", "/pla/sellout/auth", pla);
pla.setModifyTime(new Date());
pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
//鐢熸垚姝ゆ浣滀笟淇℃伅
@@ -233,7 +363,7 @@
pla.setWeightAnfme(0.0);
plaService.updateById(pla);
SaasUtils.insertLog(1, pla.getLocNo(), pla.getBrand(), anfme, getUser().getUsername(),
- null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null);
+ null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null,"鍏ㄩ儴鍑哄簱" + anfme,pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
});
return R.ok();
@@ -421,6 +551,7 @@
manPakOut.setNodeId(plaQty.getId());
manPakOut.setCustName(plaQty.getCustomer());
manPakOut.setCreateBy(userId);
+ manPakOut.setMemo(plaQty.getMemo()); // 澶囨敞
//棰勮鍙戣揣鏃堕棿
manPakOut.setSpecs(plaQty.getPakoutTime());
//manPakOut.setNodeId(plaQty.getOrderDetlId());
--
Gitblit v1.9.1