Commit Graph

544 Commits

Author SHA1 Message Date
chenjianan
6f874098b2 创建采购合同:写入数据库 2018-12-10 19:55:41 +08:00
lixin
d765fe373f Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-10 19:44:29 +08:00
lixin
d34718411c lx part out 2018-12-10 19:44:21 +08:00
liushuai
e65183a40c Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-10 19:42:13 +08:00
liushuai
4581c2db7a 零件导入,零件分配,车间采购系统 2018-12-10 19:42:03 +08:00
caoxinyu
dcc4fbb5f7 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-10 19:34:51 +08:00
caoxinyu
5b3b0cb1b9 合同收款计划修改 2018-12-10 19:34:43 +08:00
chenjianan
ae7678bed2 创建采购合同 2018-12-10 17:22:16 +08:00
chenjianan
3b39773f9a Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-10 16:12:31 +08:00
chenjianan
167a69f685 采购任务分配;创建询价单 2018-12-10 16:12:09 +08:00
caoxinyu
3a5fce2632 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-08 18:36:35 +08:00
caoxinyu
bb7ff9a940 创建合同与合同收款计划更改 2018-12-08 18:36:28 +08:00
lixin
c97e6c1e9d Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-08 17:57:52 +08:00
lixin
4a65c762a3 离线物料请购 2018-12-08 17:57:45 +08:00
chenjianan
3cfd0aa067 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-08 17:45:42 +08:00
chenjianan
e055d3cb2e 采购任务分配:重新调整 2018-12-08 17:45:25 +08:00
zhangdingyu
640998ae37 零件定额制定 2018-12-08 14:20:37 +08:00
chenjianan
39a0b8ef13 创建采购合同 2018-12-08 14:17:52 +08:00
zhangdingyu
5b7b8b80cd 零件状态查询 2018-12-08 11:02:24 +08:00
lixin
edc0d229f8 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-07 19:09:48 +08:00
lixin
4b3fbca55b lx 2018-12-07 19:09:41 +08:00
liushuai
081758df73 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-07 18:58:31 +08:00
liushuai
3fed67dec1 零件导入、整改件导入 2018-12-07 18:58:24 +08:00
caoxinyu
fcc2935bf8 创建合同流程更改 2018-12-07 16:01:00 +08:00
caoxinyu
82f45f4389 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-06 19:55:07 +08:00
caoxinyu
b73e85447f 创建合同修改BUG 2018-12-06 19:54:59 +08:00
zhangdingyu
ab1380147d 加工进度查询删备注 2018-12-06 17:11:04 +08:00
zhangdingyu
a374973e1d 考核部门编号 2018-12-06 14:45:40 +08:00
zhangdingyu
4c4d7d00a6 车间工艺管理 2018-12-06 12:11:11 +08:00
liushuai
e0a43ab773 创建采购合同和零件导入 2018-12-05 20:13:56 +08:00
lixin
bfc1d51934 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-05 20:11:35 +08:00
liushuai
60fd944851 创建采购合同和零件导入 2018-12-05 20:09:23 +08:00
liushuai
d74e75eff9 创建采购合同部分和零件导入 2018-12-05 20:05:28 +08:00
caoxinyu
628ec49496 人员管理 2018-12-05 20:03:10 +08:00
lixin
1d2b9c52a9 lx inventory inboundscanning 2018-12-05 19:55:15 +08:00
lixin
fa3c525088 lx 2018-12-04 14:07:45 +08:00
liushuai
495f746ea2 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-30 13:41:07 +08:00
liushuai
6dbe7817de 将车间采购分为基本件和外购件两张表 2018-11-30 13:40:47 +08:00
zhangdingyu
eb3fd0b573 外协任务查询 2018-11-30 11:43:00 +08:00
zhangdingyu
228f104c0f 序间外协和预算项目机床分组 2018-11-29 16:24:46 +08:00
zhangdingyu
50e7969b1b 序间外协项目机床分组 2018-11-29 14:30:28 +08:00
lixin
f04395cfb8 lx 2018-11-29 14:25:40 +08:00
lixin
da9c1d7e2d Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 2018-11-28 13:46:37 +08:00
lixin
0db893e78f lx 2018-11-28 13:46:30 +08:00
chenjianan
52741c03d7 领用核算:去分页 2018-11-28 10:57:02 +08:00
zhangdingyu
f44978bfc7 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 2018-11-27 17:54:47 +08:00
zhangdingyu
795c35f23d 加工进度修改 2018-11-27 17:54:26 +08:00
lixin
c3758ec048 lx 2018-11-27 17:38:59 +08:00
lixin
7606764c28 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 2018-11-27 15:47:20 +08:00
hedekun
7eebfb27fc 处理clearable不起作用的冲突,删除我测试部分,保留曹鑫宇程序 2018-11-27 14:37:14 +08:00