zhouz
|
0ff15043b9
|
fix：合并代码后部分SQL不兼容shardingsphereSQL
|
2026-02-04 09:55:30 +08:00 |
|
zhouz
|
2f73c81aaf
|
fix：子卷下线加上事务；一键设置加上dtl_id筛选；任务取消按钮加上权限设置
|
2026-01-06 10:04:46 +08:00 |
|
zhouz
|
4baeae1df6
|
fix：任务查询时间带上时分秒
|
2025-12-23 10:29:56 +08:00 |
|
zhangzq
|
2dfe5f22de
|
Merge remote-tracking branch 'origin/master_merge' into master_1_opt
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java
# lms/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java
# lms/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CellTypeEnum.java
# lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
# lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql
# lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
# lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
# lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
# lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
# lms/nladmin-system/src/main/resources/config/application-dev.yml
# lms/nladmin-system/src/main/resources/config/application-prod.yml
# lms/nladmin-ui/src/views/login.vue
# lms/nladmin-ui/src/views/system/user/index.vue
# lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
# lms/nladmin-ui/src/views/wms/sch/task/index.vue
|
2025-05-22 13:44:35 +08:00 |
|
zhangzq
|
3b60fb6f3a
|
fix:出库下发相同任务号问题
|
2025-04-25 16:45:34 +08:00 |
|
zhangzq
|
3dc4422ebb
|
opt:任务页面默认查询时间改为后2天
|
2025-04-25 14:42:50 +08:00 |
|
zhangzq
|
3fe7c822b4
|
Merge remote-tracking branch 'origin/master_1' into one_rebuild_dev
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
|
2025-04-01 14:14:41 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
015b86db23
|
opt：任务查询优化
|
2025-02-28 11:28:57 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
0d1852f1af
|
opt：优化
|
2025-02-28 11:28:25 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
60d26adbc6
|
opt:提交验箱接口代码，所有回传mes接口增加请求超时时间120s,提交用户页面 部门和角色未回显，提交任务查询优化
|
2025-02-28 10:21:01 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
0796ca073d
|
opt:提交用户页面 部门和角色未回显，提交任务查询优化
|
2025-02-27 19:40:52 +08:00 |
|
|
|
a7d2c0288f
|
rev: 二期内包间改造
|
2025-02-24 17:11:22 +08:00 |
|
|
|
ce84f2ce50
|
add:增加一楼内包间点位移库相关逻辑。
|
2024-12-27 16:14:11 +08:00 |
|
|
|
b533348e65
|
opt:优化装箱最后一个子卷临时计数方式
|
2024-07-14 10:47:49 +08:00 |
|
|
|
dd39ac725a
|
opt:优化装箱区——>待检区送空载具逻辑
|
2024-07-13 23:57:07 +08:00 |
|
|
|
62774053a3
|
fix:增加桁架任务及二次分配任务完成情况校验
|
2024-07-11 19:26:58 +08:00 |
|
|
|
3d34802611
|
rev:内包间页面优化
|
2023-12-25 10:37:47 +08:00 |
|
|
|
61c482a8f4
|
rev:任务查询功能修改
|
2023-07-21 17:04:02 +08:00 |
|
|
|
e06f676081
|
rev:末次下卷、废箔下卷查询空载具逻辑；任务查询新增修改人，创建人
|
2023-06-08 14:39:30 +08:00 |
|
ludj
|
dd7ef7f9ba
|
es集成，去掉loki
|
2023-02-07 17:42:33 +08:00 |
|
ludj
|
fe2e015bd4
|
代码更新
|
2023-01-27 15:14:09 +08:00 |
|
|
|
9201496a12
|
修改
|
2023-01-12 12:06:17 +08:00 |
|
|
|
9be4fb02c4
|
修改
|
2022-12-10 17:01:31 +08:00 |
|
|
|
641c390cd0
|
修改
|
2022-12-10 15:37:44 +08:00 |
|
|
|
26be49dd91
|
修改
|
2022-12-10 13:55:33 +08:00 |
|
|
|
e4df9e20af
|
代码更新
|
2022-11-01 16:18:27 +08:00 |
|
|
|
0ed94f6aaf
|
代码更新
|
2022-10-28 18:27:29 +08:00 |
|
ldj_willow
|
a88e7781bd
|
任务修改
|
2022-10-27 14:28:23 +08:00 |
|
ldj_willow
|
4ff5944d5d
|
任务模块更新
|
2022-10-27 10:32:25 +08:00 |
|
|
|
c61b5e4641
|
初始化
|
2022-10-15 15:31:18 +08:00 |
|
