wws
|
1a5a014965
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
b593ae1c0e
|
计划管理优化
|
1 year ago |
zhaoxiaolin
|
139dc3fb4c
|
日生产报表功能
|
1 year ago |
chj
|
63550d6dce
|
成品销售出库
|
1 year ago |
|
chj
|
0e36fc75a6
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
chj
|
7050ed0fdf
|
成品生产入库修改
|
1 year ago |
A0010407
|
e4b4118504
|
基础报工-班组
|
1 year ago |
|
wws
|
9771ab2ff3
|
打印备料单
|
1 year ago |
|
wws
|
aae8fc7dc1
|
计划模块(车数)
|
1 year ago |
|
wws
|
3607120391
|
计划模块(模糊查询)
|
1 year ago |
|
A0010407
|
5d87f9a24f
|
工作中心
|
1 year ago |
|
zhaoxiaolin
|
897166b783
|
工艺穿梭框
|
1 year ago |
|
chj
|
9178d37581
|
成品生产入库
|
1 year ago |
|
chj
|
4b6bf5fa3c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
chj
|
0590a13141
|
成品生产入库修改
|
1 year ago |
|
A0010407
|
2ca3d7842d
|
BOM
|
1 year ago |
|
A0010407
|
736f72f4af
|
工艺路线-BOM弹窗后端
|
1 year ago |
|
zhaoxiaolin
|
ca4b21061c
|
计划bug和质量bug修改
|
1 year ago |
|
zhaoxiaolin
|
7fefe369cc
|
计划bug和质量bug修改
|
1 year ago |
|
zhaoxiaolin
|
5a60b22157
|
计划-设备路线选择更改；报工定时任务；
|
1 year ago |
|
zhaoxiaolin
|
c1885b1805
|
手持质量检验
|
1 year ago |
|
zhaoxiaolin
|
03376055cb
|
计划bug修改-- 计划的选择方式修改v2.0
|
1 year ago |
|
wws
|
5c6e383e2e
|
计划模块(计划新增逻辑修改初版)
|
1 year ago |
|
zhaoxiaolin
|
d6d5ff4ae3
|
计划bug修改-- 计划的选择方式修改
|
1 year ago |
|
wws
|
fdd2069372
|
计划模块(注释掉订单关闭功能)
|
1 year ago |
|
wws
|
5aa0d0c640
|
计划模块(工单打印逻辑顺序BUG解决)
|
1 year ago |
|
wws
|
0f372dae51
|
计划模块(订单拆分搜索后拆分BUG解决)
|
1 year ago |
庞晓磊
|
09a473f1f1
|
wms-数据源问题
|
1 year ago |
|
A0010407
|
1f7113fc99
|
基础信息-BOM
|
1 year ago |
|
wws
|
c5f16b8e68
|
计划模块(工艺线体)
|
1 year ago |
|
wws
|
49f5c15d3d
|
计划模块(工单修改BUG解决初版)
|
1 year ago |
|
chj
|
50fdeebd4b
|
成品生产入库
|
1 year ago |
mengjiao
|
77d831af56
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
6b516a4718
|
wms服务部分修改1.5
|
1 year ago |
|
wws
|
da7c18901c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
40ecab6485
|
计划模块(工单管理显示优化)
|
1 year ago |
|
wws
|
0524c17e13
|
计划模块(工艺线体逻辑变更，工单修改判断逻辑变更)
|
1 year ago |
|
A0010407
|
376b3bc31b
|
基础信息-班组
|
1 year ago |
|
A0010407
|
94f419e47e
|
基础信息-设备
|
1 year ago |
|
庞晓磊
|
bc416685b0
|
wms-报表
|
1 year ago |
|
wws
|
c25d6e258d
|
计划模块(新增-计划工厂字段)
|
1 year ago |
|
zhaoxiaolin
|
efe22d2482
|
计划bug修改
|
1 year ago |
|
zhaoxiaolin
|
76036ee69a
|
计划bug修改
|
1 year ago |
|
wws
|
6b9ccbd5c3
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
fd56a296d7
|
计划模块(工单修改BUG解决)
|
1 year ago |
|
zhaoxiaolin
|
203f0456fa
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
|
1 year ago |
|
zhaoxiaolin
|
5c850ba017
|
工艺bug修改
|
1 year ago |
|
wws
|
207e8ccf6e
|
计划模块(工单修改BUG解决)
|
1 year ago |
周鸿羽（海威）
|
9c77c577d9
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/mapper'
|
1 year ago |
|
周鸿羽（海威）
|
53b84eeb5b
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
|
1 year ago |
|
周鸿羽（海威）
|
7d4632e30b
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
|
1 year ago |
|
周鸿羽（海威）
|
8996a9396a
|
删除多余文件
|
1 year ago |
|
zhaoxiaolin
|
6ec5a1f20a
|
工艺bug修改
|
1 year ago |
|
zhaoxiaolin
|
d3e60dd224
|
sap模块代码整合
|
1 year ago |
|
zhaoxiaolin
|
3118b3314e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
e892e8c2fe
|
sap模块代码整合
|
1 year ago |
zhaoxl
|
9d0fbb0022
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/domain'
|
1 year ago |
|
zhaoxiaolin
|
60de714016
|
sap模块代码整合
|
1 year ago |
|
mengjiao
|
d2c7cadd07
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
6e28d22e50
|
wms服务部分修改1.4
|
1 year ago |
|
zhaoxiaolin
|
9ec31912fc
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
5a8c6ffeae
|
工单下发sap接口联调
|
1 year ago |
|
zhaoxl
|
7158568d2d
|
更新 'op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml'
|
1 year ago |
|
zhaoxl
|
bf47235f34
|
上传文件至 'op-modules/op-quality/src/main/resources/mapper'
|
1 year ago |
|
mengjiao
|
51da2c459f
|
wms服务部分修改1.3
|
1 year ago |
|
zhaoxiaolin
|
dee2982dbd
|
工单下发sap接口联调
|
1 year ago |
|
wws
|
48496ffa9a
|
订单拆分逻辑(关闭订单)
|
1 year ago |
|
zhaoxiaolin
|
da486d7e20
|
订单同步按钮
|
1 year ago |
|
A0010407
|
d0dd51a777
|
mes报工
|
1 year ago |
|
wws
|
53744c074f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
d8b6bedcbd
|
工单管理打印功能
|
1 year ago |
|
zhaoxiaolin
|
06d740e85d
|
订单同步按钮
|
1 year ago |
|
zhaoxl
|
1ff37dc20e
|
删除 'op-modules/op-quality/src/main/resources/QcProCheckMapper.xml'
|
1 year ago |
|
zhaoxl
|
1a14aef2dd
|
上传文件至 'op-modules/op-quality/src/main/resources/mapper'
|
1 year ago |
|
zhaoxl
|
33e8364c4a
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl'
|
1 year ago |
|
zhaoxl
|
96a998e66e
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/controller'
|
1 year ago |
|
zhaoxl
|
604d6de09c
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
|
1 year ago |
|
zhaoxl
|
317e69e12d
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
|
1 year ago |
|
A0010407
|
17a42de771
|
mes报工
|
1 year ago |
|
A0010407
|
49188ecaaf
|
mes报工
|
1 year ago |
|
A0010407
|
a6890849fe
|
rfid bug
|
1 year ago |
|
A0010407
|
d2b7fc24ce
|
工艺设备类别bug
|
1 year ago |
|
zhaoxiaolin
|
8dc2f096a2
|
文件上传问题
|
1 year ago |
|
A0010407
|
d164df98ab
|
工艺新增字段
|
1 year ago |
|
A0010407
|
ede0a00c67
|
设备查询bug
|
1 year ago |
|
A0010407
|
8c66896294
|
生产配方管理-修改-二级组成-修改操作步骤bug
|
1 year ago |
|
A0010407
|
d67c7c4ab8
|
生产配方管理-版本bug
|
1 year ago |
|
zhaoxiaolin
|
944d9d9308
|
订单同步接口测试
|
1 year ago |
|
zhaoxiaolin
|
f2151cc0b3
|
工艺同步接口
|
1 year ago |
|
zhaoxiaolin
|
5ddc72024f
|
工单回传
|
1 year ago |
|
zhaoxl
|
45f0745fae
|
上传文件至 'op-modules/op-sap/src/main/resources/mapper'
|
1 year ago |
|
zhaoxl
|
e2b549ac5a
|
上传文件至 'op-modules/op-sap/src/main/resources/mapper'
|
1 year ago |
|
zhaoxl
|
87a4ce2f3a
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/mapper'
|
1 year ago |
|
zhaoxl
|
06c64d526d
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/service/impl'
|
1 year ago |
|
zhaoxiaolin
|
a5147344fb
|
新增员工时加数据源权限
|
1 year ago |
|
zhaoxiaolin
|
1879d18ba9
|
数据源规则修改
|
1 year ago |
|
zhaoxl
|
03efbd1db7
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/service/impl'
|
1 year ago |
|
zhaoxl
|
3c45df589c
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/service'
|
1 year ago |
|
zhaoxl
|
30d46a2944
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/mapper'
|
1 year ago |
|
zhaoxl
|
dcf44bf0cb
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/mapper'
|
1 year ago |
|
zhaoxl
|
b11d5a4e5a
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/domain'
|
1 year ago |
|
zhaoxl
|
43eb220f0a
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/domain'
|
1 year ago |
|
zhaoxl
|
0a1410bfe5
|
更新 'op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java'
|
1 year ago |
|
zhaoxiaolin
|
ae4d615aff
|
领料单获取
|
1 year ago |
|
zhaoxiaolin
|
d70b27e01f
|
领料单提交
|
1 year ago |
|
zhaoxiaolin
|
7fc87674e9
|
领料单提交
|
1 year ago |
|
zhaoxiaolin
|
a5340c0934
|
领料单提交
|
1 year ago |
|
zhaoxiaolin
|
07d80f45c6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java
# op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
|
1 year ago |
|
zhaoxiaolin
|
7dc31d221a
|
领料单提交
|
1 year ago |
|
zhaoxiaolin
|
432a1c761c
|
领料单提交
|
1 year ago |
|
zhaoxl
|
4c0031e62f
|
上传文件至 'op-modules/op-sap/src/main/resources/mapper'
|
1 year ago |
|
zhaoxl
|
35d1456402
|
上传文件至 'op-modules/op-sap/src/main/resources/mapper'
|
1 year ago |
|
zhaoxl
|
d22b40f91f
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/service/impl'
|
1 year ago |
|
zhaoxl
|
8f8a7b479e
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/service'
|
1 year ago |
|
zhaoxl
|
25fcbe0c77
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/mapper'
|
1 year ago |
|
zhaoxl
|
7ed9e3c5d9
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/mapper'
|
1 year ago |
|
zhaoxl
|
d21c2ad7a9
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/domain'
|
1 year ago |
|
zhaoxl
|
bef0af36a7
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/domain'
|
1 year ago |
|
zhaoxl
|
7177a3ce6e
|
上传文件至 'op-modules/op-sap/src/main/java/com/op/sap/controller'
|
1 year ago |
|
zhaoxl
|
7e49161b5b
|
上传文件至 'op-modules/op-quality/src/main/resources/mapper'
|
1 year ago |
|
zhaoxl
|
cf3f610f4f
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/utils'
|
1 year ago |
|
zhaoxl
|
8bc844ae73
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl'
|
1 year ago |
|
zhaoxl
|
992613c54e
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/service'
|
1 year ago |
|
zhaoxl
|
58d3d2592e
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/mapper'
|
1 year ago |
|
zhaoxl
|
6b76b13263
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/domain'
|
1 year ago |
|
zhaoxl
|
cbd1002bfa
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/Controller'
|
1 year ago |
|
zhaoxl
|
1c1319dd5e
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality/config'
|
1 year ago |
|
zhaoxl
|
a7cf08632e
|
删除 'op-modules/op-quality/src/main/java/com/op/quality/QcProCheck.java'
|
1 year ago |
|
zhaoxl
|
c48701e83e
|
删除 'op-modules/op-quality/src/main/java/com/op/quality/DynamicDatasource.java'
|
1 year ago |
|
zhaoxl
|
272382104c
|
删除 'op-modules/op-quality/src/main/java/com/op/quality/BaseFile.java'
|
1 year ago |
|
zhaoxl
|
0c134bcd2f
|
删除 'op-modules/op-quality/src/main/java/com/op/quality/QuaController.java'
|
1 year ago |
|
zhaoxl
|
46e476cc33
|
上传文件至 'op-modules/op-quality/src/main/java/com/op/quality'
|
1 year ago |
 Yangwl
