liweidong-hj
|
e4e59984e8
|
暂存
|
3 months ago |
liuqingkun
|
5ce20fa743
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
|
liuqingkun
|
1b33ff769b
|
订单模块-镀层物料申报
|
3 months ago |
sugy
|
b8e3ba4652
|
erp同步计划关闭订单
|
3 months ago |
Tom Li
|
391917639d
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
liweidong-hj
|
03d462e63c
|
工艺演示提交
|
3 months ago |
|
Tom Li
|
3b514cb9b8
|
Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr
|
3 months ago |
|
Tom Li
|
45008ee9ca
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
db88b12159
|
补充提交。
|
3 months ago |
李涛
|
95303372e0
|
1、热表生产管理接口修改
2、烧结生产管理接口开发
|
3 months ago |
qinyulong
|
2559b9e12d
|
pom文件修改
1.量具保养新增弹窗列表字段缺少
2.使用status 查询接口报500
|
3 months ago |
|
Tom Li
|
79d9a184c8
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
7f3dcb190b
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
|
Tom Li
|
3b0af8abad
|
[人员权限] 相关。
|
3 months ago |
|
Tom Li
|
79ef54a84f
|
[人员权限] 相关。
|
3 months ago |
|
qinyulong
|
9bea226ce5
|
pom文件修改
|
3 months ago |
|
qinyulong
|
515a026265
|
wms:把实体类迁到blade-wms-api里
|
3 months ago |
|
Tom Li
|
67ac8bf46e
|
镀种小类 槽液任务 化验频率。
|
3 months ago |
|
qinyulong
|
034ed3af59
|
设备管理量具保养全功能+设备管理模块导出功能
|
3 months ago |
|
qinyulong
|
0237d1cbb9
|
wms：1.量具库存数据openFeign远程调用；
2.量具库存排序字段变更
3.wms-api里加入量具库存远程调用所需实体类
|
3 months ago |
|
qinyulong
|
dee0981760
|
Merge branch 'refs/heads/master' into dev-qinyulong
|
3 months ago |
 wusiyu
|
4f1c945347
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
|
wusiyu
|
3b4abd2ed0
|
仓库管理-服务启动
|
3 months ago |
|
Tom Li
|
154614e577
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
c57a8debd8
|
修改排序。
|
3 months ago |
|
sugy
|
0cb3941ee5
|
erp同步玻璃饼订单
|
3 months ago |
|
qinyulong
|
8de522584a
|
Merge branch 'refs/heads/master' into dev-qinyulong
|
3 months ago |
|
李涛
|
7bc3a8f336
|
解决循环依赖问题
|
3 months ago |
|
qinyulong
|
35458ace5a
|
Merge branch 'refs/heads/master' into dev-qinyulong
|
3 months ago |
|
wusiyu
|
176f9f63cf
|
仓库管理-部分类
|
3 months ago |
|
wusiyu
|
d7daf7a7bd
|
仓库管理-部分类
|
3 months ago |
|
wusiyu
|
157b9871d1
|
仓库管理-部分类
|
3 months ago |
|
wusiyu
|
02dce1834f
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
|
wusiyu
|
0924c2c2ec
|
仓库管理-部分类
|
3 months ago |
|
李涛
|
9d97f79fb5
|
车间订单接口开发：转烧结、关闭、获取转外协所需数据、转外协(单个/批量)、更改车间订单优先级
|
3 months ago |
|
qinyulong
|
55e91c77ff
|
量具保养初版
|
3 months ago |
|
Tom Li
|
67ec26d196
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
5c11ec4b51
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
5edd04bd78
|
修复 周期性试验。 基础数据作业中心。
|
3 months ago |
|
qinyulong
|
38473e929d
|
设备台账返回工作中心名称，检索条件加入工作中心ID和设备位置
|
3 months ago |
|
liuqingkun
|
7c552e6858
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
|
liuqingkun
|
5fb07a49ab
|
订单模块-镀层物料申报
|
3 months ago |
|
wusiyu
|
046942137b
|
仓库管理-部分实体类
|
3 months ago |
|
wusiyu
|
06855268a3
|
仓库管理-物料信息
|
3 months ago |
|
wusiyu
|
3dca71367e
|
仓库管理-量具库查询
|
3 months ago |
sunjianxi
|
40ac0fd62f
|
排产定时任务修改-sjx
|
3 months ago |
|
liuqingkun
|
54c20120f0
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# doc/sql/mes/increase-260120.sql
|
3 months ago |
|
liuqingkun
|
b0cb842ad0
|
订单模块-烧结模具计划
|
3 months ago |
|
Tom Li
|
00171c4436
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
730215a286
|
Merge branch 'master' into develop-QA
|
3 months ago |
