693 Commits (f13ee5d888b8f9a1cec9637c4b0e979623d87a2b)

Author SHA1 Message Date
wws fc69128a8c Merge remote-tracking branch 'origin/master' 1 year ago
wws dcbde38d27 巡检工单填写记录V1 1 year ago
A0010407 870fde44b5 报修 1 year ago
A0010407 d5ae6cea2c 报修+委外工单 1 year ago
wws aedd7d6052 保养计划初始化、巡检工单初始化 1 year ago
zhaoxiaolin d80fe972b3 原料检验任务 1 year ago
shaoyong c67c7a464d 修改物料检验项目实体 1 year ago
wws 8c3829be4d Merge remote-tracking branch 'origin/master' 1 year ago
wws a6d04164ec 1 1 year ago
zhaoxiaolin db3192e9a1 增加排序字段 1 year ago
wws 9c65126191 Merge remote-tracking branch 'origin/master' 1 year ago
wws 4cac17b9bb 巡检计划优化 1 year ago
A0010407 dd8a332ae6 报修+维修工单 1 year ago
wws 08879199ae Merge remote-tracking branch 'origin/master' 1 year ago
wws 6f33aec08c 检查项删除检验逻辑 1 year ago
shaoyong eec6231915 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 6551e07899 质量系统-检验任务管理2 1 year ago
shaoyong 40b350ac8b Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1 1 year ago
wws ac2f99c2c7 巡检计划修改+删除 1 year ago
wws 411e562832 Merge remote-tracking branch 'origin/master' 1 year ago
wws 6bde4f4df9 巡检计划修改初始化 1 year ago
ShiChangzhou 78c069cae9 解决sap打包发版问题 1 year ago
wws 435e7adcd4 巡检计划新增接口初始化 1 year ago
shaoyong b47919426d Merge remote-tracking branch 'origin/master' 1 year ago
shaoyong 579a482c85 物料检验项目维护 1 year ago
wws 38270b9b0a 巡检计划 1 year ago
wws ac78b175ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java
#	op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
1 year ago
wws 33a6a48497 Merge remote-tracking branch 'origin/master' 1 year ago
wws e56dc7446b 巡检计划 1 year ago
A0010407 a10b915de3 改名字+报修 1 year ago
A0010407 c78f1542ed 备品备件领用 1 year ago
A0010407 23659427c6 备品备件领用 1 year ago
zhaoxiaolin 6ccba2ca54 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 73d26c1f8b sap基础数据同步,更新时段修改 1 year ago
wws 5299c1e27d Merge remote-tracking branch 'origin/master' 1 year ago
wws 54715aaf0b 巡检计划 1 year ago
A0010407 91c175fff1 备品备件台账 1 year ago
A0010407 bce6390db6 备品备件入库+备品备件台账 1 year ago
zhaoxiaolin 50da3686fb 推送镜像指令 1 year ago
zhaoxiaolin d4ce34c332 1、看板料罐车数获取;2、小时产量加班次、分钟数做活,导出功能;3、工序完成记录加入班次 1 year ago
A0010407 497e14c965 备品备件台账 1 year ago
wws 8e4a8bb12b 巡检计划初始化 1 year ago
shaoyong cd3d3bd928 检验节点维护 1 year ago
zhaoxiaolin b1d37a7c79 下工序机台获取接口 1 year ago
zhaoxiaolin 316c053a6e Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 57ff0dd3ea 小时产量报表增加合计 1 year ago
wws 2de0b1d2df 故障类型维护(优化查询) 1 year ago
wws 991a9e874b Merge remote-tracking branch 'origin/master' 1 year ago
wws 9b7791718c 设备管理-故障类型V1.1 1 year ago
zhaoxiaolin f6ebd9e321 看板、小时产量报表 1 year ago
wws 433a307c75 设备管理-创建/更新字段BUG 1 year ago
wws 25b5fbe636 Merge remote-tracking branch 'origin/master' 1 year ago
wws 2efd13594d 设备管理-故障类型V1 1 year ago
Yangwl fdf2c8ce69 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 63d00b8a45 SAP订单同步接口增加工厂参数、修改MES连接SAP工具类。删除多余文件。 1 year ago
wws 22bd4abe35 Merge remote-tracking branch 'origin/master' 1 year ago
wws ebe364450a 设备管理-故障类型初始化 1 year ago
zhaoxiaolin e0e08736bf 看板接口3 1 year ago
wws eabf618a1a Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin d19159a2f3 看板接口2 1 year ago
wws eb7ad777ec 设备管理-检查项维护V2(关联设备) 1 year ago
zhaoxiaolin d6e558f422 工序产量查询 1 year ago
zhaoxiaolin ff20d3cfa4 白坯订单v3 1 year ago
zhaoxiaolin 9067f3772c Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 2868dfb34a 白坯订单v2 1 year ago
wws bf8cc70fc8 Merge remote-tracking branch 'origin/master' 1 year ago
wws e31a93752a 设备管理-检查项维护(事务锁) 1 year ago
zhaoxiaolin 6f814376ca Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 41b3459f8b 白坯生产报表 1 year ago
wws 40f0238071 设备管理-检查项维护(修改BUG修复) 1 year ago
wws 8b3acc99b7 设备管理-检查项维护(修改BUG修复) 1 year ago
wws 48debb98d3 设备管理-检查项维护V1.1 1 year ago
wws 57ffbd7968 设备管理-检查项维护V1 1 year ago
wws 5205fab4f9 设备管理-检查项维护(修改) 1 year ago
wws 899f67ebd2 设备管理-检查项维护(新增-code格式) 1 year ago
wws f2fea045e5 Merge remote-tracking branch 'origin/master' 1 year ago
wws e81e645667 设备管理-检查项维护(新增) 1 year ago
zhaoxiaolin 044241f3fd saplib新包 1 year ago
zhaoxiaolin 051bed6373 设备名称排序 1 year ago
zhaoxiaolin 9bea4d9d6c 工单编码 1 year ago
wws 6a14a48c97 Merge remote-tracking branch 'origin/master' 1 year ago
wws 54c39cb2b8 设备管理-检查项维护(工厂factory->factoryCode) 1 year ago
zhaoxiaolin ecef3b7e38 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 2d905987ba mes看板 1 year ago
zhaoxl 5d84e18e58 zxl 1 year ago
zhaoxl 49aa8b6804 zxl 1 year ago
zhaoxl 8536f1abbc zxl 1 year ago
zhaoxl 1c8f355e58 zxl 1 year ago
zhaoxl a5dda0ad18 zxl 1 year ago
zhaoxl 89c924ba0b zxl 1 year ago
zhaoxl 21949d6e79 zxl 1 year ago
zhaoxl a845ce70c9 zxl 1 year ago
zhaoxl 699f763bff zxl 1 year ago
zhaoxl 6fbf90e184 zxl 1 year ago
zhaoxl 5a38036abc zxl 1 year ago
zhaoxl 6cebb21c8d zxl 1 year ago
wws 59ed4122cb 设备管理-检查项维护(搜索优化) 1 year ago
wws 6e57dfe409 设备管理-检查项维护初始化 1 year ago
zhaoxiaolin 4a0b3dc0b2 手持修改 1 year ago
zhaoxiaolin ccb8a178cb 生产环境 1 year ago
chj 828462b93d Merge remote-tracking branch 'origin/master' 1 year ago
chj 836a883081 成品生产入库修改 1 year ago
zhaoxiaolin 968c577902 sap包测试版本用1.0.0 1 year ago
ShiChangzhou de1e664328 1 1 year ago
zhaoxiaolin 566d2b4d93 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 92cf26ddd6 sap 包3.0.8 1 year ago
ShiChangzhou 7586361189 1 1 year ago
zhaoxiaolin 7a42aea19f sap pom修改 1 year ago
zhaoxiaolin 8bc62dc72d sap接口bug修复 1 year ago
zhaoxiaolin da2074411b 数据源 1 year ago
zhaoxiaolin 0a822359bd 数据源 1 year ago
zhaoxiaolin 8603ea7ac2 湿料计划表status状态调整 1 year ago
A0010407 94fe3d8c84 供应商 1 year ago
zhaoxiaolin 852bff3af6 sap 定时任务 1 year ago
zhaoxiaolin f329c7c39b Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin eb87002be9 sap 定时任务 1 year ago
A0010407 8f5de59e5c mes rfid 1 year ago
shaoyong 97e5b56b03 sap修改 1 year ago
zhaoxiaolin 55df9b2ec8 sap jar包2 1 year ago
zhaoxiaolin bb61ed1b95 sap jar包 1 year ago
A0010407 ae8cd366bd mes报工bug 1 year ago
shaoyong 7356633a0c 供应商同步,客户同步 1 year ago
A0010407 7f5ab75bfd 手持Rfid 1 year ago
zhaoxiaolin f283217265 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 43eeb7af14 sap jar包 1 year ago
A0010407 9f3a839045 物料模糊查询 1 year ago
A0010407 d193c0c676 手持查询 1 year ago
A0010407 045090004c mes报表权限 1 year ago
zhaoxiaolin 60d5af1088 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 8678afa391 手持接口修改+权限 1 year ago
A0010407 ef44564653 基础信息权限问题 1 year ago
zhaoxiaolin 292742f42f sap同步工作中心 1 year ago
zhaoxiaolin c5866a95c6 手持接口+订单bug修复 1 year ago
ShiChangzhou 5fc7a1e415 安装sap依赖 1 year ago
ShiChangzhou 5333b4363f 发版命令 1 year ago
A0010407 42ec2bd570 设备类型选择 1 year ago
A0010407 e450cf0a4f 二级组成工序优化 1 year ago
A0010407 22d786f5db MES领料单优化 1 year ago
zhaoxiaolin d4446de5fc 成品订单修改:更新范围>=20230921 1 year ago
zhaoxiaolin 0da428ce6f 湿料计划集成到白胚订单拆分 1 year ago
wws ab51cb0827 工单变更(白坯工单变更BUG修复) 1 year ago
zhaoxiaolin 4e194119a6 计划的bug修改 1 year ago
wws c2caaab2f8 工单变更(成品工单变更BUG修复) 1 year ago
zhaoxiaolin 09e0b3e249 sap+计划的bug修改 1 year ago
wws 6b7447c037 工单删除 1 year ago
wws cf46950dbb Merge remote-tracking branch 'origin/master' 1 year ago
wws 58bb931a10 工单删除 1 year ago
A0010407 48e68cc67c 设备选择产线 忽略工厂 1 year ago
A0010407 905b9b426a 设备增加两个字段 IP+port 1 year ago
zhaoxiaolin f92e75d11f 计划问题修改 1 year ago
wws 00a06d2898 Merge remote-tracking branch 'origin/master' 1 year ago
wws e86bddaf1c 湿料计划(修改湿料计划) 1 year ago
A0010407 bc10cc4713 工作中心 只查询产线 1 year ago
wws 97083e9206 Merge remote-tracking branch 'origin/master' 1 year ago
wws d7610f0b31 湿料计划(删除湿料计划) 1 year ago
zhaoxiaolin 5be42ab1af Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin eb8a4a8493 列表查询模糊查询 1 year ago
wws 3c0983043b Merge remote-tracking branch 'origin/master' 1 year ago
wws 7f6f2adeec 湿料计划(新增湿料计划) 1 year ago
A0010407 c55c71a0e4 基础信息产品附属 1 year ago
A0010407 5bd908e052 Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 6152878592 基础信息产品附属详情 1 year ago
zhaoxiaolin 91d95f0347 列表查询模糊查询 1 year ago
zhaoxiaolin 0b84c873a1 白坯下工单,生成零领料单 1 year ago
A0010407 4257e67ade 设备增加附属属性 1 year ago
wws a6198c787d 计划模块(拆分状态变更) 1 year ago
zhaoxiaolin 3afd660819 逻辑删除 1 year ago
zhaoxiaolin d394d2a1df 逻辑删除+手持增加缓冲区接口+工艺车数 1 year ago
A0010407 d0c62cb2df 班次+客户+工厂+仓库 1 year ago
A0010407 5f4f16870a 基础信息 供应商 1 year ago
A0010407 ab903aae71 班次 1 year ago
A0010407 8e6c8bcfa2 库区+货位 1 year ago
wws 420dba1ecf Merge remote-tracking branch 'origin/master' 1 year ago
wws 30ac787aa4 湿料计划(查询优化) 1 year ago
A0010407 25b701bf0d 基础信息设备 1 year ago
zhaoxiaolin e38a563f81 逻辑删除+手持增加缓冲区接口 1 year ago
A0010407 b69c8561d9 基础信息库区管理 1 year ago
A0010407 3353eb7afa 基础信息 产品管理 1 year ago
zhaoxiaolin fef00ba5e9 sap-组合 1 year ago
zhaoxiaolin 566bff9566 工艺穿梭框bug修复 1 year ago
A0010407 73a3d5ce6d 基础信息仓库库区货位+bom+设备 1 year ago
A0010407 bea6dee309 基础信息设备+产品 1 year ago
A0010407 9692f1e09e 基础信息产品+bom 1 year ago
A0010407 dbd2f24a45 基础信息班组班次 1 year ago
A0010407 ec89c8db95 基础信息班次 1 year ago
wws 2492c033a4 Merge remote-tracking branch 'origin/master' 1 year ago
wws 82a6ce44f2 湿料计划 1 year ago
A0010407 2de86224d7 基础信息供应商 1 year ago
A0010407 087174b6f6 基础信息客户+工艺bom 1 year ago
wws ac62f12294 计划模块(白坯订单删除BUG解决) 1 year ago
wws 2ec12ec09a Merge remote-tracking branch 'origin/master' 1 year ago
wws ed94033b38 计划模块(白坯订单拆分BUG解决) 1 year ago
A0010407 3464268b0c 基础信息班组 1 year ago
wws 47dfd51ab1 Merge remote-tracking branch 'origin/master' 1 year ago
wws 8cbab51130 计划模块(白坯订单删除功能) 1 year ago
A0010407 b241cfe542 基础信息BOM 1 year ago
zhaoxiaolin f778b42cbc sap模块代码合并 1 year ago
wws a0e42c4565 Merge remote-tracking branch 'origin/master' 1 year ago
wws 38f48e54bc 计划模块(工单管理湿料检验+打印功能字段显示BUG解决) 1 year ago
A0010407 a84344faca 工艺BOM改表 1 year ago
A0010407 de03593a26 基础信息客户管理 1 year ago
wws 73ed0f121c Merge remote-tracking branch 'origin/master' 1 year ago
wws 5d0c9936b3 白坯订单管理 1 year ago
A0010407 b4741a2cbc 基础信息工厂 1 year ago
wws 8d24223198 白坯订单管理 1 year ago
wws 04de6bbefa Merge remote-tracking branch 'origin/master' 1 year ago
wws 3466e0602e 白坯订单管理 1 year ago
A0010407 14a5fa293c 动态获取设备类别 1 year ago
wws 8f803da334 Merge remote-tracking branch 'origin/master' 1 year ago
wws 343bac2b82 白坯订单管理 1 year ago
A0010407 2cbc14495f 工作中心 1 year ago
A0010407 b21be8e910 Merge remote-tracking branch 'origin/master' 1 year ago
wws 1f0fd5b808 Merge remote-tracking branch 'origin/master' 1 year ago
wws 05720ea990 白坯订单管理(新增+拆分) 1 year ago
A0010407 fb90f08b4b 基础信息 设备+库区优化 1 year ago
chj 39773ffbc8 成品销售出库修改 1 year ago
zhaoxiaolin 3da4915f66 sap包删掉 1 year ago
zhaoxiaolin 404b202516 sap 1 year ago
zhaoxiaolin 1b53ac43d9 首页 1 year ago
wws 87bb08a360 计划模块(白坯订单管理) 1 year ago
wws 9229c77301 计划模块(优化) 1 year ago
zhaoxiaolin 473f789631 sap报工添加关闭订单,修改工单报工状态逻辑 1 year ago
wws 34c1159514 Merge remote-tracking branch 'origin/master' 1 year ago
wws 2d6950544f 计划模块(成品订单导入) 1 year ago
zhaoxiaolin 4bb54eb451 sap同步修改 1 year ago
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