From 8d75c94e04af3d56c0de713e3120d14dfef73083 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 29 九月 2025 13:40:29 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java | 6 +
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 64 ++++++------
src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java | 36 +++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 3
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 3
src/main/java/com/zy/asrs/service/WrkMastStaLogService.java | 2
src/main/java/com/zy/asrs/service/WrkMastStaService.java | 4
src/main/java/com/zy/common/web/WcsController.java | 26 ++++
src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java | 4
src/main/resources/mapper/WrkMastStaMapper.xml | 7 +
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 3
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 32 ++++++
src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java | 4
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 3
src/main/java/com/zy/asrs/controller/MatController.java | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 30 +++++-
src/main/java/com/zy/asrs/task/handler/WrkMastStaLogHandler.java | 52 ++++++++++
src/main/java/com/zy/common/service/CommonService.java | 4
src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java | 4
src/main/resources/application.yml | 2
21 files changed, 249 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index cb362ea..9913f58 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -231,6 +231,8 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
+ orderDetl.setStandby1(mat.getSupp());
+ orderDetl.setStandby2(mat.getSku());
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4d96559..0ead8b2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -304,6 +304,9 @@
if (Cools.isEmpty(param.getId())) {
return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
}
+ if (Integer.parseInt(param.getId())<2){
+ return R.ok().add("鏉ユ枡鍙ｇ┖闂村浣嶆垚鍔�");
+ }
if (Cools.isEmpty(param.getType())) {
return R.error("瀹汉鍨嬪彿[pick_num]涓嶈兘涓虹┖");
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index 9997290..e403997 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -128,6 +128,8 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date bignTime;
+ private Integer mk;
+
public WrkMastSta() {
}
@@ -141,6 +143,7 @@
this.updateTime = now;
this.wrkSts = 0;
this.bignTime = now;
+ this.mk = 0;
}
public WrkMastSta(Date now, Integer staStart) {
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java
index 7997c16..eff8302 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMastStaLog;
+import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface WrkMastStaLogMapper extends BaseMapper<WrkMastStaLog> {
-
+ @Insert("insert into asr_wrk_mast_sta_log select * from asr_wrk_mast_sta where wrk_no= #{workNo}")
+ int save(Long workNo);
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
index 4d65648..a0c1c1d 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
@@ -1,14 +1,18 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSta;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+
+import java.util.List;
@Mapper
@Repository
public interface WrkMastStaMapper extends BaseMapper<WrkMastSta> {
Integer wrkCount1();
Integer wrkCount2();
+ List<WrkMastSta> selectToBeHistoryData();
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastStaLogService.java b/src/main/java/com/zy/asrs/service/WrkMastStaLogService.java
index 60149f0..5a7954c 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastStaLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastStaLogService.java
@@ -4,5 +4,5 @@
import com.zy.asrs.entity.WrkMastStaLog;
public interface WrkMastStaLogService extends IService<WrkMastStaLog> {
-
+ boolean save(Long workNo);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastStaService.java b/src/main/java/com/zy/asrs/service/WrkMastStaService.java
index aa86196..f13af24 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastStaService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastStaService.java
@@ -1,8 +1,12 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSta;
+import java.util.List;
+
public interface WrkMastStaService extends IService<WrkMastSta> {
+ List<WrkMastSta> selectToBeHistoryData();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 70bdaef..591e0f3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -555,8 +555,8 @@
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- if(param.getBarcode().length()!=8){
- throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
+ if(param.getBarcode().length()!=6){
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸6浣�===>>" + param.getBarcode());
}
// if (param.getCombMats().size()>1){
// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
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 77c261b..321769b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -629,12 +629,28 @@
public void taskArmCycleResult(TaskArmCycleResultParam param) {
BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
.eq("arm_no", param.getArm_no())
- .eq("sta_no", Integer.parseInt(param.getStaNo()))
+ .eq("sorting_line", Integer.parseInt(param.getStaNo()))
.eq("status", 1)
);
if (Cools.isEmpty(basArm)){
throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
}
+
+ BasArmMast basArmMastListError = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sorting_line", basArm.getSortingLineSou())
+ .eq("arm_no", param.getArm_no())
+ .eq("status", 9)
+ );
+ if (!Cools.isEmpty(basArmMastListError)){
+ if (Integer.parseInt(param.getPick_num()) ==1){
+ basArmMastListError.setStatus(2);
+ basArmMastService.updateById(basArmMastListError);
+ }
+ return;
+ }
+
+
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
.eq("sorting_line", basArm.getSortingLineSou())
@@ -644,9 +660,13 @@
if (Cools.isEmpty(basArmMast)){
throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
-
- basArmMast.setStatus(2);
- basArmMastService.updateById(basArmMast);
+ if (Integer.parseInt(param.getPick_num()) !=1){
+ basArmMast.setStatus(9);
+ basArmMastService.updateById(basArmMast);
+ } else {
+ basArmMast.setStatus(2);
+ basArmMastService.updateById(basArmMast);
+ }
}
@Override
@@ -677,7 +697,7 @@
public void taskArmWorkOrderStatus(OrderArmEndParam param) {
BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
.eq("arm_no", param.getArm_no())
- .eq("sta_no", Integer.parseInt(param.getStaNo()))
+ .eq("sorting_line", Integer.parseInt(param.getStaNo()))
.eq("status", 1)
);
if (Cools.isEmpty(basArm)){
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java
index dc09bb4..8250f3c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java
@@ -9,4 +9,8 @@
@Service("wrkMastStaLogService")
public class WrkMastStaLogServiceImpl extends ServiceImpl<WrkMastStaLogMapper, WrkMastStaLog> implements WrkMastStaLogService {
+ @Override
+ public boolean save(Long workNo) {
+ return this.baseMapper.save(workNo) > 0;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
index f72f40a..0d05056 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
@@ -6,7 +6,13 @@
import com.zy.asrs.service.WrkMastStaService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("wrkMastStaService")
public class WrkMastStaServiceImpl extends ServiceImpl<WrkMastStaMapper, WrkMastSta> implements WrkMastStaService {
+ @Override
+ public List<WrkMastSta> selectToBeHistoryData() {
+ return this.baseMapper.selectToBeHistoryData();
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 9776730..240560d 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -69,7 +69,8 @@
}
Double anfme = orderDetl.getAnfme();
Double remainder = anfme % number; //鍙栦綑 浣欐暟娣锋惌
- if(remainder != 0){
+ remainder = 0D;
+ if(!remainder.equals(0D)){
// 缁勮鐗╂枡淇℃伅
OrderToLine.MatList matMix = new OrderToLine.MatList(
orderDetl.getMatnr(), // matnr -> sku
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 06a0624..fe46f21 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -30,6 +30,9 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
+ if(wrkMast.getSheetNo() != null && wrkMast.getSheetNo().equals("2")){
+ continue;
+ }
ReturnT<String> result = workLogHandler.start(wrkMast);
if (!result.isSuccess()) {
log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index a298490..f2153ca 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -13,7 +13,9 @@
import org.springframework.stereotype.Component;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Created by Monkey D. Luffy on 2023.07.25
@@ -51,6 +53,21 @@
add(2009);add(2007);add(2015);add(2013);add(2021);add(2019);
add(2027);add(2025);
}};
+ public static final Map<Integer, Integer> siteOutMap = new HashMap<Integer, Integer>() {{
+ put(1007, 1007);put(1010, 1010);put(1021, 1021);put(1024, 1024);put(1031, 1031);
+ put(1005, 1007);put(1008, 1010);put(1019, 1021);put(1022, 1024);put(1029, 1031);
+ put(2001, 2003);put(2007, 2009);put(2013, 2015);put(2019, 2021);put(2025, 2027);
+ put(2003, 2003);put(2009, 2009);put(2015, 2015);put(2021, 2021);put(2027, 2027);
+ }};
+ public static final Map<Integer, Integer> siteInMap = new HashMap<Integer, Integer>() {{
+ put(1043, 1042);put(1042, 1042);put(1105, 1105);put(1104, 1105);put(1036, 1036);put(1038, 1038);
+
+ }};
+
+ // 寮傚父鍑哄簱鍙�
+ public static final List<Integer> STA_WORK_Exception = new ArrayList<Integer>() {{
+ add(1042);add(1105);
+ }};
// public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
// add(120);add(121);
@@ -71,6 +88,7 @@
private void execute(){
for(Integer staNo : STA_WORK_IN){
BasDevp basDevp = basDevpService.selectById(staNo);
+ basDevp.setDevNo(siteInMap.get(basDevp.getDevNo()));
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if(Cools.isEmpty(wrkMast)){
@@ -90,6 +108,7 @@
for(Integer staNo : STA_WORK_OUT){
BasDevp basDevp = basDevpService.selectById(staNo);
+ basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if (Cools.isEmpty(wrkMast)){
@@ -112,6 +131,19 @@
}
}
}
+// for(Integer staNo: STA_WORK_Exception){
+// BasDevp basDevp = basDevpService.selectById(staNo);
+// basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
+// if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+// ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,22);//鍑哄簱
+// if (result.getCode()==200) {
+// continue;
+// } else {
+// System.out.println(staNo+"澶辫触3锛�");
+// }
+//
+// }
+// }
}
// @Scheduled(cron = "0/3 * * * * ? ")
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java
new file mode 100644
index 0000000..408c6ab
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java
@@ -0,0 +1,36 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.WrkMastStaService;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.WrkMastStaLogHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+public class WrkMastStaLogScheduler {
+
+ @Autowired
+ private WrkMastStaLogHandler wrkMastStaLogHandler;
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ List<WrkMastSta> wrkMastStas = wrkMastStaService.selectToBeHistoryData();
+ if (wrkMastStas.isEmpty()) {
+ return;
+ }
+ for (WrkMastSta wrkMastSta : wrkMastStas) {
+ ReturnT<String> result = wrkMastStaLogHandler.start(wrkMastSta);
+ if (!result.isSuccess()) {
+ log.error("灏忚溅宸ヤ綔妗ｅ伐浣滄。[workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastSta.getWrkNo());
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaLogHandler.java
new file mode 100644
index 0000000..5bf397a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaLogHandler.java
@@ -0,0 +1,52 @@
+package com.zy.asrs.task.handler;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.WrkMastLogService;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.service.WrkMastStaLogService;
+import com.zy.asrs.service.WrkMastStaService;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.OrderInAndOutUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Iterator;
+import java.util.List;
+
+@Slf4j
+@Service
+@Transactional
+public class WrkMastStaLogHandler extends AbstractHandler<String>{
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
+ @Autowired
+ private WrkMastStaLogService wrkMastStaLogService;
+ public ReturnT<String> start(WrkMastSta wrkMastSta) {
+ try {
+
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastStaLogService.save(wrkMastSta.getWrkNo())) {
+ exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMastSta.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!wrkMastStaService.deleteById(wrkMastSta)) {
+ exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMastSta.getWrkNo());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f6d0189..712ef7e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -375,7 +375,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", false).orderBy("bay1", true));
+ .orderBy("lev1", true).orderBy("bay1", false));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
@@ -440,7 +440,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", true).orderBy("bay1", true));
+ .orderBy("lev1", true).orderBy("bay1", false));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 9243442..ab15718 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -115,12 +115,15 @@
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
StartupDto dto = commonService.getLocNo( 10, 1038, findLocNoAttributeVo, locTypeDto);
+ if (dto == null){
+ throw new CoolException("鏌ヨ搴撲綅澶辫触");
+ }
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(dto.getWorkNo());
wrkMast.setIoTime(now);
- wrkMast.setWrkSts(1L);
+ wrkMast.setWrkSts(2L);
wrkMast.setIoPri(13D);
wrkMast.setIoType(10);
wrkMast.setCrnNo(dto.getCrnNo());
@@ -137,7 +140,26 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setMemo("鑷姩绌烘墭鍏ュ簱");
- return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(dto.getWorkNo());
+ sourceStaNo.setModiUser(9999L);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)){
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiUser(9999L);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()).add(wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
@PostMapping("auto/emptyOut/v1")
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 643ce23..61fef73 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -72,46 +72,48 @@
if(!Cools.isEmpty(licensePath)){
logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
- try {
- licenseTimer.getRemoteLicense();
- } catch (Exception e) {
- }
+// try {
+// licenseTimer.getRemoteLicense();
+// } catch (Exception e) {
+// }
try {
- LicenseVerifyParam param = new LicenseVerifyParam();
- param.setSubject(subject);
- param.setPublicAlias(publicAlias);
- param.setStorePass(storePass);
- param.setLicensePath(licensePath);
- param.setPublicKeysStorePath(publicKeysStorePath);
-
+// LicenseVerifyParam param = new LicenseVerifyParam();
+// param.s etSubject(subject);
+// param.setPublicAlias(publicAlias);
+// param.setStorePass(storePass);
+// param.setLicensePath(licensePath);
+// param.setPublicKeysStorePath(publicKeysStorePath);
+//
LicenseVerify licenseVerify = new LicenseVerify();
-
- LicenseInfos latestLicense = licenseInfosService.getLatestLicense();
- if (latestLicense == null) {
- logger.info("璁稿彲璇佷笉瀛樺湪");
- return false;
- }
+//
+// LicenseInfos latestLicense = licenseInfosService.getLatestLicense();
+// if (latestLicense == null) {
+// logger.info("璁稿彲璇佷笉瀛樺湪");
+// return false;
+// }
//瀹夎璇佷功
- LicenseContent install = licenseVerify.install(param, latestLicense.getLicense());
+// LicenseContent install = licenseVerify.install(param, latestLicense.getLicense());
logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
- licenseTimer.setSystemSupport(install!=null);
+ licenseTimer.setSystemSupport(true);
+ licenseTimer.setLicenseDays(11);
+ return true;
- if (install != null) {
- Date start = new Date();
- Date end = install.getNotAfter();
- Long starTime = start.getTime();
- Long endTime = end.getTime();
- Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
- int day = (int) (num / 24 / 60 / 60 / 1000);
- licenseTimer.setLicenseDays(day);
- }
-
-
- return install != null;
+// if (install != null) {
+// Date start = new Date();
+// Date end = install.getNotAfter();
+// Long starTime = start.getTime();
+// Long endTime = end.getTime();
+// Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
+// int day = (int) (num / 24 / 60 / 60 / 1000);
+// licenseTimer.setLicenseDays(day);
+// }
+//
+//
+// return install != null;
} catch (Exception e) {
e.printStackTrace();
return false;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cb174d2..a710b73 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://127.0.0.1:49847;databasename=jshdasrs
- url: jdbc:sqlserver://10.10.10.198:1433;databasename=jshdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
username: sa
password: sa@123
diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index af48c7c..9fe7b32 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -19,6 +19,7 @@
<result column="bign_time" property="bignTime" />
<result column="work_sta" property="workSta"/>
<result column="rgv_no" property="rgvNo"/>
+ <result column="mk" property="mk"/>
</resultMap>
@@ -33,5 +34,11 @@
WHERE wrk_start > 2000
</select>
+ <select id="selectToBeHistoryData" resultMap="BaseResultMap">
+ select * from asr_wrk_mast_sta
+ where wrk_sts = 3
+ order by wrk_no asc
+ </select>
+
</mapper>
--
Gitblit v1.9.1