Commit Graph

Select branches

Hide Pull Requests

aps

aps_0613

aps_0918

bei_fen备份

bf_lms_2

device_fix

feature/msyql集群

feature/opt_24_0103

feature/sanxian_acs_1213

feature/sanxian_lms_0219

feature/sanxianacs1213

feature/三线需求_818

master

master2

Mono Color

• 3de19fcecb Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-29 19:39:13 +08:00
• ffafaa3c19 rev:半成品出入库修改 ZHOUZ\Noble'lift 2023-05-29 19:39:08 +08:00
• 602baf8ba1 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-29 19:23:45 +08:00
• 4c87d68f92 rev:取消任务 zhangzhiqiang 2023-05-29 19:23:23 +08:00
• 9add7774cd add 双工位AGV日志 gengby 2023-05-29 18:34:59 +08:00
• 8330f8d482 rev:调度代码优化 zhangzhiqiang 2023-05-29 18:23:00 +08:00
• 4d30da76de Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-29 17:13:31 +08:00
• d093d6723d rev：修改调度代码 zhangzhiqiang 2023-05-29 17:13:24 +08:00
• 3e0277b43e add: 成品损益 liuxy 2023-05-29 17:05:45 +08:00
• 3144e5f746 add:成品出库手动分配 liuxy 2023-05-29 15:46:27 +08:00
• 3f05a84731 达到： zhangzhiqiang 2023-05-29 13:45:58 +08:00
• 6a34558299 rev:修改调度 zhangzhiqiang 2023-05-29 13:23:28 +08:00
• 1c3905141f rev:手持登入接口位置更改 zhangzhiqiang 2023-05-29 13:06:39 +08:00
• 298b5b1e1d rev:工单报工 zhangzhiqiang 2023-05-29 13:02:05 +08:00
• 27f8851f5d rev:工单前端报工 zhangzhiqiang 2023-05-29 13:00:33 +08:00
• 9ae43259e3 rev:冲突处理 zhangzhiqiang 2023-05-29 12:15:59 +08:00
• 5ef00cf5ce rev:代码合并 liuxy 2023-05-29 10:49:49 +08:00
• 973425d6a8 rev:解决冲突 ZHOUZ\Noble'lift 2023-05-29 10:24:49 +08:00
• 6053f4046b 合并冲突 liuxy 2023-05-29 09:21:44 +08:00
• 67ac4ee276 rev：冲突解决 liuxy 2023-05-29 09:12:44 +08:00
• 49c47631d7 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-29 08:58:58 +08:00
• 83508f5176 add:新增原材料损溢功能 ZHOUZ\Noble'lift 2023-05-29 08:48:11 +08:00
• 09057be3f2 add:修改调度任务代码 zhangzhiqiang 2023-05-27 16:27:02 +08:00
• b0e0012939 rev:工单一体机功能 zhangzhiqiang 2023-05-27 09:42:51 +08:00
• ce6f695e02 rev ： 出入库修改 liuxy 2023-05-26 18:25:02 +08:00
• 90d0544de9 rev:修改BUG ZHOUZ\Noble'lift 2023-05-26 16:31:01 +08:00
• effd8d5c79 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-26 16:29:08 +08:00
• 40ec3496ff rev：新增原材料盘点、损溢；老车间包装 ZHOUZ\Noble'lift 2023-05-26 16:24:02 +08:00
• 5dc0a51695 add: 出库强制确认 liuxy 2023-05-26 15:56:06 +08:00
• ce340a9951 rev 反馈mes取放倒完成 gengby 2023-05-26 15:53:03 +08:00
• 17880e035d rev: 出入库界面修改 liuxy 2023-05-26 09:39:21 +08:00
• 51513aaeea fix：代码修复 liuxy 2023-05-25 22:13:55 +08:00
• cc15c50bbf fix: 代码修复 liuxy 2023-05-25 21:42:15 +08:00
• 8e624a40ce rev: 合并代码 liuxy 2023-05-25 20:57:29 +08:00
• 0cf19a531f Merge branch 'master' of http://121.40.234.130:8899/root/hl_one liuxy 2023-05-25 20:40:39 +08:00
• 65822e1864 rev : 出库分配 liuxy 2023-05-25 20:38:18 +08:00
• db98481387 REV 修改 gengby 2023-05-25 19:56:34 +08:00
• 1d2acd6d16 Merge remote-tracking branch 'origin/master' bei_fen备份 zhangzhiqiang 2023-05-25 19:45:27 +08:00
• 87ca2d32d6 add:修改调度任务代码 zhangzhiqiang 2023-05-25 19:44:48 +08:00
• 22d4222e1f add 智能车间 gengby 2023-05-25 19:38:31 +08:00
• 021c4462af Merge branch 'master' of http://121.40.234.130:8899/root/hl_one USER-20220102CG\noblelift 2023-05-25 19:27:35 +08:00
• f73fdf49e6 add 老车间包装 USER-20220102CG\noblelift 2023-05-25 19:27:14 +08:00
• f530e6d7b4 add: 生产订单 liuxy 2023-05-25 14:58:35 +08:00
• b8da36f71b rev:生产调度修改 zhangzhiqiang 2023-05-25 10:32:38 +08:00
• 84ecbf0b83 rev:库存更新，入库确认 liuxy 2023-05-24 20:05:05 +08:00
• 1ce759c718 rev:生产调度相关 zhangzhiqiang 2023-05-24 09:42:52 +08:00
• db5c1de411 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-24 09:33:18 +08:00
• b022401963 rev:原材料出入库修改 ZHOUZ\Noble'lift 2023-05-24 09:33:14 +08:00
• f581a3c4d1 rev: 代码错乱修改 liuxy 2023-05-24 09:28:14 +08:00
• bdf18b0dc3 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one liuxy 2023-05-24 09:27:51 +08:00
• d5d4f74b5c rev: 代码错乱修改 liuxy 2023-05-24 09:27:37 +08:00
• 13dbaca2ba rev ndc执行状态 gengby 2023-05-23 17:30:24 +08:00
• 25075b9fcd rev:新增工序调度 zhangzhiqiang 2023-05-23 16:21:14 +08:00
• ffdcba0faf add:新增订单扩展信息维护 ZHOUZ\Noble'lift 2023-05-23 14:01:37 +08:00
• 68a84a305a Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-23 13:57:40 +08:00
• 38feec1324 rev:新增老车间工单下发和打印功能 ZHOUZ\Noble'lift 2023-05-23 13:57:20 +08:00
• 98f976a16f Merge branch 'master' of http://121.40.234.130:8899/root/hl_one USER-20220102CG\noblelift 2023-05-23 12:26:43 +08:00
• 2eba078ddb add 老车间包装线驱动 USER-20220102CG\noblelift 2023-05-23 12:26:30 +08:00
• ba72c43ab6 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-23 10:15:03 +08:00
• 47fe472739 rev:配置文件改外网 zhangzhiqiang 2023-05-23 10:14:08 +08:00
• b3349b313f rev： 代码合并 liuxy 2023-05-23 09:47:34 +08:00
• 4289769961 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-22 16:58:53 +08:00
• f2a4fcb105 add:调度线路 zhangzhiqiang 2023-05-22 16:57:43 +08:00
• 6ccc8bd551 rev:修改缓存线异常处理功能 ZHOUZ\Noble'lift 2023-05-22 12:42:44 +08:00
• a229ccd9f8 rev:修改缓存线异常盘点功能 ZHOUZ\Noble'lift 2023-05-22 12:28:21 +08:00
• dbf6773d47 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-21 17:24:08 +08:00
• 089a45b978 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-21 17:19:18 +08:00
• f01cf7bc98 fix:修改缓存线异常处理相关功能 ZHOUZ\Noble'lift 2023-05-21 17:19:12 +08:00
• 6ab3264a4d rev:修改缓存线同步接口 zhangzhiqiang 2023-05-21 17:18:28 +08:00
• b5aca2b6a8 add 老车间驱动 USER-20220102CG\noblelift 2023-05-19 17:15:48 +08:00
• 2e691aaef9 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-19 14:56:34 +08:00
• 15c59182aa fix:缓存线异常处理功能 ZHOUZ\Noble'lift 2023-05-19 14:56:18 +08:00
• 9e60ebfbfa add 老车间设备驱动 USER-20220102CG\noblelift 2023-05-18 21:25:04 +08:00
• d07f8d3f41 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-18 19:14:45 +08:00
• 090cd3830e rev：修改调度管理路径 zhangzhiqiang 2023-05-18 19:14:38 +08:00
• e96c97aefd fix 日志 USER-20220102CG\noblelift 2023-05-17 20:47:30 +08:00
• 5bce32c4e9 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-17 17:36:48 +08:00
• 90469ea6ae add:修改工单相关 zhangzhiqiang 2023-05-17 17:36:40 +08:00
• f6abc2cd3e rev 请求标记复位 gengby 2023-05-17 17:27:57 +08:00
• a72caf0a31 rev 修复删除设备报错 分页显示问题 gengby 2023-05-17 17:26:50 +08:00
• 30db992ada add:工单及工单记录 zhangzhiqiang 2023-05-17 15:15:35 +08:00
• a97b32d3a9 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-17 09:54:30 +08:00
• 8026de6ec2 fix:原材料入库 ZHOUZ\Noble'lift 2023-05-17 09:54:26 +08:00
• b5e24c4fa8 add:物料基础 zhangzhiqiang 2023-05-15 20:39:47 +08:00
• cc9f55ace0 add:基础管理/物料分类 zhangzhiqiang 2023-05-15 19:47:30 +08:00
• 9aeff869a6 rev: 成品入库分配修改 liuxy 2023-05-15 11:53:40 +08:00
• 535b1a6b8c rev：仓储基础管理维护 zhangzhiqiang 2023-05-15 11:23:04 +08:00
• 382f8e5503 rev:冲突处理 zhangzhiqiang 2023-05-15 09:53:32 +08:00
• 0bb532221b rev:冲突解决 liuxy 2023-05-15 09:39:46 +08:00
• 0f6b643ed3 rev:冲突处理 liuxy 2023-05-15 09:37:42 +08:00
• bad9c80a5f Merge branch 'master' of http://121.40.234.130:8899/root/hl_one liuxy 2023-05-15 09:34:39 +08:00
• eb1d33da9d rev: 代码提交 liuxy 2023-05-15 09:29:48 +08:00
• a097053f14 解决冲突 ZHOUZ\Noble'lift 2023-05-15 09:23:47 +08:00
• 577c8ee65d Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-15 09:23:08 +08:00
• 27454e664e add:新增原材料入库功能 ZHOUZ\Noble'lift 2023-05-15 09:11:58 +08:00
• 4b3cba9ff2 add:入库分配 liuxy 2023-05-15 08:58:59 +08:00
• 474df3f5d8 add:添加仓库记录表服务/修改仓库基础数据服务 zhangzhiqiang 2023-05-15 00:27:04 +08:00
• 4895d08d02 Merge remote-tracking branch 'origin/master' baoge 2023-05-12 11:12:15 +08:00
• 36fa3dfd95 fix:出入库枚举修改 ZHOUZ\Noble'lift 2023-05-11 16:48:25 +08:00
• 0e6913243c Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-11 16:19:22 +08:00