root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,399 Commits 1 Branch 0 Tags
f36891047d1acc3f7e24e7d2dbc15bf3748ead0e
Commit Graph

1399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tuqiang
f36891047d rev 内包间行架 2023-11-09 10:02:16 +08:00
tuqiang
293906cdb5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls
 2023-11-09 09:58:00 +08:00
tuqiang
205798ad6e fix 2023-11-09 09:56:53 +08:00
liuxy
61ed74e4ae rev：成品报废审核修改 2023-11-08 19:02:50 +08:00
yanps
46463e7b65 opt: 纸管库,套管工位驱动优化 2023-11-08 17:30:33 +08:00
liuxy
7b142f95c4 add: 新增成品报废审核功能 2023-11-07 16:10:19 +08:00
tuqiang
78a4a4d6bd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
#	acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
#	acs/nladmin-ui/src/views/acs/device/config.vue
 2023-11-07 13:39:36 +08:00
tuqiang
fa1a3a4e68 fix 2023-11-07 12:37:07 +08:00
yanps
d5c2a0bd3e 套管工位驱动 2023-11-07 11:07:49 +08:00
tuqiang
cf9213eab4 add:新增内包间行架驱动 2023-11-07 11:01:34 +08:00
yanps
4d53aaaf4e 纸管库和套管工位驱动 2023-11-07 10:57:10 +08:00
yanps
2e634be0ce 纸管库和套管工位驱动编写 2023-11-07 10:47:16 +08:00
USER-20220102CG\noblelift
82c46653e6 rev 新增任务字段 2023-11-03 14:32:40 +08:00
USER-20220102CG\noblelift
84d12e41dd add 新增lms接口 2023-11-03 13:50:17 +08:00
USER-20220102CG\noblelift
772a6e8efa add 新增纸管库驱动 2023-11-02 11:24:39 +08:00
USER-20220102CG\noblelift
b5cd16b295 rev 信号下发 2023-10-31 16:02:14 +08:00
ZHOUZ\Noble'lift
d3063b472b Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-31 09:31:00 +08:00
ZHOUZ\Noble'lift
aef28f43fe dev:并发问题修改、数字孪生新增接口 2023-10-31 09:30:48 +08:00
tuqiang
737dbd336e add:对烘箱对接位添加允许强制进入功能 2023-10-26 18:31:01 +08:00
USER-20220102CG\noblelift
75cea7fe40 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-26 17:17:35 +08:00
USER-20220102CG\noblelift
7740a8bbad rev 行架任务校验 2023-10-26 17:17:13 +08:00
liuxy
3e75d99207 rev：合并 2023-10-26 17:07:30 +08:00
liuxy
f88200f2bd Merge branch 'master_reform' 2023-10-26 17:06:08 +08:00
liuxy
0c466793ba rev: 限制木箱高度 2023-10-26 17:00:54 +08:00
liuxy
384872d687 rev：立库改造、入库分配逻辑修改、移库逻辑修改 2023-10-25 08:58:23 +08:00
USER-20220102CG\noblelift
98c7717fcc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-24 10:11:35 +08:00
USER-20220102CG\noblelift
c7fd9d892d rev ndc链接 2023-10-24 10:10:57 +08:00
ZHOUZ\Noble'lift
7caf22fff3 Merge branch 'package-dev' 2023-10-23 18:04:53 +08:00
ZHOUZ\Noble'lift
c9f85aa08b dev:报表优化、入库加并发锁 2023-10-23 17:50:13 +08:00
USER-20220102CG\noblelift
9224b0d07c rev 修复任务指令内存问题 2023-10-19 11:28:09 +08:00
ZHOUZ\Noble'lift
b8c9688018 dev:分支推送 2023-10-19 09:46:00 +08:00
ZHOUZ\Noble'lift
4018922b9b rev:测试 2023-10-19 09:28:32 +08:00
ZHOUZ\Noble'lift
e650ea273a rev:新增二期区域、查询优化 2023-10-18 14:32:29 +08:00
liuxy
1d9f35dded rev：是、出入库导出修改 2023-10-17 08:57:49 +08:00
liuxy
f9c6c5e35e rev：导出维护字段销售订单、行号 2023-10-16 17:35:12 +08:00
ZHOUZ\Noble'lift
ee17bd9b32 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-16 17:29:43 +08:00
ZHOUZ\Noble'lift
c9447c29a7 dev:修改明细查询BUG 2023-10-16 17:29:34 +08:00
liuxy
98e39369f4 add：新增海亮二期仓库入库 2023-10-13 16:18:05 +08:00
ZHOUZ\Noble'lift
f37290339c Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-13 16:14:44 +08:00
ZHOUZ\Noble'lift
e1aa85bcb6 rev:报表优化 2023-10-13 16:14:36 +08:00
张江玮
740d859f34 add 桁架 x y 轴信号 2023-10-09 18:13:09 +08:00
张江玮
c5a061454f add 烘箱桁架 分切桁架 行走行信号 2023-10-09 10:40:16 +08:00
ZHOUZ\Noble'lift
1dd02f0195 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-08 17:46:27 +08:00
ZHOUZ\Noble'lift
b3f59428ee dev:改切出库支持多条明细推送，幅宽精度显示优化 2023-10-08 17:46:14 +08:00
USER-20220102CG\noblelift
914c20932e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-10-07 08:46:10 +08:00
USER-20220102CG\noblelift
130928b672 rev 直管库 2023-10-07 08:45:31 +08:00
ZHOUZ\Noble'lift
29a4c41723 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-09-28 22:14:49 +08:00
ZHOUZ\Noble'lift
e26c48f355 rev:大屏修改 2023-09-28 22:14:41 +08:00
ZHOUZ\Noble'lift
52a2a04427 rev:报表优化 2023-09-28 22:14:16 +08:00
liuxy
ac30120460 rev：1.立库监控新增空托盘监控 2.调拨同步接口支持多条明细 2023-09-27 15:59:50 +08:00