1802 Commits (96671e9717bb5f5b600ea16b51a96c86b71ef17d)

Author SHA1 Message Date
zhaoxiaolin e333fa5d73 来料oa接口调整2 12 months ago
zhaoxiaolin 0cd19c21d2 来料oa接口调整 12 months ago
A0010407 95dcfd10db 2024-07-19 设备-组线问题导致点检任务不生成 12 months ago
zhaoxiaolin 57e5bf1490 领料单新增字段 12 months ago
zhaoxiaolin cdb7b88a36 系统升级 12 months ago
zhaoxiaolin 355d8e6d6d 测试系统升级 12 months ago
A0010407 746f963f3c 2024-07-17 设备-手持-点检巡检保养提交后微信提醒 12 months ago
A0010407 25e7440973 2024-07-16 设备-点检、巡检、保养任务组线展示PC端 12 months ago
yinq db41cdb221 update - ems功能优化 12 months ago
zhaoxiaolin 2c6c9ef7f7 人员最少的 12 months ago
zhaoxiaolin bab6e368e1 Merge remote-tracking branch 'origin/master' 12 months ago
zhaoxiaolin e111a303b8 自动排产2.0 12 months ago
mengjiao cad9c6aab4 wms采购提单-送货单提单--修改6 12 months ago
mengjiao 1a780cb6fd Merge remote-tracking branch 'origin/master' 12 months ago
mengjiao 72c07c3ecf wms采购提单-送货单提单--修改5 12 months ago
zhaoxiaolin f16b434b1b 企业微信重复发送日志追踪2 12 months ago
zhaoxiaolin 86b504972a Merge remote-tracking branch 'origin/master' 12 months ago
zhaoxiaolin 1deb5de07d 企业微信重复发送日志追踪 12 months ago
mengjiao d9acff1f1d wms采购提单-送货单提单--修改4 12 months ago
mengjiao 01c26850ef wms采购提单-送货单提单--修改3 12 months ago
zhaoxiaolin 30c0376ac7 手持发起oa 12 months ago
mengjiao 183e40745f wms采购提单-送货单提单--修改2 12 months ago
mengjiao d16214e62c Merge remote-tracking branch 'origin/master' 12 months ago
mengjiao 0b6a8d98c5 wms采购提单-送货单提单--字段修改 12 months ago
zhaoxiaolin fac710cd1e Merge remote-tracking branch 'origin/master' 12 months ago
zhaoxiaolin 6276ae47f6 bug修复 12 months ago
mengjiao cbe3d06cdb Merge remote-tracking branch 'origin/master' 12 months ago
mengjiao 159aceedb0 wms包材出库查询--反冲类型 12 months ago
zhaoxiaolin a8380b967c bug修复 12 months ago
mengjiao 943f60e3e7 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 7f36ae8a66 wms送货单获取 1 year ago
A0010407 7c6d4e90fc 2024-07-09 设备-备品备件-手持提示限制错误+备品备件出入库页面展示问题优化 1 year ago
zhaoxiaolin 5ac34a2a8a 修复 1 year ago
A0010407 4c7756eeba 2024-07-09 设备手持保养和巡检去掉时间 1 year ago
Yangwl 186d0d0fa8 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 7dd75d5c5d Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 6ea636d819 Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 e9710a7dfe 物料附属属性 1 year ago
Yangwl c9012e23ea SRM系统送货单接口 1 year ago
A0010407 b418483af2 2024-07-05 设备-备品备件出入库和手持对接接口 1 year ago
A0010407 0463d5b512 2024-07-05 设备-备品备件-导入和新增加限制 1 year ago
A0010407 fe306c43a7 2024-07-04 设备-点检、巡检、保养、维修-检查人姓名+检查人工号 1 year ago
A0010407 b13b68d10a 2024-07-04 设备模块-备品备件出入库 1 year ago
zhaoxiaolin a79aa07f32 包装线标准效率计算修改 1 year ago
yinq 9779dd80f3 update - 能源整点数据 1 year ago
zhaoxiaolin af49b3dead 质量CPK 1 year ago
陈恒杰 a6cf1c1632 Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 8ce2bf7e08 chj 1 year ago
zhaoxiaolin 1038bc3f27 质量oa 1 year ago
zhaoxiaolin 31e2d8f30e 日生产报表加白坯参考按钮 1 year ago
zhaoxiaolin 6d7f042ccb Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 9849d22d5b oa 1 year ago
zhaoxiaolin a8a5f52f54 ywl 1 year ago
zhaoxiaolin 2e5c27bc7c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
1 year ago
zhaoxiaolin a66aec3ac3 榄菊日生产报表--单层订单 1 year ago
Yangwl fe1cfe6eb4 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 845fc2fa00 计件工资、月度报表修改 1 year ago
zhaoxiaolin 8d926cfb7c 榄菊日生产报表导出格式、撤销报工的数据不算入计算逻辑修改 1 year ago
zhaoxiaolin fdfbce95ae 流程id修改 1 year ago
zhaoxiaolin 366fda79dc 质检物料组,物料信息导入 1 year ago
zhaoxiaolin fe49dcaa8e 质检物料组,物料信息导入 1 year ago
zhaoxiaolin 0785b6b95b 辅助排产1.0 1 year ago
zhaoxiaolin ad5b9ee7a3 辅助排产 1 year ago
zhaoxiaolin 156ed0e831 生产日报表人员调动 1 year ago
zhaoxiaolin 422aaae354 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin c4d7d1cb2b 生产日报表人员调动--取最大人数 1 year ago
Yangwl 79cf66af1f Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 96baa90c98 OA流程ID修改 1 year ago
zhaoxiaolin c97e3fc817 报工-自动添加项目编码2 1 year ago
zhaoxiaolin 0e973d74c1 报工-自动添加项目编码 1 year ago
zhaoxiaolin a4d46f6c84 辅助排产部分 1 year ago
Yangwl ef6c50041f Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl da7a9054d5 月度报表、标准效率计算方式 1 year ago
A0010407 13f1fc2d22 2024-6-21 设备模块-备品备件导入-去掉多余限制,只留下四个限制 1 year ago
A0010407 abe3d2eefd 2024-6-21 基础信息管理系统-设备-备品备件绑定问题 1 year ago
zhaoxiaolin b5f14e9f37 定量分析 1 year ago
zhaoxiaolin 918c57bd39 报表加日志+质检查自动判定+其它 1 year ago
mengjiao 7330d3b4be wms成品退货提单修改5 1 year ago
mengjiao 2d6e2fc206 wms成品退货提单修改4 1 year ago
mengjiao 6edd217e4e wms成品退货提单修改3 1 year ago
Yangwl a62f1b43de Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl dc1b0e330d 能源单耗统计 1 year ago
zhaoxiaolin ac959caf49 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin ad229d3be1 del_flag = '0' 1 year ago
A0010407 49bdabd42d 2024-6-12 设备-检查项导入-循环周期 1 year ago
A0010407 0cad2248e7 2024-06-12 设备-检查项维护-导入 1 year ago
mengjiao c820d089b5 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 8f6330c1c6 wms成品退货提单修改2 1 year ago
zhaoxiaolin 782edad5b3 订单同步,改成时间范围 1 year ago
Yangwl 6e30ae994e Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 4aeedab8a0 SAP接口更改【订单同步、退货单输出】 1 year ago
zhaoxiaolin 99c37b5e59 bug修复 1 year ago
Yangwl 6bb5390cd3 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 26cd41d400 SAP接口修改 1 year ago
A0010407 93f28ca11a 2024-6-11 设备模块-备品备件-导入功能 1 year ago
zhaoxiaolin 196bde4ba4 1 1 year ago
zhaoxiaolin cb33c605cf 线体产品维护 1 year ago
A0010407 52c9c41a6d 2024-06-07 质量模块-抽样方案改版 1 year ago
mengjiao 67db458c5d wms成品退货提单修改 1 year ago
shaoyong 070b44f030 线体管理,修改 1 year ago
shaoyong 439b73e152 Merge remote-tracking branch 'origin/master' 1 year ago
shaoyong 6869af8869 线体管理 1 year ago
zhaoxiaolin 434d747f21 检验方案bug修改 1 year ago
A0010407 a6d9884ce2 Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 54b2d2b91f 2024-06-06 质量微信二次提醒2 1 year ago
Yangwl 3f40d63c52 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 91d95e0aaa 销售订单、退货单接口更改 1 year ago
A0010407 4f9f609e10 2024-06-06 质量/系统/定时任务模块-质量未检查检验任务一小时后再次提醒 1 year ago
mengjiao 5d89dfa31c Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 6d280550e7 wms包材出库查询新增页面修改 1 year ago
zhaoxiaolin da8a504b39 日生产报表查询逻辑修改 1 year ago
zhaoxiaolin 6b4c8f377b 抽样方案改版 1 year ago
yinq 536de3eddb update - 实时状态接口 1 year ago
zhaoxiaolin 9e74814a5e Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin f2dd3dcbc2 不切主库查微信id 1 year ago
yinq a45a9ae311 update - 整点数据 1 year ago
yinq 556e1f9030 update - 能源表具看板 1 year ago
shaoyong 0f107864a4 生产日报表-优化 1 year ago
zhaoxiaolin 0c0184020a 批次编辑升级2 1 year ago
zhaoxiaolin 4c42e02780 企业微信质检提醒+批次编辑升级 1 year ago
zhaoxiaolin ef2cae1d7b 企业微信默认用工号 1 year ago
mengjiao 21ac32c35c 到货登记记录页面--登记数量代码 1 year ago
mengjiao 4b713ab5de Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao e1015bcc9e 成品wcs部分代码修改 1 year ago
shaoyong a7d8206256 生产日报表-修改 1 year ago
shaoyong 4e13248175 生产日报表 1 year ago
A0010407 9ca999e0e1 2024-6-1 设备-备品备件-增删改查换表 1 year ago
shaoyong dfa5730cb3 生产日报表 1 year ago
shaoyong 959b9dbe19 生产日报表 1 year ago
zhaoxiaolin 5ebb81a661 看板和其它bug修复 1 year ago
Yangwl c9227dae4a Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 2b95424fe4 人员更新增加员工卡字段 1 year ago
A0010407 23d59474b7 2024-5-30 设备-维修-维修结果确认审核发送微信消息+保养换id 1 year ago
shaoyong 8ecedca10d 线体管理修改 1 year ago
zhaoxiaolin bec9763ca4 不合格企业微信发送 1 year ago
zhaoxiaolin 9c475ad73c Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 18434906db 成品检验oa流程 1 year ago
shaoyong 2cad02ff7b 线体管理修改 1 year ago
Yangwl 10a57885f0 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 45a5f33fe8 计件工资优化、能源模块增加数据源 1 year ago
zhaoxiaolin 965710511a 批次修改1 1 year ago
zhaoxiaolin 55d9b46a18 成品检验2.1 1 year ago
zhaoxiaolin 0d71cfde99 成品检验2.0 1 year ago
A0010407 ac634b5f61 2024-5-28 设备-保养-结果检验微信通知 1 year ago
zhaoxiaolin 9ba60dba19 成品检验 1 year ago
A0010407 c651a1212e 2024-5-28 设备-点检/巡检/保养-当工单删除后,无法重新生成问题 1 year ago
shaoyong c00a9ef1b9 生产工单,批次编辑 1 year ago
shaoyong 25d20b25c6 生产工单,批次编辑 1 year ago
A0010407 dd9bfb5496 2024-5-27 质量-来料/过程/库存-加逻辑删除 1 year ago
zhaoxiaolin 3dc6a44888 1 1 year ago
zhaoxiaolin 47c490ec4c 报工bug修复4 1 year ago
Yangwl 4b0ba99444 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 01acbe595e 计件工资统计改为只查询本人的 1 year ago
zhaoxiaolin 37273a2084 sap预报工+计划批次bug+报工备注bug修复3 1 year ago
zhaoxiaolin 2285e279b2 sap预报工+计划批次bug+报工备注bug修复3 1 year ago
zhaoxiaolin cdf72a20f6 sap预报工+计划批次bug+报工备注bug修复2 1 year ago
zhaoxiaolin a2de5b5fec sap预报工+计划批次bug+报工备注bug修复 1 year ago
A0010407 0ab3653d82 2024-5-24 设备-巡检/点检-填写记录-不合格会报修+增加手持来源字段 1 year ago
A0010407 81d4b8cc51 2024-5-24 设备-上位机-报修之后-发送微信+PDA修改 1 year ago
A0010407 13fd0189cb 2024-5-24 设备-手持-报修-报修后发送微信审核提醒 1 year ago
A0010407 540b362065 2024-5-24 设备-维修-快速工单-微信提醒 1 year ago
mengjiao 2884d55e73 wms部分代码修改 1 year ago
mengjiao b9932e8b4c Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao caa7ae0d98 wms包材收货修改---一个物料一个物料登记,记录登记数量修改2 1 year ago
A0010407 fdc8f9edad 2024-5-24 设备-报修-报修审核后发送微信维修通知 1 year ago
mengjiao 83c8ea6e34 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 5d46e8fd43 wms包材收货修改---一个物料一个物料登记,记录登记数量 1 year ago
A0010407 b777ca8e48 2024-5-23 设备管理-PC端报修-微信提醒 + open模块微信Post方法错误 1 year ago
Yangwl 80c65cc430 修改能源模块名 1 year ago
mengjiao 97ab482d44 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao f79c71bebe wms成品sap收获按钮中过账时批次的截取规则部分修改 1 year ago
zhaoxiaolin 449df55a08 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 2a52489c41 来料检验定时任务排查问题 1 year ago
mengjiao 0e5f5907e1 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 0f25ba8a3b wms成品部分修改 1 year ago
A0010407 3332d91cd1 2024-5-22 open模块-上位机报修新加字段 故障描述 1 year ago
yinq 951f2e3161 update - 水电实时数据 1 year ago
zhaoxiaolin 6ad5ed5fdd 领料单升级+报工批次删除功能 1 year ago
shaoyong 56553b4e8c 检测值修噶 1 year ago
zhaoxiaolin 752058a4ec 人员信息增加三个字段。质量导出模板bug修复 1 year ago
zhaoxiaolin 102261ec2d 8040包材固定码 1 year ago
mengjiao 764e94276f Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao d6b740ba50 wms包材部分修改50 1 year ago
shaoyong 5976bb34b4 检测方案修改 1 year ago
zhaoxiaolin 76fbd2a09b 白坯产量定时任务修正 1 year ago
zhaoxiaolin e15400be32 白坯产量定时任务修正 1 year ago
zhaoxiaolin 739e8edee1 白坯产量定时任务修正 1 year ago
A0010407 e548b0e3ce 2024-5-15 基础信息-产品-新增附属属性 1 year ago
A0010407 f13ce73f4f 2024-5-15 基础信息-产品-修改产品附属属性 1 year ago
zhaoxiaolin b5933cc7f2 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin dd6f38a8c5 来料检验+微信2 1 year ago
mengjiao 775727698e Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 2eafce98d6 wms包材部分修改48 1 year ago
zhaoxiaolin d04791d6a4 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 2a4eb59fc0 来料检验+微信 1 year ago
mengjiao ef694dcc8f Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao d9d8b910c2 wms包材部分修改47 1 year ago
A0010407 9bd854d9d9 2024-5-15 基础信息-班组-增加关于微信号逻辑 1 year ago
shaoyong f4703186e0 通知公告 1 year ago
zhaoxiaolin 136e05a4e6 公共实体 1 year ago
shaoyong 1093be862a 通知公告 1 year ago
mengjiao 34a6b8a036 wms包材部分修改46 1 year ago
mengjiao 83daf5131c wms包材部分修改45 1 year ago
mengjiao d9b25567fb Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao eef3bdabd9 wms包材部分修改44 1 year ago
zhaoxiaolin 3240d511ff Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 715222563e 微信接口+bug 1 year ago
A0010407 bf09a60501 2024-5-13 基础信息管理-产品-新增报工汇率(可以0可以空) 1 year ago
mengjiao 284b2e89dc wms包材部分修改43 1 year ago
mengjiao 3f5ebda816 wms包材部分修改42 1 year ago
mengjiao 0127363fe9 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 5b94a750cb wms包材部分修改41 1 year ago
A0010407 8ecd7a6233 2024-5-13 基础信息-产品-报工汇率修改(可以是0,可以是空) 1 year ago
mengjiao 6b77d4282a Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 661a3198dc wms包材部分修改40 1 year ago
zhaoxiaolin 0dc626b9ae Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 30b9562287 bug 1 year ago
A0010407 f70f56fa9c 2024-5-13 设备优化 1 year ago
shaoyong 0262e1237a 成型机生产报表优化 1 year ago
zhaoxiaolin 5a88e45c35 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 325fd0ffa2 入库检验方案报告+烘房看板2 1 year ago
mengjiao 342e2895ec Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 1d5c1d46c4 wms成品部分修改40 1 year ago
zhaoxiaolin 5d563721de 入库检验方案报告+烘房看板2 1 year ago
zhaoxiaolin 6031e3f347 入库检验方案报告+烘房看板2 1 year ago
mengjiao 38075ba1f2 wms成品部分修改39 1 year ago
mengjiao 4eb381790d wms成品部分修改38 1 year ago
mengjiao 6300af9a03 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao f33f28d00e wms成品部分修改37 1 year ago
shaoyong 21a01669d2 成型机生产报表优化 1 year ago
A0010407 a05ea11a60 2024-5-6 设备模块-点检巡检保养判空问题2 1 year ago
zhaoxiaolin 87c4e71d3d 检验方案、检测项配置增加两项+报工汇率加到成品上 1 year ago
A0010407 8c18e67b1c 2024-5-6 设备模块-点检巡检判空问题 1 year ago
A0010407 a7e2eccc70 2024-5-6 设备模块-点检巡检保养工单-图片等问题 1 year ago
A0010407 ee84f9b8ed 2024-5-6 设备模块-单次保养逻辑 1 year ago
zhaoxiaolin 5578ef5c3c 检验方案、检测项配置增加两项 1 year ago
zhaoxiaolin 498f1bd2d8 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 3293b83595 预报工+产线调拨 1 year ago
mengjiao 2587c244f1 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 77384a9e35 wms成品部分修改36(不同线体) 1 year ago
zhaoxiaolin a823ac786a 产线调拨+预报工 1 year ago
zhaoxiaolin f7bfe55f23 首页未开工提醒 1 year ago
zhaoxiaolin f8c5a02b42 紧急bug 1 year ago
zhaoxiaolin ea660c7686 物料工艺变更 1 year ago
zhaoxiaolin 9082322187 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin dbcf841720 湿料计划删除功能 1 year ago
shaoyong ea89b6779b 成型机生产报表 1 year ago
mengjiao 6b33ebdcf5 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 93fbba26e6 wms成品部分修改35(已经过账的数量) 1 year ago
zhaoxiaolin 9b8457c07f 工艺增加物料同步工艺按钮 1 year ago