From 757f103f37d83dfb55bb49b3df0b805cb520d4f7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 11 十月 2025 15:28:26 +0800
Subject: [PATCH] 第三版
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index e673700..873b91f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -20,6 +20,8 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NodeUtils;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -64,6 +66,8 @@
private CommonService commonService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private ConfigService configService;
@Value("${mes.inPath}")
private String inpath;
@@ -605,6 +609,15 @@
matNew.setMaktx(param.getPackName());
matNew.setManuDate(param.getRequestTime());
matNew.setDeadWarn(1440);//6灏忔椂 360鍒嗛挓 24灏忔椂 1440鍒嗛挓
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "JingZhiTime"));
+ if (!Cools.isEmpty(config)){
+ try{
+ int time = Integer.parseInt(config.getValue());
+ matNew.setDeadWarn(time);//6灏忔椂 360鍒嗛挓 24灏忔椂 1440鍒嗛挓
+ }catch (Exception e){
+
+ }
+ }
matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
matNew.setCreateTime(now);
matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
@@ -716,7 +729,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(7);
combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.updateById(locMast)) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
--
Gitblit v1.9.1