1696 Commits (366b8c7b16f6868fd8da6f7b09b37a14fa9b7de1)

Author SHA1 Message Date
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
mengjiao d3756bee73 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao a111077f50 wms成品部分修改34 1 year ago
Yangwl 2503a3233e 工艺路线接口 1 year ago
Yangwl 3b8717318b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
1 year ago
Yangwl 78229d7662 工艺路线同步接口优化 1 year ago
zhaoxiaolin 9ff3c39ad6 事务跟切库不能共生 1 year ago
zhaoxiaolin 7e524978f1 质量手持更新 1 year ago
mengjiao f63574ff1f wms成品部分修改33--他sap收货按钮部分批次的字符串长度不满足12 1 year ago
mengjiao 5ca685d78e wms成品部分修改32 1 year ago
mengjiao 90b4eac108 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 5d6572c095 wms成品部分修改31 1 year ago
zhaoxiaolin 6cd329334c 质量手持更新 1 year ago
zhaoxiaolin 45670f8b06 质量手持更新 1 year ago
zhaoxiaolin b5121fd2ab 只看今天和昨天的检验任务 1 year ago
zhaoxiaolin efa426825e mes相关看板 1 year ago
shaoyong 65fe3d2ef1 不良类型优化 1 year ago
mengjiao 938749cbf2 wms成品部分修改30 1 year ago
mengjiao d6953800b3 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 7d2ee34a17 wms成品部分修改29 1 year ago
shaoyong 02e833445a 工厂数据源修改,质量时间查询 1 year ago
mengjiao d83f72dbe8 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao f92a22cb35 wms成品部分修改28 1 year ago
zhaoxiaolin 3c0d9f16ad mes相关 1 year ago
zhaoxiaolin 374d2dc592 单层报工 1 year ago
zhaoxiaolin 330ec8b0d5 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 5354d2f617 首页+去掉订单修改功能 1 year ago
shaoyong d2e58e871c 工厂字典 1 year ago
zhaoxiaolin 6c71264935 mes bug 1 year ago
Yangwl 783dc284f9 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 0c4901d833 计件工资删除 1 year ago
mengjiao 851cc92548 wms成品部分修改27 1 year ago
zhaoxiaolin 0f5dfce375 del_flag 1 year ago
zhaoxiaolin 387b28bae2 其它系统数据源打开 1 year ago
zhaoxiaolin a22bf0ea9c 复检bug修改 1 year ago
zhaoxiaolin e96450db07 手持批次排序 1 year ago
zhaoxiaolin 36bf1e057a 人员同步重复,bug修复 1 year ago
zhaoxiaolin 1706f6be9b 检验任务只保留当天和昨天的 1 year ago
zhaoxiaolin f27d2dcbe9 动态数据源垮系统加载 1 year ago
zhaoxiaolin 17531927aa 去掉批次重复领料单 1 year ago
zhaoxiaolin 46028c63a5 bug 1 year ago
zhaoxiaolin 514a1a7281 LJ88->LJ01 1 year ago
A0010407 82d9f94aa5 Merge remote-tracking branch 'origin/master' 1 year ago
A0010407 90cf6bfcae 2024-4-10 基础信息模块-设备-增加车间 1 year ago
mengjiao 9ef01c22ef Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 2bef67da01 wms成品提单接口部分修改2 1 year ago
zhaoxiaolin 1c7ea171cc 母单大盒数 子单数不变 1 year ago
zhaoxiaolin dc2c77d18a bug修复 1 year ago
shaoyong 800fe11ea5 检验节点人员绑定修改 1 year ago
shaoyong 335363e994 检验节点人员绑定修改 1 year ago
mengjiao fbf5dfe27e Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao f2d0e12e62 wms成品页面查询接口部分修改 1 year ago
shaoyong 3dd63e2288 线体管理功能 1 year ago
shaoyong b5cd9e76f2 检验节点人员绑定 1 year ago
zhaoxiaolin 7859315038 关闭订单 1 year ago
Yangwl 82891f72d2 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 27e3852e37 SAP工单关闭修改 1 year ago
zhaoxiaolin 216911b8c0 来料增加来料类型 1 year ago
zhaoxiaolin 1911b6657d 三层报工bug修复 1 year ago
mengjiao faa2cc217d wms销售出库的提单接口32 1 year ago
mengjiao d6f2a640ec Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 4aa80a332a wms销售出库的提单接口31 1 year ago
zhaoxiaolin a7ad51edda 来料bc标识 1 year ago
A0010407 835d1da2ac 2024-04-07 基础信息-产品-报工汇率2 1 year ago
A0010407 4a3367df37 2024-04-07 基础信息模块-产品-加报工汇率 1 year ago
zhaoxiaolin 037498849f LJ04的订单接入 1 year ago
zhaoxiaolin da4578bfb0 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin cc26587ff6 巡检定时任务修改 1 year ago
Yangwl 8b39a2d210 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 35e453de09 成品备货单接口 1 year ago
A0010407 f32a40142a 2024-4-3 基础信息管理-优化SQL 1 year ago
mengjiao 31370e80c4 wms成品转储部分代码修改30 1 year ago
zhaoxiaolin b7bfb7b1ba 来料去重修改+成品修改设备+看板bug修改 1 year ago
mengjiao 2b7e105dff Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 5abd5d3bb7 wms成品调拨部分代码修改29 1 year ago
A0010407 132c2dd84d 2024-4-1 设备管理-设备运行记录-定时任务-设备生成不全+创建人不对 1 year ago
A0010407 d5cee2a8f8 2024-4-1 设备管理模块-点检巡检-选择后提示 1 year ago
A0010407 7069e270f2 2024-4-1 设备模块-除了组线全部展示 1 year ago
shaoyong efa4d62224 Merge remote-tracking branch 'origin/master' 1 year ago
shaoyong cabcceb2a0 物料组优化空数据 1 year ago
A0010407 a4e2b7792a 2024-4-1 质量导入还原 1 year ago
A0010407 37260b893b 2024-4-1 质量模块-导入-属性 1 year ago
zhaoxiaolin 9395573da3 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin b3bcf1594f 夜班巡检 1 year ago
mengjiao cff213a3d0 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 080e34f4ff wms成品调拨部分代码修改28 1 year ago
shaoyong 70de333f7f 物料组新建 1 year ago
shaoyong c58ab6cb04 物料组新建优化 1 year ago
shaoyong 8e8c9af514 物料组新增导入优化 1 year ago
zhaoxiaolin d17f929ad4 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 9c4b43216b 细节升级 1 year ago
mengjiao f8e381df2d Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao dfc2258768 wms成品调拨部分代码修改27 1 year ago
A0010407 0fbef62ebb 2024-3-29 设备模块-1.看板公式改变 2.手持维修时间 3.管理系统维修加字段 1 year ago
zhaoxiaolin 0eecd31a19 来料检验上线 1 year ago
shaoyong 5ea60773d6 检验任务不良类型优化 1 year ago
shaoyong 677c6ddb83 人员绑定优化 1 year ago
zhaoxiaolin 67c6a27168 bug修复2 1 year ago
Yangwl 5b0fb2d333 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl 5bfd9fa520 来料检验增加物料凭证号、物料凭证中的项目 1 year ago
zhaoxiaolin 2165d42d93 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin bf4b93fe23 bug修复 1 year ago
mengjiao 71a042006d Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao b0c711c443 wms成品部分代码修改26 1 year ago
zhaoxiaolin edb80d785a qc_check_task_defect数据添加逻辑修改 1 year ago
zhaoxiaolin 43211b5257 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 3486c00461 qc_check_task_defect数据添加逻辑修改 1 year ago