zhaoxl
|
0c134bcd2f
|
删除 'op-modules/op-quality/src/main/java/com/op/quality/QuaController.java'
|
2 years ago |
|
zhaoxl
|
46e476cc33
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality'
|
2 years ago |
 Yangwl
|
73aca5b45b
|
Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
|
2 years ago |
A0010407
|
3c337dbf43
|
基础信息BOM
|
2 years ago |
zhaoxiaolin
|
297748addc
|
工艺bug修改
|
2 years ago |
|
zhaoxiaolin
|
3db83041e8
|
工艺bug修改
|
2 years ago |
chj
|
69fb1df23b
|
MES报废功能
|
2 years ago |
|
A0010407
|
efb0b151b9
|
生产工序修改2
|
2 years ago |
|
A0010407
|
716c458333
|
生产工序模块修改
|
2 years ago |
mengjiao
|
4984f9884c
|
wms服务部分修改1.2
|
2 years ago |
|
mengjiao
|
cfce8b35c0
|
wms服务部分修改1.1
|
2 years ago |
|
mengjiao
|
2a094ca7f5
|
wms服务部分修改
|
2 years ago |
|
zhaoxiaolin
|
6708ff8f48
|
白坯领料单生成
|
2 years ago |
wws
|
0c792e7856
|
工单字段更改(isEnd->endFlag)
|
2 years ago |
|
wws
|
ca123c873b
|
工单管理(删除逻辑变更-湿料计划)、湿料计划管理(新增逻辑变更-白坯)
|
2 years ago |
|
zhaoxiaolin
|
f72eaf604a
|
wcs接口开发转移
|
2 years ago |
|
zhaoxiaolin
|
a87eb0a200
|
wcs接口开发转移
|
2 years ago |
|
wws
|
0f4ba8846c
|
工单管理(导出)
|
2 years ago |
|
wws
|
5a85b1fe16
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
efe7d87593
|
工单管理(导出-班次信息未导出)
|
2 years ago |
|
zhaoxiaolin
|
67ef0ac298
|
wcs接口开发转移
|
2 years ago |
|
chj
|
2d43cbf1f8
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
chj
|
c20fcc180c
|
计划模块——删除工单
|
2 years ago |
|
wws
|
1e90cd5669
|
工单管理(导出-班次信息未导出)
|
2 years ago |
|
wws
|
d59136a945
|
湿料计划管理(计划导出)
|
2 years ago |
|
wws
|
f41fcabf8a
|
工单管理模块(工单修改-白坯订单修改问题解决)
|
2 years ago |
|
chj
|
c7adabcee9
|
MES报废功能
|
2 years ago |
|
chj
|
ebc9f11ea9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-common/op-common-log/op-common-log.iml
|
2 years ago |
|
wws
|
36c536318e
|
订单管理模块(订单导入-新订单导入通用字段增加)
|
2 years ago |
|
zhaoxiaolin
|
ccb5ec78b9
|
实体目录变更
|
2 years ago |
|
chj
|
0e7a206b40
|
MES报废功能
|
2 years ago |
|
chj
|
6146a90ad0
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
chj
|
24faa833ea
|
MES报废功能
|
2 years ago |
A0010407
|
69488cc084
|
MES serviceimpl修改
|
2 years ago |
|
zhaoxiaolin
|
e4fe0c3772
|
wcs跟Mes交互的接口
|
2 years ago |
|
A0010407
|
952b654300
|
WMS 删除
|
2 years ago |
|
A0010407
|
d33acee6d5
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
A0010407
|
a8e8a99014
|
MES 备料单明细
|
2 years ago |
|
A0010407
|
085fa628c0
|
MES 备料单明细
|
2 years ago |
|
A0010407
|
cccddee368
|
MES 备料单 生产前准备
|
2 years ago |
|
zhaoxiaolin
|
91c07021ae
|
wcs跟Mes交互的接口
|
2 years ago |
|
A0010407
|
495255e9a5
|
基础信息 BOM子表
|
2 years ago |
|
wws
|
f10988a3c3
|
工单管理模块(显示问题修复)、湿料计划(混料BUG修复)
|
2 years ago |
|
wws
|
08103e1abb
|
订单管理模块(订单导入-工单状态更改)
|
2 years ago |
|
wws
|
ad913f3f56
|
订单管理模块(增加权限)
|
2 years ago |
|
wws
|
c41b56b0f3
|
订单管理模块(导入逻辑变更-已有湿料计划不可更改-工单已下达不可更改)
|
2 years ago |
|
wws
|
0f1d137aff
|
订单管理模块(导入逻辑修改-已有订单逻辑)
|
2 years ago |
|
wws
|
f2a49bc24e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java
# op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java
# op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
# op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java
# op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
|
2 years ago |
|
wws
|
1d01cb3621
|
订单管理模块(订单导入)
|
2 years ago |
|
zhaoxiaolin
|
362f6a167b
|
计划涉及的接口开发
|
2 years ago |
|
Yangwl
|
2bae85c25a
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Yangwl
|
d755acbb7f
|
SAP模块增加时间参数
|
2 years ago |
|
wws
|
d624fa64a0
|
订单管理模块(订单导出)
|
2 years ago |
|
A0010407
|
4e176bc6ab
|
基础信息后端BOM更改
|
2 years ago |
|
wws
|
a6acdae5c9
|
湿料计划模块(计划修改逻辑-有计划已接料则主计划不可修改)、订单管理模块(工单产品类型未加入问题解决)
|
2 years ago |
|
wws
|
7247067a17
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
ab1c69b1e2
|
计划管理模块(第三级拆分数量问题解决)、工单管理(工单修改功能完成)
|
2 years ago |
|
Yangwl
|
7aefee6af8
|
SAP模块提交订单同步操作
|
2 years ago |
|
A0010407
|
6b0292d505
|
mes bootstrap还原
|
2 years ago |
|
A0010407
|
67447b6164
|
生产工序 新增 产线设备
|
2 years ago |
|
Yangwl
|
d7fab6d920
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
zhaoxiaolin
|
0741e934cc
|
微服务拆分4
|
2 years ago |
|
Yangwl
|
88b1a67164
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
|
2 years ago |
|
wws
|
c5e0d0e785
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
5809d73f28
|
计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化
|
2 years ago |
|
Yangwl
|
bb882899ef
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Yangwl
|
7cb2180d78
|
Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
|
2 years ago |
|
zhaoxiaolin
|
e804b07fb6
|
微服务拆分3
|
2 years ago |
|
zhaoxiaolin
|
ce705cbe03
|
微服务拆分3
|
2 years ago |
|
Yangwl
|
40072716eb
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Yangwl
|
0d14350f32
|
定时任务执行
|
2 years ago |
|
zhaoxiaolin
|
907774948b
|
微服务拆分3
|
2 years ago |
|
zhaoxiaolin
|
3c4917cb28
|
微服务拆分
|
2 years ago |
|
wws
|
a64043c4ce
|
湿料计划管理(修改init)
|
2 years ago |
|
wws
|
605717dd11
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
39ac73dbed
|
湿料计划(查询湿料计划详情)
|
2 years ago |
|
wws
|
b6506a910c
|
订单计划管理(母工单为未新增已解决)
|
2 years ago |
|
zhaoxiaolin
|
93d42d6d2a
|
工单下发--工艺下发
|
2 years ago |
|
wws
|
f44af65c4f
|
湿料计划管理(查询详情list)
|
2 years ago |
|
wws
|
5752973f8c
|
湿料计划管理(查询详情list)
|
2 years ago |
|
wws
|
a9f3792c77
|
订单计划管理(版本合并)
|
2 years ago |
|
wws
|
3af42d3b6d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
|
2 years ago |
|
zhaoxiaolin
|
95205cd536
|
微服务添加
|
2 years ago |
|
wws
|
cbf5aa0bd4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
|
2 years ago |
|
wws
|
97b1ddbc4b
|
湿料计划管理(计划新增完成)
|
2 years ago |
|
Yangwl
|
a72ac03a1e
|
SAP定时任务同步订单
|
2 years ago |
|
wws
|
0425f44ef9
|
订单计划管理(工单班次名称获取)
|
2 years ago |
|
wws
|
a491155b75
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
|
2 years ago |
|
wws
|
5009b0ded1
|
订单计划管理(工艺字段添加)
|
2 years ago |
|
wws
|
cde82abd67
|
订单计划管理(更改订单拆分状态逻辑)
|
2 years ago |
|
zhaoxiaolin
|
a5d3d5727d
|
工单变更
|
2 years ago |
|
zhaoxiaolin
|
fb0a2ab614
|
工单变更
|
2 years ago |
|
wws
|
d6e17541a9
|
湿料计划管理(湿料计划新增init)
|
2 years ago |
|
wws
|
84787548e4
|
生产订单管理模块(拆分状态逻辑优化)
|
2 years ago |
|
wws
|
cca119c843
|
生产订单管理模块(机型回显问题修复)
|
2 years ago |
|
wws
|
b3440cfbbb
|
生产订单管理模块(更改code)
|
2 years ago |
|
wws
|
ed1245fc5a
|
生产订单管理模块(优化拆分显示)、湿料计划管理(BMS)
|
2 years ago |
|
A0010407
|
e8f9176634
|
基础信息管理后端
|
2 years ago |
|
A0010407
|
a12cc1f8a8
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
A0010407
|
82ec2f40b4
|
基础信息管理后端删除文件
|
2 years ago |
|
wws
|
7720db04fd
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
A0010407
|
c377584661
|
基础信息管理后端
|
2 years ago |
|
wws
|
6cd3a20556
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
2238046740
|
生产订单管理模块(优化)、湿料计划管理init
|
2 years ago |
|
zhaoxiaolin
|
9a62fbe233
|
系统管理的部门sql修改；工艺加是否需要首检；
|
2 years ago |
|
wws
|
cf38b80dc7
|
生产订单管理模块(产线更换为机型)
|
2 years ago |
|
wws
|
b6c4c30f9a
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wws
|
585b4e5692
|
生产订单管理模块
|
2 years ago |
|
A0010407
|
0216a5d952
|
基础信息管理后端3
|
2 years ago |
|
A0010407
|
ef69e6cd76
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
A0010407
|
680ec0e2b1
|
基础信息管理后端
|
2 years ago |
|
zhaoxiaolin
|
974dd13455
|
工厂数据源切换
|
2 years ago |
|
zhaoxiaolin
|
ded76bd02d
|
订单init1.0
|
2 years ago |
|
mengjiao
|
76cde96c9c
|
wms服务修改
|
2 years ago |
|
zhaoxiaolin
|
fa768ee255
|
订单init1
|
2 years ago |
|
zhaoxiaolin
|
1124174468
|
订单init
|
2 years ago |
|
Yangwl
|
39e071022d
|
SAP模块同步生产订单接口
|
2 years ago |
|
zhaoxiaolin
|
49e1a80e02
|
工艺V1.1
|
2 years ago |
|
zhaoxiaolin
|
f7cd042705
|
工艺V1.0
|
2 years ago |
|
zhaoxiaolin
|
e5161c6ad4
|
工序V4.0
|
2 years ago |
|
zhaoxiaolin
|
2dbf3601f6
|
工序3
|
2 years ago |
|
mengjiao
|
309f2c2999
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
mengjiao
|
55c11e1cbb
|
wms白胚粉料的代码
|
2 years ago |
|
A0010407
|
c90da338aa
|
基础信息管理后端
|
2 years ago |
|
zhaoxiaolin
|
616d370067
|
菜单
|
2 years ago |
|
zhaoxiaolin
|
7bbdd00a61
|
工序1.0
|
2 years ago |
|
zhaoxiaolin
|
26ce694217
|
init sqserver不支持limit
|
3 years ago |
|
zhaoxiaolin
|
8f52b50f92
|
init wms系统
|
3 years ago |
|
zhaoxiaolin
|
eec8b47d28
|
init代码生成器用mysql数据库
|
3 years ago |
|
zhaoxiaolin
|
bcea1651cc
|
init3.2SQLserver
|
3 years ago |
|
zhaoxiaolin
|
fa358163ac
|
init3.2SQLserver
|
3 years ago |
|
zhaoxiaolin
|
b31faa04df
|
init3.2SQLserver
|
3 years ago |
|
zhaoxiaolin
|
2b7d87f36d
|
init3.2SQLserver
|
3 years ago |
|
zhaoxiaolin
|
f4f729febe
|
init3.1
|
3 years ago |
|
zhaoxiaolin
|
924c2c14c0
|
init3.0
|
3 years ago |
|
zhaoxiaolin
|
bf7be46850
|
init2.0
|
3 years ago |
|
zhaoxiaolin
|
39a6d33464
|
init
|
3 years ago |