Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 08608e45d8 rev：刻字满料请求/空框请求 zhangzhiqiang 2023-06-27 08:42:41 +08:00
• a92101cea6 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-06-26 16:07:34 +08:00
• fcee4db153 rev:质检模块和原材料入库优化 zhouz 2023-06-26 16:07:29 +08:00
• a3ee247657 rev：半成品仓储 liuxy 2023-06-26 16:00:03 +08:00
• 50bd42e7d1 rev：工单页面修改 ludj 2023-06-26 14:53:48 +08:00
• a9547de830 rev 出缓存线数量 gengby 2023-06-26 14:30:31 +08:00
• 8543e7b152 rev: 工单管理、任务管界面列优化 ludj 2023-06-26 14:23:38 +08:00
• bebc124f64 add：供应商关系 zhangzhiqiang 2023-06-26 08:55:38 +08:00
• 4c2d84ce83 rev:销售单同步 zhangzhiqiang 2023-06-26 08:53:44 +08:00
• bec170a530 rev:sap同步销售单 zhangzhiqiang 2023-06-26 08:50:08 +08:00
• cb78d9a38b add：原材料、半成品、成品 库存变动记录页面 liuxy 2023-06-25 21:13:57 +08:00
• 2c4b10ab3a add：原材料、半成品、成品插入库存变动记录 liuxy 2023-06-25 17:13:46 +08:00
• d958afb7b9 rev:修改质检主表、明细字段 ZHOUZ\Noble'lift 2023-06-25 15:21:28 +08:00
• f06ce83052 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-25 14:56:23 +08:00
• 44ed1da408 rev:质检模块 ZHOUZ\Noble'lift 2023-06-25 14:56:13 +08:00
• c576f04413 rev:新增质检模块 ZHOUZ\Noble'lift 2023-06-25 09:01:56 +08:00
• a7851ee375 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-06-24 19:06:58 +08:00
• d9125962b2 add:刻字缓存物料维护/物料信息 zhangzhiqiang 2023-06-24 19:05:54 +08:00
• 9f1a982a63 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-06-21 18:51:42 +08:00
• b4cfd1aa59 rev:添加质检功能 zhouz 2023-06-21 18:51:35 +08:00
• 854abe73e1 rev：半成品任务反馈 liuxy 2023-06-21 17:26:56 +08:00
• e582ed1c2b rev：界面优化 liuxy 2023-06-20 20:41:06 +08:00
• f02f3e063e fix：成品出入库 liuxy 2023-06-20 17:31:02 +08:00
• 1c60718e8c REV 单工NDC gengby 2023-06-20 16:44:00 +08:00
• 865fbe58f4 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-06-20 15:13:30 +08:00
• d6db26be23 rev:个人中心问题修改 zhouz 2023-06-20 15:13:24 +08:00
• 4612ce74f5 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-06-20 13:46:38 +08:00
• b810cf6399 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-20 11:17:24 +08:00
• 450ee548e2 add:新增质检基础模块 ZHOUZ\Noble'lift 2023-06-20 11:17:18 +08:00
• 7464ba067c add: 班组对应人员、人员对应设备 liuxy 2023-06-20 11:04:46 +08:00
• 1f52add7c4 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-06-20 08:40:15 +08:00
• cea8a12506 rev:基础功能维护修改 zhouz 2023-06-20 08:40:08 +08:00
• d8dbcd1a1f add:工单导入 zhangzhiqiang 2023-06-19 18:58:37 +08:00
• 9f43b2af47 rev: 成品、半成品任务反馈修改 liuxy 2023-06-19 18:33:52 +08:00
• d794da7662 add:刻字机叫料功能 zhangzhiqiang 2023-06-19 13:46:31 +08:00
• 001665e7a5 rev： 半成品出入库 add：半成品库存 liuxy 2023-06-17 16:11:48 +08:00
• 804ecd9b74 rev： 成品出入库修改 liuxy 2023-06-17 09:24:46 +08:00
• 3b1e1a7194 rev 清洗上料 gengby 2023-06-16 16:15:00 +08:00
• edc2f84199 rev 监控显示信息 gengby 2023-06-16 09:36:56 +08:00
• 20ab356de0 rev: 成品入库修改 liuxy 2023-06-16 08:49:44 +08:00
• caa6ce91b2 rev:安全库存、库区维护 zhouz 2023-06-15 16:56:52 +08:00
• c38f0157bb Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-06-15 15:12:24 +08:00
• 6c15d50550 rev:修改安全库存 zhouz 2023-06-15 15:12:15 +08:00
• db61e9afde Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-15 14:20:20 +08:00
• e0844386d6 rev:代码优化 ZHOUZ\Noble'lift 2023-06-15 14:20:12 +08:00
• 391a6a11ba add ndc反馈smart200驱动 gengby 2023-06-14 20:26:48 +08:00
• dfa30f5b1b rev：任务下发 liuxy 2023-06-14 16:25:12 +08:00
• 7fa9b634be rev: 初始化货位、成品出入库超限货位处理 liuxy 2023-06-14 09:53:33 +08:00
• 5ee636414a add:导入工单添加错误文件提醒 zhangzhiqiang 2023-06-14 08:45:38 +08:00
• e87527d7f7 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-13 17:11:16 +08:00
• 1a47064b23 rev:提交审核刷新页面，导入excel的时候将错误信息导出到excel中 ZHOUZ\Noble'lift 2023-06-13 17:10:49 +08:00
• 8d1f012a36 rev:工单显示字段 zhangzhiqiang 2023-06-13 15:12:16 +08:00
• 33d3de5b53 rev:修改报工审核 zhangzhiqiang 2023-06-13 14:59:26 +08:00
• 5d8a28be7e 解决冲突 ZHOUZ\Noble'lift 2023-06-13 11:21:32 +08:00
• 28cfc1b6d0 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-13 11:21:20 +08:00
• 9fa3e9b9a8 rev：半成品出库优化 ZHOUZ\Noble'lift 2023-06-13 11:20:20 +08:00
• afe0866aed rev 分页、下发plc两次 gengby 2023-06-13 09:39:26 +08:00
• 531f9780e1 rev：修改工单页面crud zhangzhiqiang 2023-06-13 08:58:04 +08:00
• b375c67792 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-06-13 08:56:07 +08:00
• bb460c3582 Merge remote-tracking branch 'origin/master' baoge 2023-06-12 16:24:16 +08:00
• 628cf17dff rev：成品出入库作业任务 liuxy 2023-06-12 14:58:52 +08:00
• dd5cd32d4b rev:任务列表维护 zhangzhiqiang 2023-06-09 21:24:40 +08:00
• 594eede6ce add 取消指令清除phase值 gengby 2023-06-09 19:33:51 +08:00
• 32fd5187ad rev:调度：深坑物料维护 zhangzhiqiang 2023-06-09 12:49:19 +08:00
• 911a61a5e0 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-06-09 12:48:13 +08:00
• 756a2daf34 REV 专机设备、缓存线 gengby 2023-06-08 18:32:55 +08:00
• 75f210ff5d Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-06-08 16:45:43 +08:00
• b237b67f6b rev:深坑相关 zhangzhiqiang 2023-06-08 16:44:43 +08:00
• 2292512476 rev:工单导入/缓存线物料更新 zhangzhiqiang 2023-06-08 14:54:25 +08:00
• 105e5d52e9 rev：深坑设备物料页面报错修改 liuxy 2023-06-08 09:56:15 +08:00
• 4d446905da rev:深坑设备页面修改 zhangzhiqiang 2023-06-07 17:42:48 +08:00
• a68d2e323e rev:工单导入/缓存线物料更新 zhangzhiqiang 2023-06-07 17:18:45 +08:00
• fedd0a093d Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-06-07 17:17:15 +08:00
• 29012daacd add:添加深坑设备物料修改 zhangzhiqiang 2023-06-06 19:33:09 +08:00
• 1d52b58d6a fix：盘点完成清除任务号 jiaoliming 2023-06-06 17:38:15 +08:00
• ce9e6e80a8 rev 缓存线反馈 gengby 2023-06-06 17:31:00 +08:00
• 4d90435ce8 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one jiaoliming 2023-06-06 17:28:18 +08:00
• ee2b98ff01 Revert "fix:" jiaoliming 2023-06-06 17:27:03 +08:00
• 4fed94c420 fix: jiaoliming 2023-06-06 17:24:29 +08:00
• 70e84ce4da add：成品库存 liuxy 2023-06-06 17:20:33 +08:00
• ae846b5fd6 rev： 盘点任务下发 liuxy 2023-06-05 15:29:52 +08:00
• 28ae81907d rev: 出入库任务修改 liuxy 2023-06-05 11:11:47 +08:00
• bc5c3361ab rev：盘点下发 liuxy 2023-06-03 11:44:51 +08:00
• 8b235687d5 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-03 11:30:46 +08:00
• f0bb0cc61a rev:盘点任务下发修改 ZHOUZ\Noble'lift 2023-06-03 11:30:41 +08:00
• c744a4cd91 rev：代码合并 liuxy 2023-06-03 11:16:38 +08:00
• fbdc29915d Merge branch 'master' of http://121.40.234.130:8899/root/hl_one liuxy 2023-06-03 11:15:51 +08:00
• 95b33ac5d4 rev ： 出入库下发任务 liuxy 2023-06-03 11:15:39 +08:00
• a5fd09c00c rev:任务下发 ZHOUZ\Noble'lift 2023-06-03 11:14:49 +08:00
• 88f543c843 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-03 09:56:23 +08:00
• 1e9ed26ac9 rev:新增任务下发 ZHOUZ\Noble'lift 2023-06-03 09:56:18 +08:00
• 35dc93da32 rev 缓存线、专机取放货条件更改 gengby 2023-06-02 14:35:57 +08:00
• 52eb2c1832 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-06-02 11:47:53 +08:00
• c2b304c318 add:深坑物料管理 zhangzhiqiang 2023-06-02 11:47:13 +08:00
• 4f50d81d6f add:成品入库取消组盘 liuxy 2023-06-02 10:47:40 +08:00
• ec1d38b7aa rev: 半成品损溢载具物料关系维护 liuxy 2023-06-01 16:14:38 +08:00
• 1717c5aaa1 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-01 16:04:50 +08:00
• eca2958d47 rev:盘点修改 ZHOUZ\Noble'lift 2023-06-01 16:04:46 +08:00
• 534476914b rev : 半成品损溢 liuxy 2023-06-01 15:09:43 +08:00
• affbc9a481 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-06-01 15:07:57 +08:00