Commit Graph

58 Commits

Author SHA1 Message Date
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
hedekun
cc3424a2f2 装箱单修改 2018-11-27 13:57:32 +08:00
lixin
0ba4e6d735 lx 2018-11-26 17:29:48 +08:00
zhangdingyu
49b1d072e4 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 2018-11-26 14:25:40 +08:00
zhangdingyu
d861f2af7a 合同收款计划 2018-11-26 14:10:51 +08:00
chenjianan
134badc4bf Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-26 11:10:20 +08:00
chenjianan
b86d3b1a99 发票交接单:接收人部门改财务部 2018-11-26 11:09:56 +08:00
liushuai
7272cd671d Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-26 10:37:59 +08:00
liushuai
bd052a9dd5 成组配套 2018-11-26 10:37:47 +08:00
lixin
5874fb3477 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 2018-11-24 16:20:33 +08:00
lixin
1415470cd2 lx 2018-11-24 16:20:21 +08:00
chenjianan
ee11a01ff3 物料管理:新增模块 2018-11-24 14:59:22 +08:00
chenjianan
6e1dd7193a 典型工艺维护:分页 2018-11-24 10:35:48 +08:00
zhangdingyu
d1b162fa8e zhang 2018-11-24 08:29:46 +08:00
zhangdingyu
054f3aa03d zhang 2018-11-24 08:24:05 +08:00
liushuai
dc0100bb9b Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-24 08:14:25 +08:00
liushuai
955090fa69 更新 2018-11-24 08:14:12 +08:00
lixin
74b5c3f5fc lx 2018-11-23 17:08:46 +08:00
lixin
c740a9d1d6 lx 2018-11-23 17:04:26 +08:00
liushuai
17c3fe5d91 增加模块 2018-11-23 16:34:20 +08:00
lixin
8042d3416b lx 2018-11-23 13:29:04 +08:00
lixin
fc6495403a lx 2018-11-23 13:23:25 +08:00
chenjianan
3b215d048b 直达件:改查询条件无效,编辑领用者显示编号 2018-11-23 09:48:29 +08:00
chenjianan
a0e238ef01 替换件到货:改查询条件无效 2018-11-23 09:10:48 +08:00
liushuai
6b6c0dfebc Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-22 17:33:47 +08:00
liushuai
718aa524ec 第一轮车间系统修改BUG 2018-11-22 17:33:28 +08:00
chenjianan
fec975dea4 request 2018-11-22 14:20:54 +08:00
chenjianan
0da80da189 第一轮测试采购bug修改 2018-11-22 14:14:38 +08:00
liushuai
6045632874 修复测试错误 2018-11-20 10:48:34 +08:00
caoxinyu
c74dbe89cb cxy 2018-11-19 17:21:30 +08:00
lixin
3993f8b2d7 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 2018-11-19 17:20:07 +08:00
lixin
9b52cb0127 lx 2018-11-19 17:19:41 +08:00
caoxinyu
13c71d9205 lxy 2018-11-19 17:16:56 +08:00
zhangdingyu
7222385e98 color 2018-11-19 16:31:00 +08:00
chenjianan
45d3903a22 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-19 15:10:51 +08:00
chenjianan
fa32b53a6f 离线合同:设置安全库存量 2018-11-19 14:12:27 +08:00
zhangdingyu
59e74eb1a1 11-19 2018-11-19 13:33:23 +08:00