1613 Commits (a8e76d04cc41d3976b8921d434160dbba638d80f)

Author SHA1 Message Date
zhaoxiaolin b5933cc7f2 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin dd6f38a8c5 来料检验+微信2 2 years ago
mengjiao 775727698e Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 2eafce98d6 wms包材部分修改48 2 years ago
zhaoxiaolin d04791d6a4 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 2a4eb59fc0 来料检验+微信 2 years ago
mengjiao ef694dcc8f Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao d9d8b910c2 wms包材部分修改47 2 years ago
A0010407 9bd854d9d9 2024-5-15 基础信息-班组-增加关于微信号逻辑 2 years ago
shaoyong f4703186e0 通知公告 2 years ago
zhaoxiaolin 136e05a4e6 公共实体 2 years ago
shaoyong 1093be862a 通知公告 2 years ago
mengjiao 34a6b8a036 wms包材部分修改46 2 years ago
mengjiao 83daf5131c wms包材部分修改45 2 years ago
mengjiao d9b25567fb Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao eef3bdabd9 wms包材部分修改44 2 years ago
zhaoxiaolin 3240d511ff Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 715222563e 微信接口+bug 2 years ago
A0010407 bf09a60501 2024-5-13 基础信息管理-产品-新增报工汇率(可以0可以空) 2 years ago
mengjiao 284b2e89dc wms包材部分修改43 2 years ago
mengjiao 3f5ebda816 wms包材部分修改42 2 years ago
mengjiao 0127363fe9 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 5b94a750cb wms包材部分修改41 2 years ago
A0010407 8ecd7a6233 2024-5-13 基础信息-产品-报工汇率修改(可以是0,可以是空) 2 years ago
mengjiao 6b77d4282a Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 661a3198dc wms包材部分修改40 2 years ago
zhaoxiaolin 0dc626b9ae Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 30b9562287 bug 2 years ago
A0010407 f70f56fa9c 2024-5-13 设备优化 2 years ago
shaoyong 0262e1237a 成型机生产报表优化 2 years ago
zhaoxiaolin 5a88e45c35 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 325fd0ffa2 入库检验方案报告+烘房看板2 2 years ago
mengjiao 342e2895ec Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 1d5c1d46c4 wms成品部分修改40 2 years ago
zhaoxiaolin 5d563721de 入库检验方案报告+烘房看板2 2 years ago
zhaoxiaolin 6031e3f347 入库检验方案报告+烘房看板2 2 years ago
mengjiao 38075ba1f2 wms成品部分修改39 2 years ago
mengjiao 4eb381790d wms成品部分修改38 2 years ago
mengjiao 6300af9a03 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao f33f28d00e wms成品部分修改37 2 years ago
shaoyong 21a01669d2 成型机生产报表优化 2 years ago
A0010407 a05ea11a60 2024-5-6 设备模块-点检巡检保养判空问题2 2 years ago
zhaoxiaolin 87c4e71d3d 检验方案、检测项配置增加两项+报工汇率加到成品上 2 years ago
A0010407 8c18e67b1c 2024-5-6 设备模块-点检巡检判空问题 2 years ago
A0010407 a7e2eccc70 2024-5-6 设备模块-点检巡检保养工单-图片等问题 2 years ago
A0010407 ee84f9b8ed 2024-5-6 设备模块-单次保养逻辑 2 years ago
zhaoxiaolin 5578ef5c3c 检验方案、检测项配置增加两项 2 years ago
zhaoxiaolin 498f1bd2d8 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 3293b83595 预报工+产线调拨 2 years ago
mengjiao 2587c244f1 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 77384a9e35 wms成品部分修改36(不同线体) 2 years ago
zhaoxiaolin a823ac786a 产线调拨+预报工 2 years ago
zhaoxiaolin f7bfe55f23 首页未开工提醒 2 years ago
zhaoxiaolin f8c5a02b42 紧急bug 2 years ago
zhaoxiaolin ea660c7686 物料工艺变更 2 years ago
zhaoxiaolin 9082322187 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin dbcf841720 湿料计划删除功能 2 years ago
shaoyong ea89b6779b 成型机生产报表 2 years ago
mengjiao 6b33ebdcf5 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 93fbba26e6 wms成品部分修改35(已经过账的数量) 2 years ago
zhaoxiaolin 9b8457c07f 工艺增加物料同步工艺按钮 2 years ago
mengjiao d3756bee73 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao a111077f50 wms成品部分修改34 2 years ago
Yangwl 2503a3233e 工艺路线接口 2 years ago
Yangwl 3b8717318b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
2 years ago
Yangwl 78229d7662 工艺路线同步接口优化 2 years ago
zhaoxiaolin 9ff3c39ad6 事务跟切库不能共生 2 years ago
zhaoxiaolin 7e524978f1 质量手持更新 2 years ago
mengjiao f63574ff1f wms成品部分修改33--他sap收货按钮部分批次的字符串长度不满足12 2 years ago
mengjiao 5ca685d78e wms成品部分修改32 2 years ago
mengjiao 90b4eac108 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 5d6572c095 wms成品部分修改31 2 years ago
zhaoxiaolin 6cd329334c 质量手持更新 2 years ago
zhaoxiaolin 45670f8b06 质量手持更新 2 years ago
zhaoxiaolin b5121fd2ab 只看今天和昨天的检验任务 2 years ago
zhaoxiaolin efa426825e mes相关看板 2 years ago
shaoyong 65fe3d2ef1 不良类型优化 2 years ago
mengjiao 938749cbf2 wms成品部分修改30 2 years ago
mengjiao d6953800b3 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 7d2ee34a17 wms成品部分修改29 2 years ago
shaoyong 02e833445a 工厂数据源修改,质量时间查询 2 years ago
mengjiao d83f72dbe8 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao f92a22cb35 wms成品部分修改28 2 years ago
zhaoxiaolin 3c0d9f16ad mes相关 2 years ago
zhaoxiaolin 374d2dc592 单层报工 2 years ago
zhaoxiaolin 330ec8b0d5 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 5354d2f617 首页+去掉订单修改功能 2 years ago
shaoyong d2e58e871c 工厂字典 2 years ago
zhaoxiaolin 6c71264935 mes bug 2 years ago
Yangwl 783dc284f9 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl 0c4901d833 计件工资删除 2 years ago
mengjiao 851cc92548 wms成品部分修改27 2 years ago
zhaoxiaolin 0f5dfce375 del_flag 2 years ago
zhaoxiaolin 387b28bae2 其它系统数据源打开 2 years ago
zhaoxiaolin a22bf0ea9c 复检bug修改 2 years ago
zhaoxiaolin e96450db07 手持批次排序 2 years ago
zhaoxiaolin 36bf1e057a 人员同步重复,bug修复 2 years ago
zhaoxiaolin 1706f6be9b 检验任务只保留当天和昨天的 2 years ago
zhaoxiaolin f27d2dcbe9 动态数据源垮系统加载 2 years ago
zhaoxiaolin 17531927aa 去掉批次重复领料单 2 years ago
zhaoxiaolin 46028c63a5 bug 2 years ago
zhaoxiaolin 514a1a7281 LJ88->LJ01 2 years ago
A0010407 82d9f94aa5 Merge remote-tracking branch 'origin/master' 2 years ago
A0010407 90cf6bfcae 2024-4-10 基础信息模块-设备-增加车间 2 years ago
mengjiao 9ef01c22ef Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 2bef67da01 wms成品提单接口部分修改2 2 years ago
zhaoxiaolin 1c7ea171cc 母单大盒数 子单数不变 2 years ago
zhaoxiaolin dc2c77d18a bug修复 2 years ago
shaoyong 800fe11ea5 检验节点人员绑定修改 2 years ago
shaoyong 335363e994 检验节点人员绑定修改 2 years ago
mengjiao fbf5dfe27e Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao f2d0e12e62 wms成品页面查询接口部分修改 2 years ago
shaoyong 3dd63e2288 线体管理功能 2 years ago
shaoyong b5cd9e76f2 检验节点人员绑定 2 years ago
zhaoxiaolin 7859315038 关闭订单 2 years ago
Yangwl 82891f72d2 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl 27e3852e37 SAP工单关闭修改 2 years ago
zhaoxiaolin 216911b8c0 来料增加来料类型 2 years ago
zhaoxiaolin 1911b6657d 三层报工bug修复 2 years ago
mengjiao faa2cc217d wms销售出库的提单接口32 2 years ago
mengjiao d6f2a640ec Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 4aa80a332a wms销售出库的提单接口31 2 years ago
zhaoxiaolin a7ad51edda 来料bc标识 2 years ago
A0010407 835d1da2ac 2024-04-07 基础信息-产品-报工汇率2 2 years ago
A0010407 4a3367df37 2024-04-07 基础信息模块-产品-加报工汇率 2 years ago
zhaoxiaolin 037498849f LJ04的订单接入 2 years ago
zhaoxiaolin da4578bfb0 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin cc26587ff6 巡检定时任务修改 2 years ago
Yangwl 8b39a2d210 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl 35e453de09 成品备货单接口 2 years ago
A0010407 f32a40142a 2024-4-3 基础信息管理-优化SQL 2 years ago
mengjiao 31370e80c4 wms成品转储部分代码修改30 2 years ago
zhaoxiaolin b7bfb7b1ba 来料去重修改+成品修改设备+看板bug修改 2 years ago
mengjiao 2b7e105dff Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 5abd5d3bb7 wms成品调拨部分代码修改29 2 years ago
A0010407 132c2dd84d 2024-4-1 设备管理-设备运行记录-定时任务-设备生成不全+创建人不对 2 years ago
A0010407 d5cee2a8f8 2024-4-1 设备管理模块-点检巡检-选择后提示 2 years ago
A0010407 7069e270f2 2024-4-1 设备模块-除了组线全部展示 2 years ago
shaoyong efa4d62224 Merge remote-tracking branch 'origin/master' 2 years ago
shaoyong cabcceb2a0 物料组优化空数据 2 years ago
A0010407 a4e2b7792a 2024-4-1 质量导入还原 2 years ago
A0010407 37260b893b 2024-4-1 质量模块-导入-属性 2 years ago
zhaoxiaolin 9395573da3 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin b3bcf1594f 夜班巡检 2 years ago
mengjiao cff213a3d0 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 080e34f4ff wms成品调拨部分代码修改28 2 years ago
shaoyong 70de333f7f 物料组新建 2 years ago
shaoyong c58ab6cb04 物料组新建优化 2 years ago
shaoyong 8e8c9af514 物料组新增导入优化 2 years ago
zhaoxiaolin d17f929ad4 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 9c4b43216b 细节升级 2 years ago
mengjiao f8e381df2d Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao dfc2258768 wms成品调拨部分代码修改27 2 years ago
A0010407 0fbef62ebb 2024-3-29 设备模块-1.看板公式改变 2.手持维修时间 3.管理系统维修加字段 2 years ago
zhaoxiaolin 0eecd31a19 来料检验上线 2 years ago
shaoyong 5ea60773d6 检验任务不良类型优化 2 years ago
shaoyong 677c6ddb83 人员绑定优化 2 years ago
zhaoxiaolin 67c6a27168 bug修复2 2 years ago
Yangwl 5b0fb2d333 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl 5bfd9fa520 来料检验增加物料凭证号、物料凭证中的项目 2 years ago
zhaoxiaolin 2165d42d93 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin bf4b93fe23 bug修复 2 years ago
mengjiao 71a042006d Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao b0c711c443 wms成品部分代码修改26 2 years ago
zhaoxiaolin edb80d785a qc_check_task_defect数据添加逻辑修改 2 years ago
zhaoxiaolin 43211b5257 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 3486c00461 qc_check_task_defect数据添加逻辑修改 2 years ago
mengjiao 1af3940012 wms成品部分代码修改25 2 years ago
mengjiao 2e38a77da3 wms成品部分代码修改24 2 years ago
mengjiao 59c433642a Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao bcf35f37b4 wms包材出库部分代码修改23 2 years ago
zhaoxiaolin f28c8d5bb4 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 51613502f2 qc bug修改3 2 years ago
mengjiao c5f002597a Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 14c21142a5 wms包材出库部分代码修改22 2 years ago
zhaoxiaolin b0c2ef28cf qc bug修改2 2 years ago
zhaoxiaolin fb85f305b9 qc bug修改1 2 years ago
A0010407 ca51dbda0c 2024-3-27 基础信息-设备-去掉设备名称校验 2 years ago
Yangwl 1424b9c3a1 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl 0717f35d64 计件工资基础信息维护修改 2 years ago
zhaoxiaolin fbd9703421 报工更新remark 2 years ago
zhaoxiaolin fc21de5529 报工损耗添加物料,精确到半成品 2 years ago
shaoyong e0be502d8f 优化 2 years ago
zhaoxiaolin 10c0a7c130 报工增加remark 2 years ago
shaoyong 5856609c63 人员检验节点绑定 2 years ago
Yangwl 27853f2ac9 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl af833e891a 物料主数据同步接口更改,计件薪酬基础信息修改,SAP报工接口增加备注 2 years ago
zhaoxiaolin 270495c0ab 报工组件修改11 2 years ago
zhaoxiaolin a38d0d32e5 报工组件修改10 2 years ago
zhaoxiaolin 1204f6fced 报工组件修改9 2 years ago
zhaoxiaolin 0e86b6715a 报工+批次可以重复+其它细节功能改善7 2 years ago
zhaoxiaolin ab377c7413 报工+批次可以重复+其它细节功能改善6 2 years ago
mengjiao c5e85f71af Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao ff952cf249 wms成品出库部分代码修改21 2 years ago
zhaoxiaolin b013d280ce Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 6122f06e7b 报工+批次可以重复+其它细节功能改善5 2 years ago
mengjiao 51a1b31b27 wms成品出库部分代码修改20 2 years ago
mengjiao 2fa6f29116 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao a3c2a81a8f wms成品出库部分代码修改18 2 years ago
zhaoxiaolin 767eef01fb 报工+批次可以重复+其它细节功能改善4 2 years ago
zhaoxiaolin 26ab01f44c 报工+批次可以重复+其它细节功能改善3 2 years ago
zhaoxiaolin 29c2ca8448 报工+批次可以重复+其它细节功能改善2 2 years ago
A0010407 53cc4a78b5 2024-3-22 基础信息管理模块设备-设备类别选择bug 2 years ago
Yangwl ef5954f39a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
2 years ago
Yangwl 0efb388eb1 SAP来料检验数据接口修改 2 years ago
zhaoxiaolin dd16e06623 报工+批次可以重复+其它细节功能改善 2 years ago
zhaoxiaolin eacf18a4a8 人员信息同步2.0 2 years ago
zhaoxiaolin 8a0a9b7634 人员信息同步+报工修改 2 years ago
zhaoxiaolin 3dcc838eaa 来料检验生成-参数2 2 years ago
mengjiao b87576a1eb wms成品出库部分代码修改17 2 years ago
A0010407 2ccd0cab8f 2024-3-20 提交代码有问题 2 years ago
zhaoxiaolin 6e8846e562 来料检验生成-参数 2 years ago
zhaoxiaolin ef0b1a416e 来料检验生成 2 years ago
A0010407 264916d073 2024.3.19-3.20 系统模块、定时任务模块-人力资源基础信息部门、岗位定时任务 2 years ago
Yangwl de31118290 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl fa2a3949cf 来料接口 2 years ago
zhaoxiaolin 05c3187e70 成品工艺靠上 2 years ago
zhaoxiaolin 5676606f68 问题清单处理1.0 2 years ago
shaoyong 3dc156131b 质量目标显示优化 2 years ago
shaoyong 8c658b1e46 Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 40c14a4a36 去掉批次重复校验 2 years ago
zhaoxiaolin c8e9bd9791 报工修改物料组成+订单计划后台加下发二次校验 2 years ago
mengjiao 5668850118 wms包材出库部分代码修改16---反冲排序 2 years ago
shaoyong ba6ab6dd2b 质量目标优化,人员线体 2 years ago
mengjiao 705fdb1a3d Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 2b52d4e7cd wms成品部分代码修改15 2 years ago
Yangwl 1d0dda6dab SAP物料同步增加基本计量单位字段 2 years ago
Yangwl 4e04cf0560 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl 6db6289d4d SAP订单组件修改接口、来料接口、成品备货单接口 2 years ago
mengjiao 5e11d53783 wms成品部分代码修改14 2 years ago
mengjiao adedbe57f3 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao d18d371883 wms成品部分代码修改13 2 years ago
zhaoxiaolin ebc69796ab Merge remote-tracking branch 'origin/master' 2 years ago
zhaoxiaolin 1801ac7122 收坯机看板展示数据+成品订单删除功能 2 years ago
A0010407 5fac9b8abe 2024-3-13 设备模块-点检提示信息 2 years ago
A0010407 916d9d86ff 2024-3-13 设备管理系统-设备看板-设备有效利用率公式修改 2 years ago
A0010407 0128967ab9 2024-3-13 基础信息管理-设备管理-增加sap_code和sap_name 2 years ago
shaoyong e38f9fe567 质量模块优化,质量目标优化 2 years ago
mengjiao b7852ebc00 wms成品部分代码修改12 2 years ago
mengjiao 1f61137519 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao 3cfb4291ab wms成品部分代码修改11 2 years ago
zhaoxiaolin cb81c6165a 质量+增加线体(检查地点);质量看板-产品异常趋势 2 years ago
mengjiao e96300722b wms白坯部分代码修改10 2 years ago
mengjiao afd05fdfed wms白坯部分代码修改9 2 years ago
mengjiao c41b1a0b02 Merge remote-tracking branch 'origin/master' 2 years ago
mengjiao ff9b1c3cb9 wms白坯部分代码修改8 2 years ago
Yangwl 54a0e76ed1 Merge remote-tracking branch 'origin/master' 2 years ago
Yangwl 79af2cb25b 计件工资修改 2 years ago
zhaoxiaolin 73a3ffbc3d 质量目标暂时注释 2 years ago
zhaoxiaolin 217a7ee237 巡检任务调整回一小时产生一条;成品订单编辑/删除功能优化 2 years ago