Commit Graph

75 Commits

Author SHA1 Message Date
chenjianan
ee11a01ff3 物料管理:新增模块 2018-11-24 14:59:22 +08:00
chenjianan
3b61ca7f7a 零件工艺更改:修复零件上下移动不变色 2018-11-24 10:56:07 +08:00
chenjianan
cf37fca1e3 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-24 10:36:18 +08:00
chenjianan
6e1dd7193a 典型工艺维护:分页 2018-11-24 10:35:48 +08:00
liushuai
2c1b39ffa0 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-24 10:23:22 +08:00
liushuai
bbca4d7afc 修改新模块的bug 2018-11-24 10:23:12 +08:00
chenjianan
dd02774695 零件工艺更改:颜色显示及图表 2018-11-24 09:55:33 +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
c3ebbc3c0b 刘帅 2018-11-23 16:37:23 +08:00
liushuai
17c3fe5d91 增加模块 2018-11-23 16:34:20 +08:00
lixin
abb1fe3912 lx 2018-11-23 13:58:46 +08:00
lixin
d79f65b4d7 lx 2018-11-23 13:57:41 +08:00
chenjianan
57eecde546 request 2018-11-23 13:40:26 +08:00
chenjianan
ffd8677bae Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-23 13:38:50 +08:00
liushuai
e8ca1f78a5 Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0 2018-11-23 13:38:19 +08:00
liushuai
eca32011fd 库存盘点 2018-11-23 13:36:53 +08:00
chenjianan
0caada6e58 交换件:交换功能 2018-11-23 13:36:49 +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
chenjianan
da0f79d68e 库存盘点:到货时间入库时间去时分秒 2018-11-23 08:47:07 +08:00
zhangdingyu
27ab43dc1a Merge branch 'zhang' 2018-11-23 08:19:36 +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
zhangdingyu
393e4b6ffd 外协任务执行 2018-11-22 15:45:20 +08:00
zhangdingyu
ba37d5f03d 外协任务执行 2018-11-22 15:30:10 +08:00
chenjianan
fec975dea4 request 2018-11-22 14:20:54 +08:00
chenjianan
0da80da189 第一轮测试采购bug修改 2018-11-22 14:14:38 +08:00
chenjianan
f17ec11ee8 采购合同审批:审批对话框默认选是 2018-11-21 08:46:06 +08:00
chenjianan
bc6dd09a15 采购合同查询:采购员可清 2018-11-21 08:42:40 +08:00
chenjianan
63a4e70419 默认币种必选 2018-11-21 08:41:18 +08:00
lixin
5692d65e57 Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0 2018-11-20 10:54:52 +08:00
lixin
6bd5eb565a lx1120 2018-11-20 10:54:46 +08:00
liushuai
6045632874 修复测试错误 2018-11-20 10:48:34 +08:00
zhangdingyu
109868411a 车间设备管理表格样式 2018-11-20 08:55:04 +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
chenjianan
42159275c3 解决冲突input按钮 2018-11-19 17:10:21 +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
d4816a97bd 领用核算:加领用时间 2018-11-19 14:47:28 +08:00
chenjianan
257da27106 离线合同:明细小计NaN;离线合同请款:取消请款禁用 2018-11-19 14:29:03 +08:00