Commit Graph

337 Commits (3be4afacb79fdd7e0785bf2db318347a500d4bca)

Author SHA1 Message Date
王杰 3a3bfc3c6c Merge branch 'dev-temp-castle-2412191445-44381' into dev 5 months ago
王杰 17fb826dd7 merge dev-temp-castle-2412131528-44316 解决冲突 5 months ago
臧学普 e1a6521c00 通用客户CBR 5 months ago
王杰 2f388460cc 加工记录统计报表 5 months ago
臧学普 ef0e52289b POM逻辑修改 5 months ago
jun 99c87bd8bc Merge remote-tracking branch 'origin/dev' into dev 5 months ago
jun c5987d3bd8 武汉cockpit发运防错按照散件方式写入 5 months ago
xiangwei.zhang acab8131a0 对账单信息 5 months ago
jun a244b350f2 产品加工记录增加工单状态查询 6 months ago
jun 2d98ac7c86 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun d2c977b5de 点检功能点优化 6 months ago
王杰 0f8dcbfc75 Merge branch 'dev' into dev-wuhan 6 months ago
臧学普 0250db7d47 零件发运组--客户工厂与信息点联动 6 months ago
王杰 188284ab69 增加http接口 pcn调用 用于将数据自动初始化到工位按钮表 6 months ago
臧学普 68908190ed 生产零件号是用来查找生产版本与bom 存在于零件生产组中 6 months ago
jun cfb57c094d 工单同步wms功能开发 6 months ago
jun 8bb57ecb56 SPS拉动单生成优化 6 months ago
臧学普 419fc65025 工单号顺序号调整 6 months ago
臧学普 fc9e36abcf 离线job生成装配件及拉动单模板 6 months ago
jun 9367768764 43663 试制工单不自动关单(芜湖) 6 months ago
jun 6ca8142abb 43661 排序发运扫描条码时,同序号的零件也需要校验扫描顺序 6 months ago
jun d59c8cd91e Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java
6 months ago
jun 0da05f6daf BOM反向查询报表,通用发运报表开发 6 months ago
jun 94f70a14ec 43590 开关班管理:接班时--90002 系统异常:对象为空 6 months ago
xiangwei.zhang de3cc8bac3 BTO单生成bug修复 6 months ago
jun 03288a28c8 排序手工插单逻辑修改 6 months ago
臧学普 02ce42cec9 创建工单及线末大屏修改 6 months ago
jun a4a0ac889e 通用导出报表开发 6 months ago
jun 97d7e4e65d SPS拉动单打印 7 months ago
jun bc6b3dc5ad 天桥数报表开发 7 months ago
臧学普 c7145fa51b 线末大屏 7 months ago
臧学普 6a1779c6f0 线末大屏 7 months ago
jun c40e5c75ee CBR报工逻辑调整 7 months ago
jun effbe4561a 问题修复: 加工规则零件号不能模糊搜索 7 months ago
王杰 18efcb1c04 Merge branch 'dev' into dev-wuhan 7 months ago
xiangwei.zhang d96f360a0f 设备停机 7 months ago
gsz 7b56ed23f3 拉动单补打并且插入PrintedSnLog表 7 months ago
jun 94a22fa575 Merge branch 'dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
7 months ago
xiangwei.zhang 6f23a3fbe0 设备点检明细导入 7 months ago
jun 4cf06dea83 通用V107Melos数据监控查询 7 months ago
jun 52ac7e42fd getById方法增加organizeCode条件 7 months ago
xiangwei.zhang b8c938102d bom递归和报工调整修改 7 months ago
gsz 731cdeeac1 发运零件子零件明细+发运单子零件明细 7 months ago
pzj 4437d06c96 装配件查询、发运明细报表、可疑品条码信息、检验产品数据子报表 7 months ago
yxw 9878633805 1、MesProductionPartContext 增加cutQty(裁片工单数量)
2、裁片工单绑定问题修复
8 months ago
王杰 a80e653f08 Merge branch 'dev' into dev-wuhan 8 months ago
yxw 6768e2802d 装配目视单预览 8 months ago
pzj e130754448 包装组零件规则基础数据主、明细 8 months ago
yxw 7c82801377 装配目视单打印 8 months ago
pzj 45395bd4d6 辊道设备配置基础数据 8 months ago
jun 6162899689 CBR报工逻辑调整 8 months ago
yxw 29dd614d4b 新增打印工单打印队列 8 months ago
pzj 1ee988c030 站点信息基础数据 8 months ago
pzj 5641d27974 裁片基础数据 裁片长度修改类型、裁片配置、裁片原材料配置、裁片成品配置、裁片设备配置、裁片设备配置明细、裁片设备配置设备加工参数 8 months ago
pzj 182186077c 等离子基础数据 可回用包装类型、可回用包装、可回用包装零件 8 months ago
jun e0a911defd 工单装配件 工单零件报表开发 8 months ago
jun b77d89ecbf 根据勾选的发运单同步WMS,根据发运单关联对应的装车单;
发运单、装车单增加备注的筛选条件,文本框,支持模糊输入;
8 months ago
yxw 7f17a0edf1 裁片工单标签打印接口开发 8 months ago
xiangwei.zhang b86fbdbd3d 对账单信息 8 months ago
xiangwei.zhang 111b90fcb3 对账单信息 8 months ago
xiangwei.zhang d8d0c0721a 对账单信息 8 months ago
yxw 5ece1cb506 保存裁片加工记录 8 months ago
xiangwei.zhang 66b81a0fcb 报工修改 8 months ago
gsz 46c4bdded3 42966 设备实时查询报表-设备变量名称、设备变量ID可以多选查询,输入时,用逗号隔开 8 months ago
yxw 6833795264 Merge remote-tracking branch 'origin/dev' into dev-wuhan 8 months ago
gsz 8f751f8330 根据拉动组和生产工单产生拉动单JOB-1 8 months ago
gsz 3554e2677a 缺陷记录报表功能加打印功能 8 months ago
gsz d62d1ce024 缺陷记录报表功能 8 months ago
臧学普 e9bc105f43 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
臧学普 11ccae7461 提交生产装配件清单,工单,零件清单 8 months ago
yxw 69bf4af131 裁片原材料防错 8 months ago
yxw 36be5c84ed Merge branch 'dev' into dev-wuhan 8 months ago
yxw 025591db89 裁片功能主数据表 8 months ago
yxw 92b6b1be41 裁片功能主数据表 8 months ago
gsz b69151daa1 SPS物料拉动 1.新增拉动单+明细+2.提供给设备webSrevice接口 8 months ago
jun e722c262b3 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun 6ae6ba0940 汇总工单发送SAP逻辑调整 8 months ago
xiangwei.zhang 7930cd4734 新增导入信息 8 months ago
jun bbc3a0362f 42796 【上线】工单需求变更 9 months ago
gsz 92a0136482 生产工单日志 9 months ago
jun 3267d04197 接口映射,自定义脚本页面开发 9 months ago
jun 2b70084c7c 42602 发运后,客退品返工,生成并打印新条码
42582 线边库存报表
9 months ago
jun 78bb487025 工单汇总发送SAP逻辑调整,零件条码状态,加工记录导出功能 9 months ago
jun 73a11a618a 零件条码状态,产品加工记录报表开发 9 months ago
gsz 32b76ad88d 根据物料工位分组分页查询设备加工记录 9 months ago
gsz 26834c591c 42102 点检单页面增加打印功能 9 months ago
王杰 b08727bb82 系统配置查询方法 9 months ago
jun 096835bd11 问题清单修复 10 months ago
王杰 0da6e7f2f6 mes报表验证分表配置 10 months ago
王杰 7e50e2cf37 mes报表验证分表配置 10 months ago
jun b5a0c0d81a 问题清单修复 10 months ago
jun a6c1d5a485 CCSC检测,重新打开 10 months ago
jun a5873a9388 问题清单修复 10 months ago
jun 1de19ae114 问题清单修复 10 months ago
王杰 15debc5dfb mesmove 增加 erp生产线值 10 months ago
jun 5e2d23b101 问题清单修复 10 months ago
jun ddd22117b1 问题清单修复 10 months ago
王杰 3826df02ee mes枚举 10 months ago
王杰 193e918dae 设备日志 10 months ago
jun abfb72759f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java
10 months ago