1553 Commits (31e2d8f30e719a7abb421c3a1952271a20aac894)

Author SHA1 Message Date
zhaoxiaolin 9b8457c07f 工艺增加物料同步工艺按钮 9 months ago
mengjiao d3756bee73 Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao a111077f50 wms成品部分修改34 9 months ago
Yangwl 2503a3233e 工艺路线接口 9 months ago
Yangwl 3b8717318b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
9 months ago
Yangwl 78229d7662 工艺路线同步接口优化 9 months ago
zhaoxiaolin 9ff3c39ad6 事务跟切库不能共生 9 months ago
zhaoxiaolin 7e524978f1 质量手持更新 9 months ago
mengjiao f63574ff1f wms成品部分修改33--他sap收货按钮部分批次的字符串长度不满足12 9 months ago
mengjiao 5ca685d78e wms成品部分修改32 9 months ago
mengjiao 90b4eac108 Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao 5d6572c095 wms成品部分修改31 9 months ago
zhaoxiaolin 6cd329334c 质量手持更新 9 months ago
zhaoxiaolin 45670f8b06 质量手持更新 9 months ago
zhaoxiaolin b5121fd2ab 只看今天和昨天的检验任务 9 months ago
zhaoxiaolin efa426825e mes相关看板 9 months ago
shaoyong 65fe3d2ef1 不良类型优化 9 months ago
mengjiao 938749cbf2 wms成品部分修改30 9 months ago
mengjiao d6953800b3 Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao 7d2ee34a17 wms成品部分修改29 9 months ago
shaoyong 02e833445a 工厂数据源修改,质量时间查询 9 months ago
mengjiao d83f72dbe8 Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao f92a22cb35 wms成品部分修改28 9 months ago
zhaoxiaolin 3c0d9f16ad mes相关 9 months ago
zhaoxiaolin 374d2dc592 单层报工 9 months ago
zhaoxiaolin 330ec8b0d5 Merge remote-tracking branch 'origin/master' 9 months ago
zhaoxiaolin 5354d2f617 首页+去掉订单修改功能 9 months ago
shaoyong d2e58e871c 工厂字典 9 months ago
zhaoxiaolin 6c71264935 mes bug 9 months ago
Yangwl 783dc284f9 Merge remote-tracking branch 'origin/master' 9 months ago
Yangwl 0c4901d833 计件工资删除 9 months ago
mengjiao 851cc92548 wms成品部分修改27 9 months ago
zhaoxiaolin 0f5dfce375 del_flag 9 months ago
zhaoxiaolin 387b28bae2 其它系统数据源打开 9 months ago
zhaoxiaolin a22bf0ea9c 复检bug修改 9 months ago
zhaoxiaolin e96450db07 手持批次排序 9 months ago
zhaoxiaolin 36bf1e057a 人员同步重复,bug修复 9 months ago
zhaoxiaolin 1706f6be9b 检验任务只保留当天和昨天的 9 months ago
zhaoxiaolin f27d2dcbe9 动态数据源垮系统加载 9 months ago
zhaoxiaolin 17531927aa 去掉批次重复领料单 10 months ago
zhaoxiaolin 46028c63a5 bug 10 months ago
zhaoxiaolin 514a1a7281 LJ88->LJ01 10 months ago
A0010407 82d9f94aa5 Merge remote-tracking branch 'origin/master' 10 months ago
A0010407 90cf6bfcae 2024-4-10 基础信息模块-设备-增加车间 10 months ago
mengjiao 9ef01c22ef Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao 2bef67da01 wms成品提单接口部分修改2 10 months ago
zhaoxiaolin 1c7ea171cc 母单大盒数 子单数不变 10 months ago
zhaoxiaolin dc2c77d18a bug修复 10 months ago
shaoyong 800fe11ea5 检验节点人员绑定修改 10 months ago
shaoyong 335363e994 检验节点人员绑定修改 10 months ago
mengjiao fbf5dfe27e Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao f2d0e12e62 wms成品页面查询接口部分修改 10 months ago
shaoyong 3dd63e2288 线体管理功能 10 months ago
shaoyong b5cd9e76f2 检验节点人员绑定 10 months ago
zhaoxiaolin 7859315038 关闭订单 10 months ago
Yangwl 82891f72d2 Merge remote-tracking branch 'origin/master' 10 months ago
Yangwl 27e3852e37 SAP工单关闭修改 10 months ago
zhaoxiaolin 216911b8c0 来料增加来料类型 10 months ago
zhaoxiaolin 1911b6657d 三层报工bug修复 10 months ago
mengjiao faa2cc217d wms销售出库的提单接口32 10 months ago
mengjiao d6f2a640ec Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao 4aa80a332a wms销售出库的提单接口31 10 months ago
zhaoxiaolin a7ad51edda 来料bc标识 10 months ago
A0010407 835d1da2ac 2024-04-07 基础信息-产品-报工汇率2 10 months ago
A0010407 4a3367df37 2024-04-07 基础信息模块-产品-加报工汇率 10 months ago
zhaoxiaolin 037498849f LJ04的订单接入 10 months ago
zhaoxiaolin da4578bfb0 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin cc26587ff6 巡检定时任务修改 10 months ago
Yangwl 8b39a2d210 Merge remote-tracking branch 'origin/master' 10 months ago
Yangwl 35e453de09 成品备货单接口 10 months ago
A0010407 f32a40142a 2024-4-3 基础信息管理-优化SQL 10 months ago
mengjiao 31370e80c4 wms成品转储部分代码修改30 10 months ago
zhaoxiaolin b7bfb7b1ba 来料去重修改+成品修改设备+看板bug修改 10 months ago
mengjiao 2b7e105dff Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao 5abd5d3bb7 wms成品调拨部分代码修改29 10 months ago
A0010407 132c2dd84d 2024-4-1 设备管理-设备运行记录-定时任务-设备生成不全+创建人不对 10 months ago
A0010407 d5cee2a8f8 2024-4-1 设备管理模块-点检巡检-选择后提示 10 months ago
A0010407 7069e270f2 2024-4-1 设备模块-除了组线全部展示 10 months ago
shaoyong efa4d62224 Merge remote-tracking branch 'origin/master' 10 months ago
shaoyong cabcceb2a0 物料组优化空数据 10 months ago
A0010407 a4e2b7792a 2024-4-1 质量导入还原 10 months ago
A0010407 37260b893b 2024-4-1 质量模块-导入-属性 10 months ago
zhaoxiaolin 9395573da3 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin b3bcf1594f 夜班巡检 10 months ago
mengjiao cff213a3d0 Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao 080e34f4ff wms成品调拨部分代码修改28 10 months ago
shaoyong 70de333f7f 物料组新建 10 months ago
shaoyong c58ab6cb04 物料组新建优化 10 months ago
shaoyong 8e8c9af514 物料组新增导入优化 10 months ago
zhaoxiaolin d17f929ad4 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 9c4b43216b 细节升级 10 months ago
mengjiao f8e381df2d Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao dfc2258768 wms成品调拨部分代码修改27 10 months ago
A0010407 0fbef62ebb 2024-3-29 设备模块-1.看板公式改变 2.手持维修时间 3.管理系统维修加字段 10 months ago
zhaoxiaolin 0eecd31a19 来料检验上线 10 months ago
shaoyong 5ea60773d6 检验任务不良类型优化 10 months ago
shaoyong 677c6ddb83 人员绑定优化 10 months ago
zhaoxiaolin 67c6a27168 bug修复2 10 months ago
Yangwl 5b0fb2d333 Merge remote-tracking branch 'origin/master' 10 months ago
Yangwl 5bfd9fa520 来料检验增加物料凭证号、物料凭证中的项目 10 months ago
zhaoxiaolin 2165d42d93 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin bf4b93fe23 bug修复 10 months ago
mengjiao 71a042006d Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao b0c711c443 wms成品部分代码修改26 10 months ago
zhaoxiaolin edb80d785a qc_check_task_defect数据添加逻辑修改 10 months ago
zhaoxiaolin 43211b5257 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 3486c00461 qc_check_task_defect数据添加逻辑修改 10 months ago
mengjiao 1af3940012 wms成品部分代码修改25 10 months ago
mengjiao 2e38a77da3 wms成品部分代码修改24 10 months ago
mengjiao 59c433642a Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao bcf35f37b4 wms包材出库部分代码修改23 10 months ago
zhaoxiaolin f28c8d5bb4 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 51613502f2 qc bug修改3 10 months ago
mengjiao c5f002597a Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao 14c21142a5 wms包材出库部分代码修改22 10 months ago
zhaoxiaolin b0c2ef28cf qc bug修改2 10 months ago
zhaoxiaolin fb85f305b9 qc bug修改1 10 months ago
A0010407 ca51dbda0c 2024-3-27 基础信息-设备-去掉设备名称校验 10 months ago
Yangwl 1424b9c3a1 Merge remote-tracking branch 'origin/master' 10 months ago
Yangwl 0717f35d64 计件工资基础信息维护修改 10 months ago
zhaoxiaolin fbd9703421 报工更新remark 10 months ago
zhaoxiaolin fc21de5529 报工损耗添加物料,精确到半成品 10 months ago
shaoyong e0be502d8f 优化 10 months ago
zhaoxiaolin 10c0a7c130 报工增加remark 10 months ago
shaoyong 5856609c63 人员检验节点绑定 10 months ago
Yangwl 27853f2ac9 Merge remote-tracking branch 'origin/master' 10 months ago
Yangwl af833e891a 物料主数据同步接口更改,计件薪酬基础信息修改,SAP报工接口增加备注 10 months ago
zhaoxiaolin 270495c0ab 报工组件修改11 10 months ago
zhaoxiaolin a38d0d32e5 报工组件修改10 10 months ago
zhaoxiaolin 1204f6fced 报工组件修改9 10 months ago
zhaoxiaolin 0e86b6715a 报工+批次可以重复+其它细节功能改善7 10 months ago
zhaoxiaolin ab377c7413 报工+批次可以重复+其它细节功能改善6 10 months ago
mengjiao c5e85f71af Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao ff952cf249 wms成品出库部分代码修改21 10 months ago
zhaoxiaolin b013d280ce Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 6122f06e7b 报工+批次可以重复+其它细节功能改善5 10 months ago
mengjiao 51a1b31b27 wms成品出库部分代码修改20 10 months ago
mengjiao 2fa6f29116 Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao a3c2a81a8f wms成品出库部分代码修改18 10 months ago
zhaoxiaolin 767eef01fb 报工+批次可以重复+其它细节功能改善4 10 months ago
zhaoxiaolin 26ab01f44c 报工+批次可以重复+其它细节功能改善3 10 months ago
zhaoxiaolin 29c2ca8448 报工+批次可以重复+其它细节功能改善2 10 months ago
A0010407 53cc4a78b5 2024-3-22 基础信息管理模块设备-设备类别选择bug 10 months ago
Yangwl ef5954f39a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
10 months ago
Yangwl 0efb388eb1 SAP来料检验数据接口修改 10 months ago
zhaoxiaolin dd16e06623 报工+批次可以重复+其它细节功能改善 10 months ago
zhaoxiaolin eacf18a4a8 人员信息同步2.0 10 months ago
zhaoxiaolin 8a0a9b7634 人员信息同步+报工修改 10 months ago
zhaoxiaolin 3dcc838eaa 来料检验生成-参数2 10 months ago
mengjiao b87576a1eb wms成品出库部分代码修改17 10 months ago
A0010407 2ccd0cab8f 2024-3-20 提交代码有问题 10 months ago
zhaoxiaolin 6e8846e562 来料检验生成-参数 10 months ago
zhaoxiaolin ef0b1a416e 来料检验生成 10 months ago
A0010407 264916d073 2024.3.19-3.20 系统模块、定时任务模块-人力资源基础信息部门、岗位定时任务 10 months ago
Yangwl de31118290 Merge remote-tracking branch 'origin/master' 10 months ago
Yangwl fa2a3949cf 来料接口 10 months ago
zhaoxiaolin 05c3187e70 成品工艺靠上 10 months ago
zhaoxiaolin 5676606f68 问题清单处理1.0 10 months ago
shaoyong 3dc156131b 质量目标显示优化 10 months ago
shaoyong 8c658b1e46 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 40c14a4a36 去掉批次重复校验 10 months ago
zhaoxiaolin c8e9bd9791 报工修改物料组成+订单计划后台加下发二次校验 10 months ago
mengjiao 5668850118 wms包材出库部分代码修改16---反冲排序 10 months ago
shaoyong ba6ab6dd2b 质量目标优化,人员线体 10 months ago
mengjiao 705fdb1a3d Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao 2b52d4e7cd wms成品部分代码修改15 10 months ago
Yangwl 1d0dda6dab SAP物料同步增加基本计量单位字段 10 months ago
Yangwl 4e04cf0560 Merge remote-tracking branch 'origin/master' 10 months ago
Yangwl 6db6289d4d SAP订单组件修改接口、来料接口、成品备货单接口 10 months ago
mengjiao 5e11d53783 wms成品部分代码修改14 10 months ago
mengjiao adedbe57f3 Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao d18d371883 wms成品部分代码修改13 10 months ago
zhaoxiaolin ebc69796ab Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 1801ac7122 收坯机看板展示数据+成品订单删除功能 10 months ago
A0010407 5fac9b8abe 2024-3-13 设备模块-点检提示信息 10 months ago
A0010407 916d9d86ff 2024-3-13 设备管理系统-设备看板-设备有效利用率公式修改 10 months ago
A0010407 0128967ab9 2024-3-13 基础信息管理-设备管理-增加sap_code和sap_name 10 months ago
shaoyong e38f9fe567 质量模块优化,质量目标优化 10 months ago
mengjiao b7852ebc00 wms成品部分代码修改12 10 months ago
mengjiao 1f61137519 Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao 3cfb4291ab wms成品部分代码修改11 10 months ago
zhaoxiaolin cb81c6165a 质量+增加线体(检查地点);质量看板-产品异常趋势 10 months ago
mengjiao e96300722b wms白坯部分代码修改10 11 months ago
mengjiao afd05fdfed wms白坯部分代码修改9 11 months ago
mengjiao c41b1a0b02 Merge remote-tracking branch 'origin/master' 11 months ago
mengjiao ff9b1c3cb9 wms白坯部分代码修改8 11 months ago
Yangwl 54a0e76ed1 Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl 79af2cb25b 计件工资修改 11 months ago
zhaoxiaolin 73a3ffbc3d 质量目标暂时注释 11 months ago
zhaoxiaolin 217a7ee237 巡检任务调整回一小时产生一条;成品订单编辑/删除功能优化 11 months ago
A0010407 27a1e2bba2 2024-3-11 设备看板问题修改+维修快速工单修改 11 months ago
shaoyong d62bb2fc85 质量目标模块 11 months ago
zhaoxiaolin 3a03b61959 订单创建加版本号2 11 months ago
zhaoxiaolin c3125ca18b 订单创建加版本号 11 months ago
zhaoxiaolin adbf632d74 巡检任务会多一条 11 months ago
zhaoxiaolin 93d33895e7 报工公式修改+订单关闭接口修改+巡检多出一条的bug修复 11 months ago
A0010407 841b3029c2 2024-3-8 设备模块-设备看板问题解决 11 months ago
zhaoxiaolin 8bb60b5212 巡检任务定点执行 11 months ago
A0010407 949f6696bf 2024-3-7 设备看板部门 11 months ago
zhaoxiaolin eabfa9449d 报工增加sap产线 11 months ago
Yangwl 2f2beda622 Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl 06d6da1045 报工返回结果修改 11 months ago
A0010407 4adc2b3fac 2024-3-7 质量模块、定时任务模块-来料检验批量创建检验任务-定时任务 11 months ago
Yangwl 4e0c487efe Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl f75db486b3 SAP报工接口增加产线编码信息 11 months ago
zhaoxiaolin 44a65a7b1d 报工物料去掉多余的 11 months ago
zhaoxiaolin cb40968a0f 报工物料调整 11 months ago
mengjiao e69adf1ea1 wms白坯部分代码修改7 11 months ago
mengjiao 2c0751b871 wms白坯部分代码修改6 11 months ago
mengjiao 443cc305ee Merge remote-tracking branch 'origin/master' 11 months ago
mengjiao 6726366b44 wms白坯部分代码修改5 11 months ago
A0010407 6a19ac0e38 2024-3-4 基础数据设备、产品显示顺序修改 11 months ago
mengjiao 75c3ffe061 Merge remote-tracking branch 'origin/master' 11 months ago
mengjiao 7ea47c8e44 wms白坯部分代码修改4 11 months ago
陈恒杰 6c044ead06 Merge remote-tracking branch 'origin/master' 11 months ago
陈恒杰 3504cefcb1 粉料接口 11 months ago
mengjiao 2a414a57d6 Merge remote-tracking branch 'origin/master' 11 months ago
mengjiao 131d132a2a wms白坯部分代码修改3 11 months ago
A0010407 c9778a767e 2024-3-4 基础数据管理客户供应商优化 11 months ago
zhaoxiaolin 04ee02c8e9 三层报工功能调整 11 months ago
zhaoxiaolin e37f464ea8 单层报工功能调整 11 months ago
zhaoxiaolin 1a331d6b42 多层订单改造2.0 11 months ago
Yangwl a2e70c021b SAP工单同步接口增加层级字段 11 months ago
Yangwl b2dd3e1990 Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl 0bdafef7be 订单创建修改 11 months ago
zhaoxiaolin 41f2c820fb 多层订单改造1.0 11 months ago
Yangwl 40fee31fab Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl dd404aca7f 订单创建接口修改 11 months ago
A0010407 784c20f172 2024-2-28 设备看板 维修工单判空处理+显示限制条件 11 months ago
A0010407 09b59c4d30 2024-2-28 设备模块-看板-维修工单判空处理+管理系统汇总报表排序 11 months ago
A0010407 7f2628410a 2024-2-28 设备模块 设备完好率看板接口调整 11 months ago
zhaoxiaolin a4f45a2cbf Merge remote-tracking branch 'origin/master' 11 months ago
zhaoxiaolin 8d82a45e05 多层订单关闭 11 months ago
Yangwl 1a954cf0f5 Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl 3f7ec60948 计件工资统计修改 11 months ago
A0010407 24905c34ac 2024-2-27 设备模块选择设备页面接口修改 11 months ago
Yangwl cf3977a0e5 Merge remote-tracking branch 'origin/master' 11 months ago
Yangwl 97dc167cea 计件工资统计 11 months ago
mengjiao 2931ab8646 wms部分代码修改2 11 months ago
mengjiao 51d3005749 wms部分代码修改 11 months ago
mengjiao bb6f0cffb9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
11 months ago
zhaoxiaolin 52a73c37d3 bug修改 11 months ago
zhaoxiaolin 882baffa17 订单生产版本回传+已派发的订单不再进行更新 11 months ago
Yangwl 01dd5b5629 本地保存 11 months ago
Yangwl 661cb1f822 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
11 months ago
Yangwl a7b4b9a6e9 订单创建接口增加生产版本 11 months ago
zhaoxiaolin b9df5a579f 人力信息同步 11 months ago
Yangwl 72917fbe68 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
11 months ago
Yangwl 15483d79ec 订单创建增加生产版本字段 11 months ago
A0010407 55a3c6c017 2024-2-20 工艺模块-线体设备/工作中心问题修改 11 months ago