root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lishuai
2024-01-26 13:56:35 +08:00
parent c27c42de8b 686e3d33ae
commit 823c961ec6
28 changed files with 451 additions and 1683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java
View File

@@ -340,6 +340,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
jo.put("finish", finish);
jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("hx_error_type", String.valueOf(this.getError())));
jo.put("error1", ErrorUtil.getDictDetail("hx_error_type", String.valueOf(this.getError1())));
jo.put("isError", this.getIserror());
jo.put("countdown_house", countdown_house);
jo.put("countdown_min", countdown_min);
@@ -348,9 +349,6 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
jo.put("mode", mode);
jo.put("move", move);
jo.put("action", action);
// jo.put("isOnline", this.getIsonline());
// jo.put("error", this.getError());
// jo.put("isError", this.getIserror());
jo.put("task", this.getTask());
return jo;
}
@@ -402,4 +400,29 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
}
}
public void writing(List list) {
Map<String, Object> itemMap = new HashMap<String, Object>();
for (int i = 0; i < list.size(); i++) {
Object ob = list.get(i);
JSONObject json = (JSONObject) JSONObject.toJSON(ob);
if (!StrUtil.isEmpty(json.getString("value"))) {
String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + json.getString("code");
itemMap.put(to_param, json.getString("value"));
}
}
logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap);
try {
this.checkcontrol(itemMap);
} catch (Exception e) {
e.printStackTrace();
try {
this.checkcontrol(itemMap);
} catch (Exception e1) {
e1.printStackTrace();
}
}
}
}

52
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -457,11 +457,29 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
this.writing("to_command", "1");
if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
List list = new ArrayList();
Map map = new HashMap();
map.put("code", "to_open_door");
map.put("value", "1");
list.add(map);
try {
hongXiangConveyorDeviceDriver.writing(list);
} catch (Exception e) {
logServer.deviceExecuteLog(this.getDevice_code(), "", "", "起点设备：" + start_device_code + "未打开烘箱门,导致now_steps_type不等于: 2 ;now_steps_type:" + now_steps_type);
}
}
if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextdevice.getDeviceDriver();
hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
List list = new ArrayList();
Map map = new HashMap();
map.put("code", "to_open_door");
map.put("value", "1");
list.add(map);
try {
hongXiangConveyorDeviceDriver.writing(list);
} catch (Exception e) {
logServer.deviceExecuteLog(this.getDevice_code(), "", "", "终点设备：" + next_device_code + "未打开烘箱门,导致now_steps_type不等于: 2;now_steps_type:" + now_steps_type);
}
}
this.setNow_steps_type(2);
this.setRequireSucess(true);
@@ -605,13 +623,29 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
//HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver;
if (nextDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextDevice.getDeviceDriver();
hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
List list = new ArrayList();
Map map = new HashMap();
map.put("code", "to_open_door");
map.put("value", "1");
list.add(map);
try {
hongXiangConveyorDeviceDriver.writing(list);
} catch (Exception e) {
logServer.deviceExecuteLog(this.getDevice_code(), "", "", "终点设备：" + next_device_code + "未打开烘箱门,导致now_steps_type不等于: 2;now_steps_type:" + now_steps_type);
}
}
if (startDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startDevice.getDeviceDriver();
hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
hongXiangConveyorDeviceDriver.writing("to_open_door", "1");
List list = new ArrayList();
Map map = new HashMap();
map.put("code", "to_open_door");
map.put("value", "1");
list.add(map);
try {
hongXiangConveyorDeviceDriver.writing(list);
} catch (Exception e) {
logServer.deviceExecuteLog(this.getDevice_code(), "", "", "起点设备：" + start_device_code + "未打开烘箱门,导致now_steps_type不等于: 2;now_steps_type:" + now_steps_type);
}
}
this.setNow_steps_type(2);
this.setRequireSucess(true);
@@ -800,11 +834,11 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
steps_type = "更新指令状态";
} else if (now_steps_type == 2) {
steps_type = "下发电气信号";
}else if(now_steps_type == 3){
} else if (now_steps_type == 3) {
steps_type = "允许取货";
}else if (now_steps_type ==4 ){
} else if (now_steps_type == 4) {
steps_type += "允许放货";
}else if (now_steps_type == 5){
} else if (now_steps_type == 5) {
steps_type += "放货完成";
}

