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

fix 前端页面

Browse Source
This commit is contained in:
张江玮
2023-04-19 09:08:00 +08:00
parent f255c44516
commit 3054a90c9c
16 changed files with 123 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,13 +183,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Transactional(rollbackFor = Exception.class)
public JSONObject apply(JSONObject param) {
String point_code = param.getString("device_code");
if (StrUtil.isBlank(point_code)) {
throw new BadRequestException("点位不能为空！");
}
String type = param.getString("type");
if (StrUtil.isBlank(type)) {
throw new BadRequestException("任务类型不能为空！");
}
if (StrUtil.isBlank(point_code)) {
throw new BadRequestException("点位不能为空！");
}
RLock lock = redissonClient.getFairLock("acs_to_wms:" + point_code);
boolean try_lock = false;
String task_code = null;

8
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
View File

@@ -69,17 +69,17 @@
find_in_set( ShiftOrder.order_status, 输入.order_status)
ENDOPTION
OPTION 输入.begin_time <> ""
ShiftOrder.planproducestart_date >= 输入.begin_time
ShiftOrder.realproducestart_date >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
ShiftOrder.planproduceend_date <= 输入.end_time
ShiftOrder.realproduceend_date <= 输入.end_time
ENDOPTION
OPTION 输入.produceorder_code <> ""
ShiftOrder.produceorder_code like 输入.produceorder_code
ShiftOrder.workorder_code like 输入.produceorder_code
ENDOPTION
OPTION 输入.material <> ""
(
material.material_code like '%' 输入.material '%'
material.material_code like 输入.material
)
ENDOPTION
ENDSELECT

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

@@ -10,6 +10,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.task.AcsTaskDTO;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@@ -25,11 +26,13 @@ import java.util.List;
* @created 2020年6月12日 下午5:53:28
*/
public abstract class AbstractAcsTask {
/**
* @discription 在如果任务无法形成会一直定时刷新判断
* @author ldjun
* @created 2020年6月12日 下午5:55:25
*/
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
public List<AcsTaskDTO> schedule() {
this.autoCreate();
this.findStartPoint();

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

@@ -13,6 +13,7 @@ import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.task.AcsTaskDTO;
import org.reflections.Reflections;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java
View File

@@ -7,11 +7,9 @@ import lombok.RequiredArgsConstructor;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.basedata.eum.VehicleType;
import org.nl.wms.sch.manage.*;
import org.nl.wms.sch.task.util.TaskUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author zhangjiangwei

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.

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

@@ -6,9 +6,9 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lnsh_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lnsh_lms3}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:P@ssw0rd}
password: ${DB_PWD:123456}
# 初始连接数
initial-size: 5
# 最小连接数