739 Commits (highway)
 

Author SHA1 Message Date
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