8
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
View File

@@ -147,7 +147,7 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
case 3:
break;
case 4:
if ((task1 > 0) && !requireSucess) {
if (!requireSucess) {
applyBushing();
}
break;
@@ -274,14 +274,14 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
private synchronized void applyBushing() {
ApplyManipulatorActionRequest applyManipulatorActionRequest = new ApplyManipulatorActionRequest();
ApplyManipulatorActionResponse applyManipulatorActionResponse;
Instruction inst1 = instructionService.findByCode(String.valueOf(task1));
/*Instruction inst1 = instructionService.findByCode(String.valueOf(task1));
String task_code1 = inst1.getTask_code();
if (Long.parseLong(task_code1) < 1) {
message = "任务ACS创建,不向LMS申请套轴";
return;
}
}*/
applyManipulatorActionRequest.setDevice_code(device_code);
applyManipulatorActionRequest.setTask_code1(task_code1);
//applyManipulatorActionRequest.setTask_code1(task_code1);
applyManipulatorActionRequest.setType("6");
applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest);
if (ObjectUtils.isNotEmpty(applyManipulatorActionResponse) && ("1".equals(applyManipulatorActionResponse.getIs_bushing()))) {

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -476,7 +476,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
break;
} else {
message = "task变化请求LMS失败: " + response.getMessage();
Thread.sleep(5000);
Thread.sleep(15000);
}
}
} catch (Exception e) {

3
acs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -470,6 +470,9 @@ export default {
} else if (val === 'error') {
const obj = { name: '报警', value: data[val] }
this.arr.push(obj)
} else if (val === 'error1') {
const obj = { name: '报警2', value: data[val] }
this.arr.push(obj)
} else if (val === 'ip') {
const obj = { name: 'IP地址', value: data[val] }
this.arr.push(obj)

150
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/ItemProtocol.java
View File

@@ -1,150 +0,0 @@
//package org.nl.acs.device_driver.conveyor.oven_manipulator;
//
//import cn.hutool.core.util.StrUtil;
//import lombok.Data;
//import lombok.extern.slf4j.Slf4j;
//import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
//
//import java.util.ArrayList;
//import java.util.List;
//
//@Slf4j
//@Data
//public class ItemProtocol {
//
// /**
// * 心跳
// */
// public static String item_heartbeat = "heartbeat";
// /**
// * 工作模式
// */
// public static String item_mode = "mode";
// /**
// * 光电信号
// */
// public static String item_move = "move";
// /**
// * 动作信号
// */
// public static String item_action = "action";
// /**
// * 行走列
// */
// public static String item_walk_y = "walk_y";
// /**
// * 报警
// */
// public static String item_error = "error";
// /**
// * 任务号
// */
// public static String item_task = "task";
//
// /**
// * 行走列
// */
// public static String item_to_command = "to_command";
// /**
// * 下发起始站
// */
// public static String item_to_onset = "to_onset";
// /**
// * 下发目标站
// */
// public static String item_to_target = "to_target";
// /**
// * 下发任务号
// */
// public static String item_to_task = "to_task";
//
//
// private OvenGantryManipulatorDeviceDriver driver;
//
// public ItemProtocol(OvenGantryManipulatorDeviceDriver driver) {
// this.driver = driver;
// }
//
// public int getHeartbeat() {
// return this.getOpcIntegerValue(item_heartbeat);
// }
//
// public int getMode() {
// return this.getOpcIntegerValue(item_mode);
// }
//
// public int getMove() {
// return this.getOpcIntegerValue(item_move);
// }
//
// public int getAction() {
// return this.getOpcIntegerValue(item_action);
// }
//
// public int getWalk_y() {
// return this.getOpcIntegerValue(item_walk_y);
// }
//
// public int getError() {
// return this.getOpcIntegerValue(item_error);
// }
//
// public int getTask() {
// return this.getOpcIntegerValue(item_task);
// }
//
//
//
//
// Boolean isonline;
//
// public int getOpcIntegerValue(String protocol) {
// Integer value = this.driver.getIntegeregerValue(protocol);
// if (value == null) {
// // log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
// setIsonline(false);
// } else {
// setIsonline(true);
// return value;
// }
// return 0;
//
// }
//
// public String getOpcStringValue(String protocol) {
// String value = this.driver.getStringValue(protocol);
// if (StrUtil.isEmpty(value)) {
//
// } else {
// return value;
// }
// return "0";
// }
//
// public static List<ItemDto> getReadableItemDtos() {
// ArrayList list = new ArrayList();
// list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0"));
// list.add(new ItemDto(item_mode, "工作模式", "DB1.B1"));
// list.add(new ItemDto(item_move, "光电信号", "DB1.B2"));
// list.add(new ItemDto(item_action, "动作信号", "DB1.B3"));
// list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4"));
// list.add(new ItemDto(item_error, "报警信号", "DB1.B5"));
// list.add(new ItemDto(item_task, "任务号", "DB1.D6"));
// return list;
// }
//
// public static List<ItemDto> getWriteableItemDtos() {
// ArrayList list = new ArrayList();
// list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0"));
// list.add(new ItemDto(item_to_onset, "下发起始站", "DB2.W2"));
// list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W4"));
// list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D6"));
// return list;
// }
//
// @Override
// public String toString() {
// return "";
// }
//}
//

62
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDefination.java
View File

@@ -1,62 +0,0 @@
//package org.nl.acs.device_driver.conveyor.oven_manipulator;
//
//import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
//import org.nl.acs.device.domain.Device;
//import org.nl.acs.device_driver.DeviceDriver;
//import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
//import org.nl.acs.device.enums.DeviceType;
//import org.springframework.stereotype.Service;
//
//import java.util.LinkedList;
//import java.util.List;
//
///**
// * 烘箱-行架机械手
// */
//@Service
//public class OvenGantryManipulatorDefination implements OpcDeviceDriverDefination {
// @Override
// public String getDriverCode() {
// return "oven_manipulator";
// }
//
// @Override
// public String getDriverName() {
// return "烘箱-行架机械手";
// }
//
// @Override
// public String getDriverDescription() {
// return "烘箱-行架机械手";
// }
//
// @Override
// public DeviceDriver getDriverInstance(Device device) {
// return (new OvenGantryManipulatorDeviceDriver()).setDevice(device).setDriverDefination(this);
//
// }
//
// @Override
// public Class<? extends DeviceDriver> getDeviceDriverType() {
// return OvenGantryManipulatorDeviceDriver.class;
// }
//
// @Override
// public List<DeviceType> getFitDeviceTypes() {
// List<DeviceType> types = new LinkedList();
// types.add(DeviceType.station);
// return types;
// }
//
// @Override
// public List<ItemDto> getReadableItemDtos() {
// return ItemProtocol.getReadableItemDtos();
// }
//
//
// @Override
// public List<ItemDto> getWriteableItemDtos() {
// return ItemProtocol.getWriteableItemDtos();
// }
//
//}

1204
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

File diff suppressed because it is too large Load Diff

56
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/Test.java
View File

@@ -1,56 +0,0 @@
package org.nl.acs.device_driver.conveyor.oven_manipulator;
import java.text.DecimalFormat;
public class Test {
public static String beautifyTime(double second) {
if (second <= 0) {
return "0";
}
final String[] units = new String[]{"秒", "分钟", "小时"};
int digitGroups = (int) (Math.log10(second) / Math.log10(60));
String value = "0";
if (digitGroups < 3) {
value = new DecimalFormat("#,##0.#").format(second / Math.pow(60, digitGroups)) + "" + units[digitGroups];
} else if (digitGroups >= 3) {
//如果超过了小时的表达范围则，则转换为天，小时，分，秒格式
value = secondToDate(second);
}
return value;
}
public static String secondToDate(double second) {
Long time = new Long(new Double(second).longValue());
String strTime = null;
Long days = time / (60 * 60 * 24);
Long hours = (time % (60 * 60 * 24)) / (60 * 60);
Long minutes = (time % (60 * 60)) / 60;
Long seconds = time % 60;
if (days > 0) {
strTime = days + "天" + hours + "小时" + minutes + "分钟";
} else if (hours > 0) {
strTime = hours + "小时" + minutes + "分钟";
} else if (minutes > 0) {
strTime = minutes + "分钟" + seconds + "秒";
} else {
strTime = second + "秒";
}
return strTime;
}
public static void main(String[] args) {
Long time = new Long(new Double(7500).longValue());
Long hours = (time % (60 * 60 * 24)) / (60 * 60);
Long minutes = (time % (60 * 60)) / 60;
Long seconds = time % 60;
System.out.println(hours);
System.out.println(minutes);
System.out.println(seconds);
}
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
View File

@@ -190,7 +190,7 @@ public interface OpcDeviceDriver extends DeviceDriver {
* @return
*/
default String getStringValue(String protocol) {
return this.getOpcValueAccessor().getValue(this.getItem(protocol)).toString();
return (String) this.getOpcValueAccessor().getValue(this.getItem(protocol));
}
/**

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java
View File

@@ -153,7 +153,7 @@ public class ItemProtocol {
} else {
return value;
}
return "0";
return "";
}
public static List<ItemDto> getReadableItemDtos() {

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
View File

@@ -207,10 +207,8 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
if (!UnifiedDataAppService.isEquals(value, his)) {
OpcItemDto itemDto = this.getItem(itemId);
if (true) {
this.logItemChanged(itemId, accessor_value, value, itemDto);
}
if (!ObjectUtil.isEmpty(value)) {
this.logItemChanged(itemId, accessor_value, value, itemDto);
accessor_value.setValue(itemId, value);
}
}
@@ -436,7 +434,6 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
String.valueOf(itemDto.getHis_item_value()), String.valueOf(itemDto.getItem_value()));
luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
log.info("{}", JSON.toJSONString(luceneLogDto));
}
} else {
if(his instanceof int[]){

6
acs2/nladmin-ui/src/views/lucene/time.vue
View File

@@ -7,9 +7,9 @@
v-model="query.createTime"
type="datetimerange"
:picker-options="pickerOptions"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:range-separator="$t('monitor.lucence.until')"
:start-placeholder="$t('auto.common.startDate')"
:end-placeholder="$t('auto.common.endDate')"
align="right"
/>
<rrOperation />

1
lms/nladmin-system/src/main/java/org/nl/config/ESConfig.java
View File

@@ -13,6 +13,5 @@ import org.springframework.context.annotation.Configuration;
@Data
public class ESConfig {
@Value(("${es.index}"))
private String index;
}

7
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -1315,11 +1315,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String point_type = task_jo.getString("task_type");
//取货完成
if ("1".equals(type)) {
if ("010602".equals(point_type) || "010606".equals(point_type)) {
if ("010602".equals(point_type)) {
JSONObject point1_jo = ivt_shaftivt.query("point_code = '" + task_jo.getString("point_code1") + "'").uniqueResult(0);
point1_jo.put("have_qzz", "0");
ivt_shaftivt.update(point1_jo);
} else if ("010607".equals(point_type) || "010603".equals(point_type)) {
} else if ("010607".equals(point_type) || "010603".equals(point_type) || "010606".equals(point_type)) {
JSONObject point1_jo = ivt_shaftivt.query("point_code = '" + task_jo.getString("point_code1") + "'").uniqueResult(0);
point1_jo.put("qzz_size", "");
point1_jo.put("qzz_generation", "");
@@ -1388,6 +1388,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
paperTrussTask.immediateNotifyAcs(null);
}
} else {
//判断当前套管工位上是否存在可用的纸管或任务
JSONObject tggw_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '4' AND product_area = '" + product_area + "'").uniqueResult(0);
JSONObject tggw_task = WQLObject.getWQLObject("sch_base_task").query("point_code1 = '"+tggw_jo.getString("point_code")+"' AND task_type = '010607' AND is_delete = '0' ADN task_status < '07'").uniqueResult(0);
//判断在等待任务数量范围内是否存在符合的纸管，如果存在则等待，不存在则创建空载具入库任务
boolean need_wait = this.judgeWait(product_area, vehicle_jo);
if (!need_wait) {

10
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/PackagePointIvtDto.java
View File

@@ -57,6 +57,16 @@ public class PackagePointIvtDto implements Serializable {
*/
private String tube_name1;
/**
* 子卷号1编码
*/
private String container_name1;
/**
* 子卷号2编码
*/
private String container_name2;
/**
* 顺序号
*/

20
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
View File

@@ -1,11 +1,13 @@
package org.nl.wms.sch.manage;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
@@ -17,9 +19,12 @@ import org.nl.wms.sch.tasks.CutConveyorTask;
import org.nl.wms.sch.tasks.PaperTrussTask;
import org.nl.wms.sch.tasks.PaperTubeTask;
import org.nl.wms.sch.tasks.URLEnum;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
@Slf4j
@Component
@@ -34,7 +39,15 @@ public class AutoCallEmptyVehicle {
private final WmsToAcsService wmsToAcsService;
private final RedissonClient redissonClient;
@SneakyThrows
public void run() {
RLock lock = redissonClient.getLock(this.getClass().getName());
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try {
if (tryLock){
// log.info("AutoCallEmptyVehicle"+ DateUtil.now()+"执行！！！！");
for (URLEnum url : URLEnum.values()) {
String product_area = url.getProduct_area();
JSONObject nbj_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("product_area = '" + product_area + "' AND point_type = '9'").uniqueResult(0);
@@ -49,6 +62,13 @@ public class AutoCallEmptyVehicle {
}
}
}
}finally {
if (tryLock) {
lock.unlock();
}
}
}
void callEmptyVehicle(String product_area, String point_location) {

23
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java
View File

@@ -1,22 +1,37 @@
package org.nl.wms.sch.manage;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
import java.util.concurrent.TimeUnit;
@Slf4j
@Component
@RequiredArgsConstructor
public class AutoQueryBillInfo {
private final RedissonClient redissonClient;
@SneakyThrows
public void run() {
RLock lock = redissonClient.getLock(this.getClass().getName());
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try {
if (tryLock) {
System.out.println("AutoQueryBillInfo" + DateUtil.now() + "执行！！！！");
//查询已经处于分配中、分配完但还未回传给MES的销售出库单
WQLObject wo = WQLObject.getWQLObject("st_ivt_iostorinv");
String nofity_day = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("NOFITY_DAY").getValue();
@@ -27,6 +42,14 @@ public class AutoQueryBillInfo {
send_rows = wo.query("(bill_type = '1001' OR bill_type = '1004') AND bill_status = '99' AND confirm_time > '2023-09-01' AND is_delete = '0' AND ( IFNULL(trans_code,'') = '' OR IFNULL( deliveryaddress, '' ) = '' OR IFNULL( deliveryunit, '' ) = '' OR (IFNULL(trans_code,'') <> '00000000' AND IFNULL(estimated_freight,0) = 0) OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '') AND TIMESTAMPDIFF(DAY,confirm_time,NOW()) >= " + nofity_day).getResultJSONArray(0);
}
this.sendInfo(send_rows);
} else {
System.out.println("AutoQueryBillInfo" + DateUtil.now() + "被锁住！！！！");
}
} finally {
if (tryLock) {
lock.unlock();
}
}
}
void sendInfo(JSONArray send_rows) {

20
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryConRem.java
View File

@@ -6,17 +6,29 @@ import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
import java.util.concurrent.TimeUnit;
@Slf4j
@Component
@RequiredArgsConstructor
public class AutoQueryConRem {
private final RedissonClient redissonClient;
@SneakyThrows
public void run() {
RLock lock = redissonClient.getLock(this.getClass().getName());
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try {
if (tryLock){
//查询立库贴标、捆扎机剩余材料是否低于下限
JSONArray rows = new JSONArray();
//捆扎米数
@@ -43,6 +55,12 @@ public class AutoQueryConRem {
}
this.sendInfo(rows);
}
}finally {
if (tryLock) {
lock.unlock();
}
}
}
void sendInfo(JSONArray send_rows) {
WQLObject wo = WQLObject.getWQLObject("em_bi_devicestatus");
@@ -65,7 +83,7 @@ public class AutoQueryConRem {
} else {
return;
}
String Message = row.getString("device_name") + "消耗材料已低于下限，请及时更换。并将系统对应的：" + row.getString("param_name" + "进行维护！");
String Message = row.getString("device_name") + "消耗材料已低于下限，请及时更换。并将系统对应的：" + row.getString("param_name") + "进行维护！";
JSONObject jo = new JSONObject();
jo.put("SendType", "L");
jo.put("Title", "捆扎、贴标预警信息");

18
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java
View File

@@ -5,15 +5,19 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.utils.RedisUtils;
import org.nl.modules.wql.WQL;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.sch.tasks.URLEnum;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
@Slf4j
@Component
@@ -23,7 +27,14 @@ public class AutoQueryDeviceStatus {
private RedisUtils redisUtils;
private final WmsToAcsService wmsToAcsService;
private final RedissonClient redissonClient;
@SneakyThrows
public void run() {
RLock lock = redissonClient.getLock(this.getClass().getName());
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try {
if (tryLock){
for (URLEnum url : URLEnum.values()) {
try {
String product_area = url.getProduct_area();
@@ -64,4 +75,11 @@ public class AutoQueryDeviceStatus {
}
}
}finally {
if (tryLock) {
lock.unlock();
}
}
}
}

18
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java
View File

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
@@ -15,9 +16,12 @@ import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.ext.mes.service.LmsToMesService;
import org.nl.wms.sch.AutoQueryEnum;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Slf4j
@@ -27,7 +31,14 @@ public class AutoQueryProudDayData {
private final LmsToMesService lmsToMesService;
private final RedissonClient redissonClient;
@SneakyThrows
public void run() {
RLock lock = redissonClient.getLock(this.getClass().getName());
boolean tryLock = lock.tryLock(0,600, TimeUnit.SECONDS);
try {
if (tryLock){
JSONObject param = new JSONObject();
JSONArray UserList = new JSONArray();
@@ -53,7 +64,12 @@ public class AutoQueryProudDayData {
// 调用接口
lmsToMesService.proudDayData(param);
}
}catch (Exception e){
if (tryLock) {
lock.unlock();
}
}
}
public JSONObject data() {

19
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java
View File

@@ -7,24 +7,43 @@ import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
@Slf4j
@Component
@RequiredArgsConstructor
public class AutoQueryUpload {
private final RedissonClient redissonClient;
@SneakyThrows
public void run() {
RLock lock = redissonClient.getLock(this.getClass().getName());
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try {
if (tryLock){
//查询已经处于分配中、分配完但还未回传给MES的销售出库单
WQLObject wo = WQLObject.getWQLObject("st_ivt_iostorinv");
JSONArray send_rows = wo.query("bill_type = '1001' AND bill_status IN ( '30', '40' ) AND stor_code = 'AC01' AND upload_mes = '0' AND is_delete = '0'").getResultJSONArray(0);
this.sendInfo(send_rows);
}
}finally {
if (tryLock) {
lock.unlock();
}
}
}
void sendInfo(JSONArray send_rows) {
WQLObject wo = WQLObject.getWQLObject("em_bi_devicestatus");

21
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java
View File

@@ -6,20 +6,31 @@ import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
@Slf4j
@Component
@RequiredArgsConstructor
public class AutoSendFeiShu {
public void run() {
private final RedissonClient redissonClient;
@SneakyThrows
public void run() {
RLock lock = redissonClient.getLock(this.getClass().getName());
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try {
if (tryLock) {
WQLObject wo = WQLObject.getWQLObject("em_bi_devicestatus");
//查询故障了还未发送的
JSONArray send_rows = wo.query("error > '0' AND IFNULL(is_upload,'0') = '0' AND upload_flag = '1'").getResultJSONArray(0);
@@ -29,8 +40,12 @@ public class AutoSendFeiShu {
String resend_time = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("RESEND_TIME").getValue();
JSONArray resend_rows = wo.query("error > '0' AND is_upload = '1' AND upload_flag = '1' AND TIMESTAMPDIFF(MINUTE,upload_time,NOW()) > " + resend_time).getResultJSONArray(0);
this.sendInfo(resend_rows);
}
} finally {
if (tryLock) {
lock.unlock();
}
}
}
void sendInfo(JSONArray device_rows) {

22
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -891,10 +891,10 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
row_map.put("material_code", material_code);
row_map.put("sale_order_name", sale_order_name);
row_map.put("sect_id", sect_id);
row_map.put("flag", "11");
row_map.put("flag", "111");
// 获取系统参数入库到第几层 0-3层都可 1-1层 2-2层 3-3层
String in_layer_num = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("in_layer_num").getValue();
String in_layer_num;
/*
* 判断木箱高度能入第几层：
@@ -923,7 +923,23 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
row_map.put("in_layer_num", in_layer_num);
//查询到当前可用的巷道
JSONArray rowArr = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(row_map).process().getResultJSONArray(0);
JSONArray rowArr2 = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(row_map).process().getResultJSONArray(0);
JSONArray rowArr = new JSONArray();
for (int i = 0; i < rowArr2.size(); i++) {
JSONObject jo = rowArr2.getJSONObject(i);
String block_num = jo.getString("block_num");
String row_num = jo.getString("row_num");
String placement_type = jo.getString("placement_type");
row_map.put("block_num", block_num);
row_map.put("row_num", row_num);
row_map.put("placement_type", placement_type);
row_map.put("flag", "112");
JSONObject row_jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(row_map).process().uniqueResult(0);
int num = row_jo.getIntValue("num");
if (num > 0) {
rowArr.add(jo);
}
}
for (int i = 0; i < rowArr.size(); i++) {
JSONObject row_jo = rowArr.getJSONObject(i);

65
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
View File

@@ -36,6 +36,7 @@
输入.point_code TYPEAS s_string
输入.row_num TYPEAS s_string
输入.block_num TYPEAS s_string
输入.placement_type TYPEAS s_string
输入.sql_str TYPEAS f_string
输入.in_stor_id TYPEAS f_string
输入.in_layer_num TYPEAS f_string
@@ -471,6 +472,70 @@
ENDQUERY
ENDIF
IF 输入.flag = "111"
QUERY
SELECT
count(sa.struct_code) AS num,
sa.block_num,
sa.row_num,
sa.placement_type
FROM
st_ivt_structivt ivt
INNER JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn
LEFT JOIN st_ivt_structattr sa ON sa.struct_code = ivt.struct_code
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
WHERE
sa.sect_id = 输入.sect_id
OPTION 输入.material_code <> ""
mb.material_code = 输入.material_code
ENDOPTION
OPTION 输入.sale_order_name <> ""
sub.sale_order_name = 输入.sale_order_name
ENDOPTION
GROUP BY
sa.block_num,sa.row_num,sa.placement_type
ORDER BY
sa.placement_type desc,num
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "112"
QUERY
SELECT
count(sa.struct_code) AS num,
sa.block_num,
sa.row_num,
sa.placement_type
FROM
st_ivt_structattr sa
WHERE
IFNULL(sa.storagevehicle_code,'') = ''
AND
sa.lock_type = '1'
AND
sa.is_delete = '0'
AND
sa.is_used = '1'
OPTION 输入.in_layer_num <> ""
sa.layer_num in 输入.in_layer_num
ENDOPTION
OPTION 输入.col_num <> ""
sa.layer_num = 输入.col_num
ENDOPTION
OPTION 输入.block_num <> ""
sa.block_num = 输入.block_num
ENDOPTION
OPTION 输入.row_num <> ""
sa.row_num = 输入.row_num
ENDOPTION
OPTION 输入.placement_type <> ""
sa.placement_type = 输入.placement_type
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "12"
QUERY
SELECT

47
lms/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -1,12 +1,12 @@
server:
port: 8013
port: 8011
#配置数据源
spring:
datasource:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms_test2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_tb_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# username: ${DB_USER:root}
username: ${DB_USER:root}
@@ -17,11 +17,11 @@ spring:
# 最小连接数
min-idle: 15
# 最大连接数
max-active: 30
max-active: 220
# 超时时间(以秒数为单位)
remove-abandoned-timeout: 180
# 获取连接超时时间
max-wait: 3000
max-wait: 2000
# 连接有效性检测时间
time-between-eviction-runs-millis: 60000
# 连接在池中最小生存的时间
@@ -45,20 +45,19 @@ spring:
reset-enable: false
filters:
DruidFilter,stat
validation-query-timeout: 5000
# stat:
# enabled: true
# # 记录慢SQL
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: true
# wall:
# config:
# multi-statement-allow: true
# enabled: true
# # 记录慢SQL
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: true
# wall:
# config:
# multi-statement-allow: true
redis:
#数据库索引
database: ${REDIS_DB:14}
host: ${REDIS_HOST:127.0.0.1}
database: ${REDIS_DB:11}
host: ${REDIS_HOST:10.1.3.93}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:}
redisson:
@@ -68,12 +67,10 @@ spring:
singleServerConfig:
connectionMinimumIdleSize: 8
connectionPoolSize: 8
database: 14
address: redis://127.0.0.1:6379
database: 11
address: redis://10.1.3.93:6379
idleConnectionTimeout: 10000
timeout: 3000
# 登录相关配置
login:
# 登录缓存
@@ -114,15 +111,10 @@ jwt:
detect: 1800000
# 续期时间范围，默认1小时，单位毫秒
renew: 3600000
#是否允许生成代码，生产环境设置为false
generator:
enabled: true
#是否开启 swagger-ui
swagger:
enabled: true
# IP 本地解析
ip:
local-parsing: true
@@ -143,7 +135,7 @@ file:
avatarMaxSize: 5
logging:
file:
path: C:\log\wms
path: d:\log\wms
config: classpath:logback-spring.xml
# Sa-Token配置
@@ -164,10 +156,7 @@ sa-token:
is-log: false
jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
# token 前缀
token-prefix: Bearer
token-prefix:
cookie:
# 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
domain:
lucene:
index:
path: D:\lms\lucene\index

37
lms/nladmin-system/src/main/resources/config/application.yml
View File

@@ -19,39 +19,15 @@ spring:
enabledBanner: false # 是否启用 控制台banner，默认true
enabledCollect: true # 是否开启监控指标采集，默认true
collectorTypes: logging # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
logPath: C:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置
logPath: d:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置
monitorInterval: 8
tomcatTp: # tomcat webserver 线程池配置
threadPoolAliasName: tomcat 线程池 # 线程池别名，可选
corePoolSize: 100
maximumPoolSize: 200
corePoolSize: 50
maximumPoolSize: 600
keepAliveTime: 60
runTimeout: 10000
queueTimeout: 100
notifyItems: # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警、拒绝报警、任务超时报警）
- type: change
enabled: true
- type: capacity # 队列容量使用率，报警项类型，查看源码 NotifyTypeEnum枚举类
enabled: true
threshold: 80 # 报警阈值，默认70，意思是队列使用率达到70%告警
interval: 120 # 报警间隔（单位：s），默认120
- type: liveness # 线程池活性
enabled: true
threshold: 80 # 报警阈值，默认 70，意思是活性达到70%告警
- type: reject # 触发任务拒绝告警
enabled: true
threshold: 100 # 默认阈值10
- type: run_timeout # 任务执行超时告警
enabled: true
threshold: 100 # 默认阈值10
- type: queue_timeout # 任务排队超时告警
enabled: true
threshold: 100 # 默认阈值10
#配置 Jpa
jpa:
hibernate:
@@ -90,7 +66,7 @@ rsa:
private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
logging:
file:
path: C:\log\lms
path: d:\log\lms
config: classpath:logback-spring.xml
# sa-token白名单配置
security:
@@ -100,9 +76,6 @@ security:
- /auth/login
- /auth/code
- /auth/logout
# swagger
- /swagger-ui.html
- /swagger-resources/**
- /webjars/**
- /file/**
- /webSocket/**
@@ -183,4 +156,4 @@ jetcache:
port: 6379
lucene:
index:
path: D:\lms\lucene\index
path: D:\log\lms\lucene\index

1
lms/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -14,7 +14,6 @@ https://juejin.cn/post/6844903775631572999
<property name="log.pattern"
value="%black(%contextName-) %X{traceId} %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<springProperty scope="context" name="esIndex" source="es.index"/>
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="${logPath}"/>