Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 69f4e2dadf feat: 废箔搬运业务2 liyongde 2024-08-15 15:29:20 +08:00
• dea0260141 feat: 废箔搬运业务 liyongde 2024-08-15 15:26:00 +08:00
• 518e3ea3df feat: 管芯出入库、子卷下线、货梯状态修改 liyongde 2024-08-14 16:19:50 +08:00
• 33c0f8d98a feat: 包重命名与挪动 liyongde 2024-08-13 14:04:54 +08:00
• 2b16f760d0 feat: 分切上料 liyongde 2024-08-13 13:46:26 +08:00
• f6ce731385 feat: 烘烤确定的业务 liyongde 2024-08-12 13:52:28 +08:00
• 62ab422c30 Merge commit 'd0101952d209bd43e2791f4062882f80a666cd9d' liyongde 2024-08-09 18:04:44 +08:00
• 8da7bf48fc feat: 烘箱业务 liyongde 2024-08-09 18:04:07 +08:00
• d0101952d2 fix: lucene打印 liyongde 2024-08-09 18:03:17 +08:00
• a511dfea4d Merge commit '4db3a16a3691082d42c5e1b8ef3bc11a265081f0' liyongde 2024-08-09 15:05:27 +08:00
• 5bb5ae2b98 feat: 合并nl-admin，新增生箔、烘箱业务 liyongde 2024-08-09 15:04:37 +08:00
• 4db3a16a36 fix: 定时任务无法启动 liyongde 2024-08-09 15:03:04 +08:00
• 153dcb1964 fix: 日志查看页面优化 liyongde 2024-08-08 09:22:20 +08:00
• fcbe8c92ed fix: lucene打印配置 liyongde 2024-08-07 20:04:22 +08:00
• 5be507e458 fix: 日志记录转换成Druid的打印日志 liyongde 2024-08-07 19:10:23 +08:00
• 5009ff59c9 fix: test liyongde 2024-08-07 18:58:08 +08:00
• 01bd8257af add: 手持生箔呼叫空辊、下料 liyongde 2024-08-07 18:52:39 +08:00
• d3f5aa4f19 fix: DruidFilter记录日志 liyongde 2024-08-06 20:26:11 +08:00
• 9a8395f4b6 fix: 初步维护主体框架 liyongde 2024-08-06 16:13:20 +08:00
• 1c05806c3f Merge commit '931bb1270b1e28800cb719e098aa238a513fe167' liyongde 2024-08-06 13:42:31 +08:00
• 0436248fef fix: 新增车间区域管理 liyongde 2024-08-06 13:40:45 +08:00
• 931bb1270b rev: 去除jetcache, 新增达梦测试 liyongde 2024-08-06 13:38:52 +08:00
• bf7a271f1a Add 'lms2/' from commit 'c4a92a9d11b9076dac1e03df7e71cac00625c5ec' liyongde 2024-08-05 20:20:21 +08:00
• 7df70b07be fix: 暂存 liyongde 2024-08-05 20:18:24 +08:00
• 4dcd5b555a fix: 日志管理 liyongde 2024-08-01 15:54:11 +08:00
• 34e858987a init: 初始化龙电项目 from 兰州二期 liyongde 2024-08-01 13:16:42 +08:00
• e03b604a28 Add 'lms/' from commit 'c09c67e44448a20112c7eb9b0d6932c6f05a931b' liyongde 2024-08-01 11:04:27 +08:00
• fbe1cc4ea2 fix: 开发 lishuai 2024-08-01 10:51:17 +08:00
• c09c67e444 add:增加子卷质检判断 gongbaoxiong 2024-08-01 10:01:03 +08:00
• b46c6dba76 rev：入库异常任务下发托盘号 liuxy 2024-08-01 09:15:22 +08:00
• eb085ca093 add:增加手持装箱接口 gongbaoxiong 2024-07-31 18:53:02 +08:00
• f97bffd478 add:增加手持装箱接口 gongbaoxiong 2024-07-31 18:34:36 +08:00
• 502260e12d rev：找相同规格的空木箱修改 liuxy 2024-07-31 18:22:06 +08:00
• 9118043048 add：一期新增接口：飞送通知LMS木箱是否通过 liuxy 2024-07-31 18:14:48 +08:00
• 076ef25531 fix:修复查询订单号异常 gongbaoxiong 2024-07-31 16:11:58 +08:00
• 3de0fdbaf8 opt:优化补空载具优先级 gongbaoxiong 2024-07-31 15:21:45 +08:00
• 2cc00c2c06 opt: 1.子卷装箱增加子卷质检生成包装关系，去除临时包装关系； 2.修改最后一个子卷判断方式； 3.恢复装箱毛重推送，优化装箱页面； gongbaoxiong 2024-07-31 13:53:18 +08:00
• 66d23ee832 fix:分切上料AGV也添加允许放货动作 zhouz 2024-07-31 12:34:26 +08:00
• cf91b0f94d opt:优先取待检区取空载具 gongbaoxiong 2024-07-31 11:43:11 +08:00
• fd528f4109 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-31 09:39:24 +08:00
• 7907a8493c fix：对接位分配查询优化 zhouz 2024-07-31 09:38:45 +08:00
• c100af51e3 fix：一期子卷包装页面新增【是否入库】查询条件 liuxy 2024-07-30 17:50:26 +08:00
• 6ccd09a395 fix:新增打印黑名单，以及定时器日志打印 zhouz 2024-07-30 14:58:23 +08:00
• 024d00bd37 fix:AOP添加接口日志 zhouz 2024-07-30 13:55:55 +08:00
• 2525a8955e fix:接口日志维护 zhouz 2024-07-30 13:50:38 +08:00
• a3e76a311b Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-30 13:49:18 +08:00
• ba0da58ab2 fix:空木箱入库校验优化 zhouz 2024-07-30 13:48:38 +08:00
• 35265bf34d rev：给acs下发立库区域 liuxy 2024-07-30 10:51:31 +08:00
• 2184d29840 rev：下发ACS给任务类型明细，用于ACS做页面展示 liuxy 2024-07-29 16:11:36 +08:00
• 9794e5a590 add：二期虚拟区发货 liuxy 2024-07-29 14:12:26 +08:00
• cd53d3de73 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-29 11:14:46 +08:00
• 991292e727 fix:空木箱入库校验优化 zhouz 2024-07-29 11:14:34 +08:00
• 51b66ce359 rev：异常任务 liuxy 2024-07-28 19:19:51 +08:00
• 8b13bf5639 rev：回滚 liuxy 2024-07-28 13:51:01 +08:00
• d6cfc99365 rev：退货入库行架任务 liuxy 2024-07-28 11:30:31 +08:00
• c9bda79981 rev：入库类型判断 liuxy 2024-07-27 14:42:00 +08:00
• ea62fbeb6a rev：异常口入库 liuxy 2024-07-27 13:29:29 +08:00
• ead1f87a7d rev：异常入库 liuxy 2024-07-26 18:01:27 +08:00
• 970e6c3cd2 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-26 15:53:54 +08:00
• 3e104b11f2 fix:退货入库桁架优化 zhouz 2024-07-26 15:53:42 +08:00
• 0c064bb559 rev：异常任务处理 liuxy 2024-07-26 15:38:24 +08:00
• 1c1a7eb3d0 rev：木箱出库 liuxy 2024-07-26 12:37:59 +08:00
• 099cf07656 rev：异常任务 liuxy 2024-07-25 17:54:42 +08:00
• d4cf8d09d6 rev：如果是返检出库或者改切出库则不捆扎 liuxy 2024-07-25 15:51:51 +08:00
• 4f267d6e33 rev：木箱出库 liuxy 2024-07-25 12:11:53 +08:00
• 9addae9065 rev：空木箱入库高度 liuxy 2024-07-25 09:28:26 +08:00
• 808f0c0738 feat：控制人工分切工单左右卷带来的问题 liyongde 2024-07-24 18:58:27 +08:00
• d0674f6ffb Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-24 15:31:56 +08:00
• 8f70ad21e4 feat：追加日志、上单下单取消报错、改切工单母卷检测 liyongde 2024-07-24 15:31:38 +08:00
• cf1ec61e51 add：异常口出库 liuxy 2024-07-24 15:15:38 +08:00
• 8459f52a6f feat：手持提示下一个套好纸管的气胀轴位置以及对应子卷信息 liyongde 2024-07-24 13:42:22 +08:00
• cf62dbe85c feat：添加日志描述 liyongde 2024-07-24 11:21:51 +08:00
• 5bf31101b1 fix: 空集合过滤 liyongde 2024-07-23 22:28:09 +08:00
• d9fd64d144 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-23 19:02:31 +08:00
• b4f28a15cd fix: 工单显示重量 liyongde 2024-07-23 19:02:20 +08:00
• d75f17c7ad rev：子卷装箱：根据子卷号带出木箱料号 liuxy 2024-07-23 14:25:05 +08:00
• 2809297f74 fix:删除部分不需要文件 zhouz 2024-07-23 14:12:15 +08:00
• 8ebf74f6ca fix:MES相关接口修改、空木箱入库校验 zhouz 2024-07-23 14:11:38 +08:00
• 7f7e0b35cd add: 手持备货区管理 liyongde 2024-07-23 13:46:59 +08:00
• 2995e10beb add: 手持备货区管理 liyongde 2024-07-23 13:25:19 +08:00
• ed14ab3723 add: 手持备货区管理 liyongde 2024-07-23 10:13:30 +08:00
• 4309424e3f rev：木箱库存 liuxy 2024-07-23 10:04:21 +08:00
• f38295279e rev：二期出库重量修改 liuxy 2024-07-23 09:23:22 +08:00
• ab9967fe87 rev：修改 liuxy 2024-07-22 18:49:23 +08:00
• 2fb86740c9 Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge liuxy 2024-07-22 18:48:54 +08:00
• 991ee8d86b rev：二期入库 liuxy 2024-07-22 18:48:41 +08:00
• 2b9dd14bf8 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-22 18:45:19 +08:00
• 64b70c1dd6 opt: 自动任务添加日志 liyongde 2024-07-22 18:45:04 +08:00
• eff3a1f585 rev：二期入库 liuxy 2024-07-22 18:42:19 +08:00
• d1a0ad4234 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-22 17:47:03 +08:00
• 1cdf3ee430 opt: 手持下任务校验 liyongde 2024-07-22 17:46:47 +08:00
• fb77c78ea6 fix：二期改切计划审核 liuxy 2024-07-22 17:10:37 +08:00
• 4f27e7c1dc add: 木箱库存查询 liuxy 2024-07-22 14:19:36 +08:00
• b97e38307e Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-22 11:14:46 +08:00
• 3ec71dc051 fix: leftjoin的空值问题 liyongde 2024-07-22 11:13:45 +08:00
• 361407a5e4 rev：调拨出库 liuxy 2024-07-22 11:03:58 +08:00
• 9977b2cee6 fix: 手持暂存查询新增禁用提示、内包间气胀轴回暂存库校验终点 liyongde 2024-07-22 09:56:00 +08:00
• 0719a5b90f fix: 送气胀轴加个锁 liyongde 2024-07-21 20:31:48 +08:00
• 1923c5303a opt:增加取货完成信号校验，任务添加队列日志记录 gongbaoxiong 2024-07-21 18:18:39 +08:00
• bf5ec5c605 fix: 手持暂存下料修改 liyongde 2024-07-20 17:42:38 +08:00