|
73aca5b45b
|
Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
|
1 year ago |
|
A0010407
|
3c337dbf43
|
基础信息BOM
|
1 year ago |
|
zhaoxiaolin
|
297748addc
|
工艺bug修改
|
1 year ago |
|
zhaoxiaolin
|
3db83041e8
|
工艺bug修改
|
1 year ago |
|
chj
|
69fb1df23b
|
MES报废功能
|
1 year ago |
|
A0010407
|
efb0b151b9
|
生产工序修改2
|
1 year ago |
|
A0010407
|
716c458333
|
生产工序模块修改
|
1 year ago |
|
mengjiao
|
4984f9884c
|
wms服务部分修改1.2
|
1 year ago |
|
mengjiao
|
cfce8b35c0
|
wms服务部分修改1.1
|
1 year ago |
|
mengjiao
|
2a094ca7f5
|
wms服务部分修改
|
1 year ago |
|
zhaoxiaolin
|
6708ff8f48
|
白坯领料单生成
|
1 year ago |
|
wws
|
0c792e7856
|
工单字段更改(isEnd->endFlag)
|
1 year ago |
|
wws
|
ca123c873b
|
工单管理(删除逻辑变更-湿料计划)、湿料计划管理(新增逻辑变更-白坯)
|
1 year ago |
|
zhaoxiaolin
|
f72eaf604a
|
wcs接口开发转移
|
1 year ago |
|
zhaoxiaolin
|
a87eb0a200
|
wcs接口开发转移
|
1 year ago |
|
wws
|
0f4ba8846c
|
工单管理(导出)
|
1 year ago |
|
wws
|
5a85b1fe16
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
efe7d87593
|
工单管理(导出-班次信息未导出)
|
1 year ago |
|
zhaoxiaolin
|
67ef0ac298
|
wcs接口开发转移
|
1 year ago |
|
chj
|
2d43cbf1f8
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
chj
|
c20fcc180c
|
计划模块——删除工单
|
1 year ago |
|
wws
|
1e90cd5669
|
工单管理(导出-班次信息未导出)
|
1 year ago |
|
wws
|
d59136a945
|
湿料计划管理(计划导出)
|
1 year ago |
|
wws
|
f41fcabf8a
|
工单管理模块(工单修改-白坯订单修改问题解决)
|
1 year ago |
|
chj
|
c7adabcee9
|
MES报废功能
|
1 year ago |
|
chj
|
ebc9f11ea9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-common/op-common-log/op-common-log.iml
|
1 year ago |
|
wws
|
36c536318e
|
订单管理模块(订单导入-新订单导入通用字段增加)
|
1 year ago |
|
zhaoxiaolin
|
ccb5ec78b9
|
实体目录变更
|
1 year ago |
|
chj
|
0e7a206b40
|
MES报废功能
|
1 year ago |
|
chj
|
6146a90ad0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
chj
|
24faa833ea
|
MES报废功能
|
1 year ago |
A0010407
|
69488cc084
|
MES serviceimpl修改
|
1 year ago |
|
zhaoxiaolin
|
e4fe0c3772
|
wcs跟Mes交互的接口
|
1 year ago |
|
A0010407
|
952b654300
|
WMS 删除
|
1 year ago |
|
A0010407
|
d33acee6d5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
A0010407
|
a8e8a99014
|
MES 备料单明细
|
1 year ago |
|
A0010407
|
085fa628c0
|
MES 备料单明细
|
1 year ago |
|
A0010407
|
cccddee368
|
MES 备料单 生产前准备
|
1 year ago |
|
zhaoxiaolin
|
91c07021ae
|
wcs跟Mes交互的接口
|
1 year ago |
|
A0010407
|
495255e9a5
|
基础信息 BOM子表
|
1 year ago |
|
wws
|
f10988a3c3
|
工单管理模块(显示问题修复)、湿料计划(混料BUG修复)
|
1 year ago |
|
wws
|
08103e1abb
|
订单管理模块(订单导入-工单状态更改)
|
1 year ago |
|
wws
|
ad913f3f56
|
订单管理模块(增加权限)
|
1 year ago |
|
wws
|
c41b56b0f3
|
订单管理模块(导入逻辑变更-已有湿料计划不可更改-工单已下达不可更改)
|
1 year ago |
|
wws
|
0f1d137aff
|
订单管理模块(导入逻辑修改-已有订单逻辑)
|
1 year 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
|
1 year ago |
|
wws
|
1d01cb3621
|
订单管理模块(订单导入)
|
1 year ago |
|
zhaoxiaolin
|
362f6a167b
|
计划涉及的接口开发
|
1 year ago |
|
Yangwl
|
2bae85c25a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
d755acbb7f
|
SAP模块增加时间参数
|
1 year ago |
|
wws
|
d624fa64a0
|
订单管理模块(订单导出)
|
1 year ago |
|
A0010407
|
4e176bc6ab
|
基础信息后端BOM更改
|
1 year ago |
|
wws
|
a6acdae5c9
|
湿料计划模块(计划修改逻辑-有计划已接料则主计划不可修改)、订单管理模块(工单产品类型未加入问题解决)
|
1 year ago |
|
wws
|
7247067a17
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
ab1c69b1e2
|
计划管理模块(第三级拆分数量问题解决)、工单管理(工单修改功能完成)
|
1 year ago |
|
Yangwl
|
7aefee6af8
|
SAP模块提交订单同步操作
|
1 year ago |
|
A0010407
|
6b0292d505
|
mes bootstrap还原
|
1 year ago |
|
A0010407
|
67447b6164
|
生产工序 新增 产线设备
|
1 year ago |
|
Yangwl
|
d7fab6d920
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
0741e934cc
|
微服务拆分4
|
1 year ago |
|
Yangwl
|
88b1a67164
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
|
1 year ago |
|
wws
|
c5e0d0e785
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
5809d73f28
|
计划管理模块(日期范围查询、计划工厂字段添加)、湿料计划管理模块(状态查询)、整体代码优化
|
1 year ago |
|
Yangwl
|
bb882899ef
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
7cb2180d78
|
Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
|
1 year ago |
|
zhaoxiaolin
|
e804b07fb6
|
微服务拆分3
|
1 year ago |
|
zhaoxiaolin
|
ce705cbe03
|
微服务拆分3
|
1 year ago |
|
Yangwl
|
40072716eb
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |