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

Revert "rev:修改结构"

Browse Source 
This reverts commit 1ee9d736
This commit is contained in:
zhangzhiqiang
2023-05-04 20:40:53 +08:00
parent 2f8b55fe06
commit 234d2337d8
8 changed files with 10 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java
View File

@@ -69,9 +69,6 @@ public enum StatusEnum {
IOS_CREATE("01","生成",""),
IOS_RUNNING("02","执行中",""),
IOS_FINISH("99","完成",""),
//载具超限
OVERSTRUCT_STANDARD("1","标准",""),
OVERSTRUCT_LIMIT("2","超限",""),
;
private String code;

3
mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
View File

@@ -8,7 +8,6 @@ import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
/*
* @author ZZQ
@@ -22,7 +21,7 @@ public class RedissonUtils {
* @param seconds 尝试获取锁的等待时间,允许为空
*/
@SneakyThrows
public static void lock(LockProcess process, String key, Integer seconds){
public static void lock(LockProcess process, String key, Integer seconds){
RedissonClient redissonClient = SpringContextHolder.getBean(RedissonClient.class);
RLock lock = redissonClient.getLock(key);
boolean isLock;

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls
View File

Binary file not shown.

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
View File

@@ -32,8 +32,12 @@ import java.util.Map;
@Slf4j
@SaIgnore
public class AcsToWmsController {
private final AcsToWmsService acsToWmsService;
private final WashMachineryTask washMachineryTask;
@Autowired
private AcsToWmsService acsToWmsService;
@Autowired
private TaskScheduleService taskScheduleService;
@Autowired
private WashMachineryTask washMachineryTask;
@PostMapping("/apply")
@Log("ACS给WMS发送任务")

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/stivt.xls
View File

Binary file not shown.

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/sch_point.wql
View File

@@ -96,7 +96,7 @@
sch_base_point
LEFT JOIN pdm_bi_device ON sch_base_point.device_code = pdm_bi_device.device_code
LEFT JOIN sch_base_task ON sch_base_point.point_code = point_code2 and task_status<7
WHERE sch_base_point.lock_type = '0' and is_used = '1'
WHERE 1=1 and (task_status is null or task_status>=7) and point_type = '4'
OPTION 输入.region_code <> ""
sch_base_point.region_code = 输入.region_code
ENDOPTION
@@ -167,7 +167,7 @@
sch_base_point.*
from sch_base_point
left JOIN sch_base_task ON sch_base_point.point_code = point_code2 and task_status < 7
where sch_base_point.lock_type = '0' and is_used = '1'
where lock_type = '0' and is_used = '1'
OPTION 输入.region_code <> ""
sch_base_point.region_code = 输入.region_code
ENDOPTION

112
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_IVT_STORPUBLIC.wql
View File

@@ -1,112 +0,0 @@
[交易说明]
交易名：
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.struct_id TYPEAS s_string
输入.material_id TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.quality_scode TYPEAS s_string
输入.storagevehicle_code TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
QUERY
SELECT
ivt.*
FROM
st_ivt_structivt ivt
LEFT JOIN st_ivt_structattr point ON point.struct_id = ivt.struct_id
WHERE
1=1
OPTION 输入.struct_id <> ""
ivt.struct_id = 输入.struct_id
ENDOPTION
OPTION 输入.material_id <> ""
ivt.material_id = 输入.material_id
ENDOPTION
OPTION 输入.pcsn <> ""
ivt.pcsn = 输入.pcsn
ENDOPTION
OPTION 输入.quality_scode <> ""
ivt.quality_scode = 输入.quality_scode
ENDOPTION
OPTION 输入.storagevehicle_code <> ""
point.vehicle_code = 输入.storagevehicle_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "2"
QUERY
SELECT
ivt.*
FROM
st_ivt_structivt ivt
LEFT JOIN st_ivt_structattr point ON point.struct_id = ivt.struct_id
WHERE
1=1
OPTION 输入.struct_id <> ""
ivt.struct_id = 输入.struct_id
ENDOPTION
OPTION 输入.material_id <> ""
ivt.material_id = 输入.material_id
ENDOPTION
OPTION 输入.pcsn <> ""
ivt.pcsn = 输入.pcsn
ENDOPTION
OPTION 输入.quality_scode <> ""
ivt.quality_scode = 输入.quality_scode
ENDOPTION
OPTION 输入.storagevehicle_code <> ""
point.storagevehicle_code = 输入.storagevehicle_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_IVT_PRODUCTIN_01.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_PRODUCTIN_01.wql
View File

@@ -22,7 +22,6 @@
输入.bill_code TYPEAS s_string
输入.iostorinvdtl_id TYPEAS s_string
输入.iostorinv_id TYPEAS s_string
输入.product_code TYPEAS s_string
[临时表]
@@ -81,10 +80,6 @@
bill_code LIKE 输入.bill_code
ENDOPTION
OPTION 输入.product_code <> ""
product_code = 输入.product_code
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
@@ -125,8 +120,7 @@
mater.material_code,
mater.material_name,
mater.material_spec,
point.point_code,
'' as overstruct_type
point.point_code
FROM
ST_IVT_IOStorInvDis dis
LEFT JOIN sch_base_point point ON point.point_id = dis.point_id