Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• e8b8350e6a lx lixin 2018-11-27 15:47:13 +08:00
• 09cd1828de Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 chenjianan 2018-11-27 15:13:19 +08:00
• ce65fe666d 工艺定额查询：零件投产数量 chenjianan 2018-11-27 15:13:02 +08:00
• f7ed985eac Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 zhangdingyu 2018-11-27 15:08:34 +08:00
• 7c944844e8 外协图标 zhangdingyu 2018-11-27 15:08:08 +08:00
• 65fa2f3372 零件定额制定：已编制保存刷新表 chenjianan 2018-11-27 15:02:20 +08:00
• 28a249f58c 初次投产：对话框宽度 chenjianan 2018-11-27 14:52:40 +08:00
• d1abf9cc4d Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 liushuai 2018-11-27 14:39:13 +08:00
• 03a1e50fa1 刘帅 liushuai 2018-11-27 14:39:00 +08:00
• ac016633fa Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 hedekun 2018-11-27 14:37:49 +08:00
• 7eebfb27fc 处理clearable不起作用的冲突，删除我测试部分，保留曹鑫宇程序 hedekun 2018-11-27 14:37:14 +08:00
• 2a06a9692c 人员管理树 zhangdingyu 2018-11-27 14:20:21 +08:00
• cc3424a2f2 装箱单修改 hedekun 2018-11-27 13:57:32 +08:00
• 30a60e2806 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 zhangdingyu 2018-11-27 09:45:40 +08:00
• 7ceb2cf1af 暂时 zhangdingyu 2018-11-27 09:45:36 +08:00
• e300a31a5e Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 chenjianan 2018-11-27 08:01:02 +08:00
• 57a27ebff6 人员管理 chenjianan 2018-11-27 08:00:41 +08:00
• 112f3f96d3 lx lixin 2018-11-26 21:01:54 +08:00
• e1d15ef309 lx lixin 2018-11-26 17:33:49 +08:00
• 0ba4e6d735 lx lixin 2018-11-26 17:29:48 +08:00
• 0113ef27db 初次投产 生产能力平衡 屏蔽一堆外协 zhangdingyu 2018-11-26 15:59:25 +08:00
• 4c54c82b4a 外协数据维护 zhangdingyu 2018-11-26 15:48:32 +08:00
• 0e225784a4 外协任务执行 zhangdingyu 2018-11-26 15:32:49 +08:00
• 868d6cbe9f 序间外协 zhangdingyu 2018-11-26 15:28:05 +08:00
• 626147f935 外协付款计划 zhangdingyu 2018-11-26 15:21:25 +08:00
• a3c57e141c Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 zhangdingyu 2018-11-26 14:51:25 +08:00
• 192d07afeb Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 lixin 2018-11-26 14:51:50 +08:00
• 67c0b23965 lx lixin 2018-11-26 14:51:37 +08:00
• fb017413c0 外协付款计划 zhangdingyu 2018-11-26 14:50:39 +08:00
• 49b1d072e4 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 zhangdingyu 2018-11-26 14:25:40 +08:00
• d861f2af7a 合同收款计划 zhangdingyu 2018-11-26 14:10:51 +08:00
• a3654b5f36 新增角色工艺定额员 chenjianan 2018-11-26 13:49:03 +08:00
• b30a59c37f Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 chenjianan 2018-11-26 11:32:21 +08:00
• 670a1e20df 新增财务部帐号密码 chenjianan 2018-11-26 11:31:58 +08:00
• 73cc3258b8 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 lixin 2018-11-26 11:20:45 +08:00
• 469deea02b lx bug lixin 2018-11-26 11:20:38 +08:00
• 134badc4bf Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 chenjianan 2018-11-26 11:10:20 +08:00
• b86d3b1a99 发票交接单：接收人部门改财务部 chenjianan 2018-11-26 11:09:56 +08:00
• 7272cd671d Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 liushuai 2018-11-26 10:37:59 +08:00
• bd052a9dd5 成组配套 liushuai 2018-11-26 10:37:47 +08:00
• 94be749d20 lx lixin 2018-11-26 10:34:48 +08:00
• c7b31d3d37 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 lixin 2018-11-24 17:28:49 +08:00
• b7a1a5261b lx lixin 2018-11-24 17:28:22 +08:00
• 81c5e40aa9 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 zhangdingyu 2018-11-24 17:10:01 +08:00
• 55601386f9 车间工艺管理和物料维护bug zhangdingyu 2018-11-24 17:09:43 +08:00
• 5f411fe8a8 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 chenjianan 2018-11-24 17:08:10 +08:00
• 4371cc7b95 物料管理：图标 chenjianan 2018-11-24 17:07:48 +08:00
• 5874fb3477 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 lixin 2018-11-24 16:20:33 +08:00
• 1415470cd2 lx lixin 2018-11-24 16:20:21 +08:00
• 7aabf9cb10 物料管理：import chenjianan 2018-11-24 16:03:30 +08:00
• ee11a01ff3 物料管理：新增模块 chenjianan 2018-11-24 14:59:22 +08:00
• 3b61ca7f7a 零件工艺更改：修复零件上下移动不变色 chenjianan 2018-11-24 10:56:07 +08:00
• cf37fca1e3 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 chenjianan 2018-11-24 10:36:18 +08:00
• 6e1dd7193a 典型工艺维护：分页 chenjianan 2018-11-24 10:35:48 +08:00
• 2c1b39ffa0 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 liushuai 2018-11-24 10:23:22 +08:00
• bbca4d7afc 修改新模块的bug liushuai 2018-11-24 10:23:12 +08:00
• dd02774695 零件工艺更改：颜色显示及图表 chenjianan 2018-11-24 09:55:33 +08:00
• d1b162fa8e zhang zhangdingyu 2018-11-24 08:29:46 +08:00
• 054f3aa03d zhang zhangdingyu 2018-11-24 08:24:05 +08:00
• dc0100bb9b Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 liushuai 2018-11-24 08:14:25 +08:00
• 955090fa69 更新 liushuai 2018-11-24 08:14:12 +08:00
• 74b5c3f5fc lx lixin 2018-11-23 17:08:46 +08:00
• c740a9d1d6 lx lixin 2018-11-23 17:04:26 +08:00
• c3ebbc3c0b 刘帅 liushuai 2018-11-23 16:37:23 +08:00
• 17c3fe5d91 增加模块 liushuai 2018-11-23 16:34:20 +08:00
• abb1fe3912 lx lixin 2018-11-23 13:58:46 +08:00
• d79f65b4d7 lx lixin 2018-11-23 13:57:41 +08:00
• 57eecde546 request chenjianan 2018-11-23 13:40:26 +08:00
• ffd8677bae Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 chenjianan 2018-11-23 13:38:50 +08:00
• e8ca1f78a5 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 liushuai 2018-11-23 13:38:19 +08:00
• eca32011fd 库存盘点 liushuai 2018-11-23 13:36:53 +08:00
• 0caada6e58 交换件：交换功能 chenjianan 2018-11-23 13:36:49 +08:00
• 8042d3416b lx lixin 2018-11-23 13:29:04 +08:00
• fc6495403a lx lixin 2018-11-23 13:23:25 +08:00
• 3b215d048b 直达件：改查询条件无效，编辑领用者显示编号 chenjianan 2018-11-23 09:48:29 +08:00
• a0e238ef01 替换件到货：改查询条件无效 chenjianan 2018-11-23 09:10:48 +08:00
• da0f79d68e 库存盘点：到货时间入库时间去时分秒 chenjianan 2018-11-23 08:47:07 +08:00
• 27ab43dc1a Merge branch 'zhang' zhangdingyu 2018-11-23 08:19:36 +08:00
• 6b6c0dfebc Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 liushuai 2018-11-22 17:33:47 +08:00
• 718aa524ec 第一轮车间系统修改BUG liushuai 2018-11-22 17:33:28 +08:00
• 393e4b6ffd 外协任务执行 zhangdingyu 2018-11-22 15:45:20 +08:00
• ba37d5f03d 外协任务执行 zhangdingyu 2018-11-22 15:30:10 +08:00
• fec975dea4 request chenjianan 2018-11-22 14:20:54 +08:00
• 0da80da189 第一轮测试采购bug修改 chenjianan 2018-11-22 14:14:38 +08:00
• f17ec11ee8 采购合同审批：审批对话框默认选是 chenjianan 2018-11-21 08:46:06 +08:00
• bc6dd09a15 采购合同查询：采购员可清 chenjianan 2018-11-21 08:42:40 +08:00
• 63a4e70419 默认币种必选 chenjianan 2018-11-21 08:41:18 +08:00
• 5692d65e57 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 lixin 2018-11-20 10:54:52 +08:00
• 6bd5eb565a lx1120 lixin 2018-11-20 10:54:46 +08:00
• 6045632874 修复测试错误 liushuai 2018-11-20 10:48:34 +08:00
• 109868411a 车间设备管理表格样式 zhangdingyu 2018-11-20 08:55:04 +08:00
• c74dbe89cb cxy caoxinyu 2018-11-19 17:21:30 +08:00
• 3993f8b2d7 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 lixin 2018-11-19 17:20:07 +08:00
• 9b52cb0127 lx lixin 2018-11-19 17:19:41 +08:00
• 13c71d9205 lxy caoxinyu 2018-11-19 17:16:56 +08:00
• 42159275c3 解决冲突input按钮 chenjianan 2018-11-19 17:10:21 +08:00
• 7222385e98 color zhangdingyu 2018-11-19 16:31:00 +08:00
• 45d3903a22 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 chenjianan 2018-11-19 15:10:51 +08:00
• d4816a97bd 领用核算：加领用时间 chenjianan 2018-11-19 14:47:28 +08:00
• 257da27106 离线合同：明细小计NaN；离线合同请款：取消请款禁用 chenjianan 2018-11-19 14:29:03 +08:00