525 Commits (9c89b70be0a5ed7264de0b31054b8ac208855f94)

Author SHA1 Message Date
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
Yangwl 0d14350f32 定时任务执行 1 year ago
zhaoxiaolin 907774948b 微服务拆分3 1 year ago
zhaoxiaolin 3c4917cb28 微服务拆分 1 year ago
wws a64043c4ce 湿料计划管理(修改init) 1 year ago
wws 605717dd11 Merge remote-tracking branch 'origin/master' 1 year ago
wws 39ac73dbed 湿料计划(查询湿料计划详情) 1 year ago
wws b6506a910c 订单计划管理(母工单为未新增已解决) 1 year ago
zhaoxiaolin 93d42d6d2a 工单下发--工艺下发 1 year ago
wws f44af65c4f 湿料计划管理(查询详情list) 1 year ago
wws 5752973f8c 湿料计划管理(查询详情list) 1 year ago
wws a9f3792c77 订单计划管理(版本合并) 1 year 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
1 year ago
zhaoxiaolin 95205cd536 微服务添加 1 year 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
1 year ago
wws 97b1ddbc4b 湿料计划管理(计划新增完成) 1 year ago
Yangwl a72ac03a1e SAP定时任务同步订单 1 year ago
wws 0425f44ef9 订单计划管理(工单班次名称获取) 1 year ago
wws a491155b75 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
1 year ago
wws 5009b0ded1 订单计划管理(工艺字段添加) 1 year ago
wws cde82abd67 订单计划管理(更改订单拆分状态逻辑) 1 year ago
zhaoxiaolin a5d3d5727d 工单变更 1 year ago
zhaoxiaolin fb0a2ab614 工单变更 1 year ago
wws d6e17541a9 湿料计划管理(湿料计划新增init) 1 year ago
wws 84787548e4 生产订单管理模块(拆分状态逻辑优化) 1 year ago
wws cca119c843 生产订单管理模块(机型回显问题修复) 1 year ago
wws b3440cfbbb 生产订单管理模块(更改code) 1 year ago
wws ed1245fc5a 生产订单管理模块(优化拆分显示)、湿料计划管理(BMS) 1 year ago
A0010407 e8f9176634 基础信息管理后端 1 year ago
A0010407 a12cc1f8a8 Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 82ec2f40b4 基础信息管理后端删除文件 1 year ago
wws 7720db04fd Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 c377584661 基础信息管理后端 1 year ago
wws 6cd3a20556 Merge remote-tracking branch 'origin/master' 1 year ago
wws 2238046740 生产订单管理模块(优化)、湿料计划管理init 1 year ago
zhaoxiaolin 9a62fbe233 系统管理的部门sql修改;工艺加是否需要首检; 1 year ago
wws cf38b80dc7 生产订单管理模块(产线更换为机型) 1 year ago
wws b6c4c30f9a Merge remote-tracking branch 'origin/master' 1 year ago
wws 585b4e5692 生产订单管理模块 1 year ago
A0010407 0216a5d952 基础信息管理后端3 1 year ago
A0010407 ef69e6cd76 Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 680ec0e2b1 基础信息管理后端 1 year ago
zhaoxiaolin 974dd13455 工厂数据源切换 1 year ago
zhaoxiaolin ded76bd02d 订单init1.0 1 year ago
mengjiao 76cde96c9c wms服务修改 1 year ago
zhaoxiaolin fa768ee255 订单init1 1 year ago
zhaoxiaolin 1124174468 订单init 1 year ago
Yangwl 39e071022d SAP模块同步生产订单接口 1 year ago
zhaoxiaolin 49e1a80e02 工艺V1.1 1 year ago
zhaoxiaolin f7cd042705 工艺V1.0 1 year ago
zhaoxiaolin e5161c6ad4 工序V4.0 1 year ago
zhaoxiaolin 2dbf3601f6 工序3 1 year ago
mengjiao 309f2c2999 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 55c11e1cbb wms白胚粉料的代码 1 year ago
A0010407 c90da338aa 基础信息管理后端 1 year ago
zhaoxiaolin 616d370067 菜单 1 year ago
zhaoxiaolin 7bbdd00a61 工序1.0 1 year ago
zhaoxiaolin 26ce694217 init sqserver不支持limit 1 year ago
zhaoxiaolin 8f52b50f92 init wms系统 1 year ago
zhaoxiaolin eec8b47d28 init代码生成器用mysql数据库 1 year ago
zhaoxiaolin bcea1651cc init3.2SQLserver 1 year ago
zhaoxiaolin fa358163ac init3.2SQLserver 1 year ago
zhaoxiaolin b31faa04df init3.2SQLserver 1 year ago
zhaoxiaolin 2b7d87f36d init3.2SQLserver 1 year ago
zhaoxiaolin f4f729febe init3.1 1 year ago
zhaoxiaolin 924c2c14c0 init3.0 1 year ago
zhaoxiaolin bf7be46850 init2.0 1 year ago
zhaoxiaolin 39a6d33464 init 1 year ago