Commit Graph

1139 Commits

Author SHA1 Message Date
chenjianan
a6082d08cc conflict 2019-06-14 08:18:40 +08:00
chenjianan
a374ea5c8d 采购 2019-06-14 08:15:57 +08:00
caoxinyu
8b9c1033da 样式Bug 2019-06-13 17:28:50 +08:00
caoxinyu
94dd09f38b 获取userId 2019-06-13 17:00:08 +08:00
caoxinyu
11a383ff2d 样式修改 2019-06-13 16:36:47 +08:00
caoxinyu
25f25190f8 Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-06-13 16:18:20 +08:00
caoxinyu
71a8fc9c65 全局样式更改 2019-06-13 16:18:04 +08:00
liushuai
e16123282b Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-13 15:15:43 +08:00
liushuai
a884db8082 更新 2019-06-13 15:15:29 +08:00
chenjianan
3124baa9d7 采购库存 2019-06-13 11:11:51 +08:00
zhangdingyu
2c4709dcde eslint 2019-06-13 10:54:52 +08:00
zhangdingyu
195fc311ab 采购0613 2019-06-13 10:53:33 +08:00
zhangdingyu
58c30a0c88 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-12 14:34:44 +08:00
zhangdingyu
7cfd5d5500 加工顺序调整按工艺计划流水号查 2019-06-12 14:33:14 +08:00
liushuai
53efe87a0d 外协 2019-06-11 19:19:02 +08:00
liushuai
9ed1720c3c 更新 2019-06-10 20:06:09 +08:00
liushuai
ab0eec8d73 更新 2019-06-10 20:00:12 +08:00
jiangfuzhuang
de437e03e2 零件数量维护修改 2019-06-10 09:41:35 +08:00
jiangfuzhuang
19782c037a Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-06-06 09:05:40 +08:00
jiangfuzhuang
c1d4a5ffb0 零件维护20190606 2019-06-06 09:05:25 +08:00
liushuai
9381072e5f Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-05 19:14:37 +08:00
liushuai
ab53ae8430 更新 2019-06-05 19:14:30 +08:00
chenjianan
13d9ed148a 加工进度查询 2019-06-05 11:04:40 +08:00
chenjianan
c9a53c6049 离线税率 2019-06-05 09:41:08 +08:00
chenjianan
054352fb3c fixed bug 2019-06-04 18:17:34 +08:00
chenjianan
08724c5a46 采购合同税率 2019-06-04 18:13:43 +08:00
chenjianan
9a4416cdf4 合同显示机床组 2019-06-04 17:50:00 +08:00
chenjianan
ba5580b3d7 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-04 15:18:47 +08:00
chenjianan
d77a06e03f 物料出库 2019-06-04 15:16:41 +08:00
liushuai
6899948339 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-04 10:46:06 +08:00
liushuai
0178681961 更新 2019-06-04 10:46:01 +08:00
chenjianan
b68621185b Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-04 10:45:20 +08:00
chenjianan
6ead830f93 基本件领料 2019-06-04 10:45:11 +08:00
liushuai
cc31326251 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-03 19:08:55 +08:00
liushuai
d9039fb218 更新 2019-06-03 19:08:48 +08:00
caoxinyu
a513a64ab0 机床总图上传 2019-06-03 19:07:52 +08:00
jiangfuzhuang
667b14bdda Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-06-03 15:31:49 +08:00
jiangfuzhuang
18aa5deefc 质检查询修改_20190603 2019-06-03 15:31:33 +08:00
chenjianan
4b4dfde48f Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-03 14:58:37 +08:00
chenjianan
93f93e6df2 物料出库 2019-06-03 14:58:28 +08:00
zhangdingyu
f02b9b05bd Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-06-03 13:38:03 +08:00
zhangdingyu
51eab613a2 合并投产 2019-06-03 13:35:41 +08:00
chenjianan
8091c16cf3 物料出库 2019-06-03 11:28:35 +08:00
chenjianan
ae5e36932c 物料出库 2019-06-03 09:13:42 +08:00
liushuai
35e1cea879 更新 2019-06-03 08:28:01 +08:00
liushuai
1fb5cc67b3 更新 2019-06-03 08:26:55 +08:00
jiangfuzhuang
b1dde5a24d Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-06-02 15:00:26 +08:00
jiangfuzhuang
5711aeb852 质检修改——20190602 2019-06-02 15:00:14 +08:00
caoxinyu
178c440bdc bug修改 2019-06-02 14:54:33 +08:00
caoxinyu
91243e43ef Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-06-02 14:52:10 +08:00