李涛
|
7bc3a8f336
|
解决循环依赖问题
|
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 |
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 |
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 |
qinyulong
|
12f4a4d0d3
|
Merge branch 'refs/heads/dev-qinyulong'
|
3 months ago |
|
qinyulong
|
6f65611b34
|
varchar不允许修改为clob类型，所以先删除再添加
|
3 months ago |
|
Tom Li
|
4848ff31c0
|
Merge branch 'master' into develop-QA
|
3 months ago |
sugy
|
3be458851f
|
生产计划erp同步数据
|
3 months ago |
|
Tom Li
|
10a27d93a7
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
qinyulong
|
c814ccee0e
|
1.修改定时任务方法，powerjob方式
2.iot设备同步方法，计量记录同步方法修改
|
3 months ago |
|
Tom Li
|
0763e51dde
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
2b199c818d
|
自定义函数。
|
3 months ago |
|
qinyulong
|
5219c835cf
|
Merge branch 'refs/heads/master' into dev-qinyulong
# Conflicts:
# doc/sql/mes/increase-260120.sql
|
3 months ago |
|
qinyulong
|
13fd6d22bd
|
1.修改定时任务方法，powerjob方式
2.iot设备同步方法，计量记录同步方法修改
|
3 months ago |
|
Tom Li
|
ec8c042a3d
|
Aviator 基本集成。
|
3 months ago |
|
Tom Li
|
0506002277
|
试验项目周期,添加若干搜索条件。
|
3 months ago |
|
Tom Li
|
191ddf0df8
|
试验项目周期,添加若干搜索条件。
|
3 months ago |
|
Tom Li
|
0fe3e9fb3a
|
[周期试验项目] excel 导出。
|
3 months ago |
|
Tom Li
|
aa7b5a67c9
|
字段错误。
|
3 months ago |
|
Tom Li
|
f388070703
|
[周期试验] 导出。
|
3 months ago |
|
liuqingkun
|
b066084bd0
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
|
liuqingkun
|
4cda5eb258
|
订单模块-镀层物料需求
|
3 months ago |
|
qinyulong
|
575609d9f3
|
1.修改定时任务方法，禁用原@Scheduled注解方式
2.记录仪详情分页查询
|
3 months ago |
|
Tom Li
|
b7485dc7c5
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
f024c92ea4
|
镀种相关。
|
3 months ago |
|
sugy
|
963fd52fb5
|
erp同步数据
|
3 months ago |
|
李涛
|
dd8172de62
|
生产监控管理接口开发
1、热表车间订单列表
2、分批准备数据
3、分批提交
|
3 months ago |
|
Tom Li
|
8f4bed6bdb
|
copyList 槽液报告 详情 会带一个copyList的列表。
|
3 months ago |
|
Tom Li
|
03ecdde231
|
修改 周期性试验相关。
|
3 months ago |
|
Tom Li
|
3f7d4248ed
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
e63f776e07
|
Merge branch 'master' into develop-QA
# Conflicts:
# blade-service/blade-desk/pom.xml
|
3 months ago |
|
Tom Li
|
dd9b94f610
|
修复 槽液检测结果 生成曲线相关问题。
|
3 months ago |
|
sugy
|
1c73f4421f
|
定时同步
|
3 months ago |
|
liuqingkun
|
2a24c3a569
|
订单模块修改
|
3 months ago |
