Commit Graph

46 Commits

Author SHA1 Message Date
weihongyang
76f4ea9ae9 1.工艺管理,创建工艺,工序添加完物料后,再点击工序编辑,里面的物料和之前添加的不一样bug修改 2020-02-25 15:27:00 +08:00
weihongyang
8fc89909db Merge branch 'master' of https://git.picaiba.com/mengtong/mt-pms-api into weihongyang 2020-01-16 16:07:34 +08:00
weihongyang
3d11e761bd 工艺管理测试修改 2020-01-16 16:07:22 +08:00
何勇
f158de959a Merge branch 'weihongyang' of mengtong/mt-pms-api into master 2020-01-16 10:08:37 +08:00
hy2250089
ae7bb481cc 加工单物料批量更新 2020-01-16 09:32:18 +08:00
weihongyang
0e1eae73bc Merge branch 'master' of https://git.picaiba.com/mengtong/mt-pms-api into weihongyang 2020-01-15 14:26:21 +08:00
weihongyang
7eaa4d08e6 commit init 2020-01-15 14:24:13 +08:00
hy2250089
297cbaa591 工艺管理产品下拉框修改 2020-01-13 11:12:13 +08:00
CaiXiangs
d7b946365b Merge branch 'caixiang' of mengtong/mt-pms-api into master 2020-01-12 14:29:56 +08:00
CaiXiang
73e26d234e Merge branch 'master' of https://git.picaiba.com/mengtong/mt-pms-api into caixiang 2020-01-12 14:26:36 +08:00
CaiXiang
ee7431504b mark 2020-01-12 14:26:22 +08:00
CaiXiangs
fdb5bd9618 Merge branch 'caixiang' of mengtong/mt-pms-api into master 2020-01-10 15:06:06 +08:00
CaiXiang
4e7e52f7b9 Merge branch 'master' of https://git.picaiba.com/mengtong/mt-pms-api into caixiang
 Conflicts:
	.idea/workspace.xml
2020-01-10 15:04:30 +08:00
CaiXiang
d0e5e205ce mark 2020-01-10 14:44:04 +08:00
hy2250089
f19647144c 物料管理前端对接修改bug 2020-01-09 17:07:40 +08:00
hy2250089
9e12f2d898 物料管理测试修改2:按照日期降序查询、编写删除物料接口 2020-01-08 14:51:21 +08:00
hy2250089
19490a5a2a 物料管理测试修改1:列表查询日期降序、删除物料及相关信息修改 2020-01-07 21:56:39 +08:00
hy2250089
957a7ac495 保存加工单接口修改,新增其他服务接口调用 2020-01-06 17:10:51 +08:00
何勇
d65b3113a6 Merge branch 'weihongyang' of mengtong/mt-pms-api into master 2020-01-06 17:08:41 +08:00
weihongyang
02e8142b7f 更新bug 2020-01-06 16:53:07 +08:00
何勇
1499b845f4 Merge branch 'weihongyang' of mengtong/mt-pms-api into master 2020-01-06 09:00:37 +08:00
weihongyang
e376194e1d Merge branch 'master' of https://git.picaiba.com/mengtong/mt-pms-api into weihongyang 2020-01-03 10:27:21 +08:00
weihongyang
a7a4df7db1 增加产品bom字段 2020-01-03 10:27:02 +08:00
hy2250089
3c2c78c72a 批次加工单、工序处理接口初步完成 2020-01-02 19:19:21 +08:00
hy2250089
d73f450488 物料用量计算 2020-01-02 16:36:57 +08:00
hy2250089
5bece0b46d 批次加工单、工序详情查看、处理接口修改 2020-01-02 16:13:56 +08:00
hy2250089
0ad2fce92d Merge branch 'hy2250089' of git.picaiba.com:mengtong/mt-pms-api into hy2250089 2019-12-30 19:34:00 +08:00
hy2250089
7f450f70a4 初步保存批次加工单、工序、物料信息接口修改 2019-12-30 19:32:31 +08:00
hy2250089
cafc73d80f 测试 2019-12-27 21:23:02 +08:00
hy2250089
9496e2391d 产品bom下拉框选择接口修改,同时获取三个层次的bom,并初步赋值 2019-12-27 19:59:23 +08:00
hy2250089
ab07aed1af 查询工序详情、保存工序及物料修改 2019-12-26 21:20:09 +08:00
hy2250089
994c8ce18d 修改生产加工单与工序关联 2019-12-24 20:45:28 +08:00
hy2250089
4047e7396e 批次生产加工日期变量类型修改 2019-12-23 18:57:10 +08:00
hy2250089
b8c8a97523 工序详情查询接口 2019-12-21 20:15:41 +08:00
hy2250089
410a5b4b6e 批次生产加工新增、详情查询接口更新 2019-12-19 14:04:31 +08:00
hy2250089
17b5b7d98c .idea文件忽略配置 2019-12-16 14:52:01 +08:00
hy2250089
333f63482e 批次生产加工个别接口修改 2019-12-15 16:44:27 +08:00
CaiXiang
a41c2263c5 创建分支 2019-12-15 13:44:36 +08:00
hy2250089
2ace6dc2f3 日志ip文件路径配置 不加这个可能无法启动 2019-12-15 11:18:59 +08:00
hy2250089
496b55dfa6 物料管理接口添加说明 2019-12-13 23:37:02 +08:00
何勇
866479b582 Merge branch 'hy2250089' of mengtong/mt-pms-api into master 2019-12-13 11:17:58 +08:00
hy2250089
af6fd13658 模块pom配置修改 2019-12-13 11:09:13 +08:00
何勇
d18fa316b2 Merge branch 'guotuanting' of mengtong/mt-pms-api into master
测试合并
2019-12-13 10:04:02 +08:00
f041ff0976 fix(test): update README 2019-12-13 09:49:22 +08:00
hy2250089
0dbdb7b0b1 pms服务改造首上传 2019-12-03 14:13:46 +08:00
mengtong
fc8a4e6ff9 Initial commit 2019-12-02 21:03:46 +08:00