zhangzq
|
3dc4422ebb
|
opt:任务页面默认查询时间改为后2天
|
2025-04-25 14:42:50 +08:00 |
|
zhangzq
|
76c3eaed4a
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-04-25 14:41:48 +08:00 |
|
|
|
c57096181e
|
fix: 过滤失败
|
2025-04-25 14:09:26 +08:00 |
|
zhangzq
|
783e8635f9
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-04-25 14:00:30 +08:00 |
|
|
|
14ea6df2c0
|
fix: 防止ACS校验重复载具号
|
2025-04-24 14:53:57 +08:00 |
|
|
|
000241fda5
|
fix: 工具类恢复
|
2025-04-21 16:35:31 +08:00 |
|
|
|
5f8180b844
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-04-21 16:22:37 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
a57bb4b5cc
|
opt:优化出库
|
2025-04-21 15:47:32 +08:00 |
|
|
|
843dc6bcad
|
fix: 工具类恢复
|
2025-04-21 13:19:45 +08:00 |
|
|
|
9c31fa27c5
|
fix: 任务类修改
|
2025-04-21 13:16:14 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
97522dbef6
|
opt:优化登录页面
|
2025-04-21 10:56:48 +08:00 |
|
|
|
ab6d97e945
|
opt: acs工具允许BLK区域下发
|
2025-04-18 15:48:57 +08:00 |
|
|
|
7256afda39
|
opt: 内包间改造
|
2025-04-18 10:12:29 +08:00 |
|
|
|
8b5bfab361
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-04-17 12:12:48 +08:00 |
|
|
|
d27446b48f
|
rev：1.新增管控单据备注不能为空2.库存导出新增是否管控字段
|
2025-04-17 09:17:33 +08:00 |
|
|
|
f5285e2148
|
rev:1.推送区域库存不查询管控的库存2.成品库存增加是否管控查询条件3.出库单新增不允许新增管控出库类型的出库单
|
2025-04-15 15:49:55 +08:00 |
|
|
|
83bcb92bc9
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-04-15 12:16:57 +08:00 |
|
|
|
28afaef7ea
|
add：1.库存管控2.管控查询3.相关逻辑处理
|
2025-04-11 09:10:38 +08:00 |
|
|
|
bbabedb55b
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-04-10 19:49:48 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
fb32cfcff1
|
opt:维护木箱类型和干燥剂数量
|
2025-04-10 18:38:56 +08:00 |
|
|
|
e7edd573b4
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-04-05 14:07:56 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
8e226357d1
|
opt:优化任务更新
|
2025-04-03 16:06:12 +08:00 |
|
zhangzq
|
caf6dc4666
|
Merge remote-tracking branch 'origin/one_rebuild_dev' into master_1
|
2025-04-03 13:05:33 +08:00 |
|
zhangzq
|
8d567ad924
|
Merge branch 'one_rebuild_dev' into master_1
|
2025-04-03 13:04:29 +08:00 |
|
|
|
c3245cb69c
|
rev: 去除任务数量校验
|
2025-04-03 09:47:06 +08:00 |
|
|
|
a1a4ad1bae
|
opt: 下卷排序与延时
|
2025-04-01 22:29:11 +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 |
|
zhangzq
|
a86874f82e
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-04-01 10:51:50 +08:00 |
|
|
|
706384b824
|
fix: 呼叫套轴计数
|
2025-03-31 18:41:31 +08:00 |
|
|
|
370716346a
|
fix: 管芯库启用
|
2025-03-30 19:19:00 +08:00 |
|
|
|
4d94c58a6b
|
fix: 调试中出现的问题3
|
2025-03-30 15:26:17 +08:00 |
|
|
|
867e99bd23
|
fix: 调试中出现的问题2
|
2025-03-29 14:37:02 +08:00 |
|
|
|
9e9be28e8d
|
rev：时间字段
|
2025-03-14 10:54:14 +08:00 |
|
zhangzq
|
78aadca1ec
|
Merge remote-tracking branch 'origin/master_1' into master_1
|
2025-03-14 10:14:30 +08:00 |
|
|
|
65ce55dc67
|
rev：前端字段显示问题
|
2025-03-14 10:10:52 +08:00 |
|
|
|
ee6bec05eb
|
rev:增加创建时间，字段优化
|
2025-03-14 10:08:05 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
965a9bda2b
|
opt：调度操作判断当前IP是否是调度Ip
|
2025-03-13 18:43:44 +08:00 |
|
zhangzq
|
a0ccb2c3cb
|
fix:木箱出库时存在移库任务将出库锁释放
|
2025-03-13 13:40:11 +08:00 |
|
|
|
f8081c4949
|
fix: 调试中出现的问题
|
2025-03-09 18:02:15 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
e866a25708
|
opt:优化烘箱提示
|
2025-03-07 10:22:18 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
0f2a9e635b
|
opt：优化出库查询页面打印导出excel
|
2025-03-06 16:56:45 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
002b9550a9
|
opt:优化任务更新代码
|
2025-03-06 13:21:48 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
793fdc62db
|
opt:删除任务定时器更新
|
2025-03-03 16:24:10 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
86475e7bf9
|
opt:手持入库确认只查 询该木箱是否存在未完成的入库单
|
2025-03-01 11:29:55 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
015b86db23
|
opt：任务查询优化
|
2025-02-28 11:28:57 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
60d26adbc6
|
opt:提交验箱接口代码，所有回传mes接口增加请求超时时间120s,提交用户页面 部门和角色未回显，提交任务查询优化
|
2025-02-28 10:21:01 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
e54878bbe8
|
opt:优化前端查询
|
2025-02-26 13:05:33 +08:00 |
|
|
|
a7d2c0288f
|
rev: 二期内包间改造
|
2025-02-24 17:11:22 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
99e74eca0b
|
opt:后台校验箱号
|
2025-02-24 15:53:51 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
316b697fc5
|
opt:修改用户页面没自动分页问题
|
2025-02-24 10:06:50 +08:00 |
|
