Commit Graph

740 Commits

Author SHA1 Message Date
caoxinyu
93f67706fd Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-03-26 18:11:09 +08:00
caoxinyu
f94d46abc2 边框颜色修改 2019-03-26 18:10:48 +08:00
zhangdingyu
65f3f8bb03 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-26 17:07:17 +08:00
zhangdingyu
8266a64bbe 工时统计 2019-03-26 17:07:13 +08:00
zhangdingyu
e567e52a2a 工时统计 2019-03-26 16:59:56 +08:00
caoxinyu
0f3cb85531 Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-03-26 16:59:25 +08:00
caoxinyu
f85ecfdbae 入库 2019-03-26 16:59:06 +08:00
liushuai
26c97e85f6 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-26 14:10:53 +08:00
liushuai
e0c4dd2d79 更新 2019-03-26 14:10:47 +08:00
caoxinyu
4a0af4301f Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-03-26 13:46:55 +08:00
chenjianan
6593847443 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-26 13:45:16 +08:00
chenjianan
41306060d0 fix bug 2019-03-26 13:45:08 +08:00
chenjianan
196494dcd2 fix bug 2019-03-26 13:37:03 +08:00
zhangdingyu
192c01b750 加工进度查询 2019-03-26 08:50:28 +08:00
zhangdingyu
b39213762e Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-25 17:25:00 +08:00
zhangdingyu
0261b5c008 加工进度修改 2019-03-25 17:17:01 +08:00
chenjianan
66d9617596 fix bug 2019-03-25 16:26:47 +08:00
chenjianan
018b75a070 常用符号 2019-03-25 15:10:09 +08:00
chenjianan
bb840b93eb fix bug 2019-03-25 12:10:23 +08:00
chenjianan
7dab8f0a3c fix bug 2019-03-25 11:59:18 +08:00
chenjianan
8c403d467a style 2019-03-25 11:44:11 +08:00
chenjianan
60c5fe518e Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-25 11:06:08 +08:00
chenjianan
2b0a4398cb style 2019-03-25 11:05:57 +08:00
zhangdingyu
a3d40e3cb2 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-25 10:26:11 +08:00
zhangdingyu
d020a1c61c Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-25 10:25:58 +08:00
zhangdingyu
9887fbf94b 外协预算 2019-03-25 10:25:54 +08:00
liushuai
2096e2aa6d 更新 2019-03-25 10:25:49 +08:00
chenjianan
6bc14761a4 领用加机床分组 2019-03-25 09:22:03 +08:00
chenjianan
094844015f Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-23 18:00:47 +08:00
chenjianan
275284f157 fix bug 2019-03-23 18:00:39 +08:00
zhangdingyu
8728bd6f5a 备料出库 2019-03-23 13:57:47 +08:00
zhangdingyu
b3f68a0ff7 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-22 16:40:03 +08:00
zhangdingyu
d552e15945 工时统计 2019-03-22 16:39:49 +08:00
chenjianan
2ccc8201d7 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-22 16:20:51 +08:00
chenjianan
8b13214ce6 fix bug 2019-03-22 16:20:42 +08:00
zhangdingyu
42a5bf3fd7 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-22 15:49:38 +08:00
zhangdingyu
3ad5167b71 加工工时统计 2019-03-22 15:49:23 +08:00
chenjianan
3e6de911bc fix bug 2019-03-22 15:45:29 +08:00
chenjianan
e34ca5c9b0 Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-22 14:57:55 +08:00
chenjianan
0cf71d09bd fix bug 2019-03-22 14:57:50 +08:00
zhangdingyu
822839a57d 加工工时 2019-03-22 14:29:20 +08:00
zhangdingyu
ce58c66936 工时统计 2019-03-22 14:25:41 +08:00
zhangdingyu
b16fd0351a Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-22 14:00:44 +08:00
zhangdingyu
c0969a4fc3 工时统计 2019-03-22 14:00:40 +08:00
chenjianan
51f386e77b fix bug 2019-03-21 11:09:29 +08:00
chenjianan
68da683c1e fix bug 2019-03-21 10:24:01 +08:00
chenjianan
7cce2dc7b4 fix bug 2019-03-20 19:16:33 +08:00
chenjianan
d1900a6e3a Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0 2019-03-20 19:10:10 +08:00
chenjianan
ab1fb142ee fix bug 2019-03-20 19:10:02 +08:00
caoxinyu
0a24438234 Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0 2019-03-20 19:06:34 +08:00