Commit Graph

348 Commits (2b362500b1a212108a20a51d8b29147b5e18cc91)

Author SHA1 Message Date
jun 96f6e5cdd6 返工拆解逻辑调整 8 months ago
王杰 2314130e5a 上下文 物料 8 months ago
王杰 2af9d8f125 工步弹框 8 months ago
jun bf49601ad1 扫描可回用包装开发 8 months ago
yxw ae725102b7 保存裁片加工记录 8 months ago
王杰 59fc125885 通用顺序防错工步 8 months ago
jun fd46d3ab15 发运跳过逻辑优化 8 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 1e8f6672cf 裁片功能 8 months ago
jun 2ef4f1e2f0 料包绑定功能开发 8 months ago
王杰 8d704d6a9e 排序顺序防错 8 months ago
yxw 2a6bcfc4dc Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 487c627bf8 裁片工单生成问题修复 8 months ago
王杰 f894210e6f Merge branch 'dev' into dev-wuhan 8 months ago
王杰 ba80057ac8 读设备数据 写日志 增加 8 months ago
yxw d5d51e0585 Merge remote-tracking branch 'origin/dev' into dev-wuhan 8 months ago
王杰 fae918112f Merge branch 'dev' into dev-wuhan 8 months ago
王杰 f06716eec8 生产零件号 可复用 报错 问题修复 8 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 8 months ago
jun bc60e1a2c1 电子化检验拆解功能开发 8 months ago
yxw 9f6afe14fd 解决代码冲突 8 months ago
yxw abc8599d73 Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
8 months ago
yxw 9841ac7cde Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java
8 months ago
jun 5a6b1f1d2a Merge remote-tracking branch 'origin/dev' into dev 8 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw a8db4e761c 裁片原材料防错 8 months ago
yxw 6537f792ef 裁片原材料防错 8 months ago
jun 43ba2569c1 非排序拆解功能 8 months ago
王杰 a5dd6cf0f3 常量 睡眠2s改500ms 8 months ago
王杰 8e321c50ff wuhan 工单 工步 8 months ago
yxw 38c4fa0907 裁片功能主数据表 9 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 9 months ago
王杰 9d91db16b3 工步操作redis 方法去动词; 读加工结果 增加shot 9 months ago
jun 603123568f 返工,装配件替换问题修复 9 months ago
jun 8361a745e6 42786 电子化检验质检完成后,进入NC判定后未记录判定操作人
42782 装配件替换,目前是选择复选框后,需要按照顺序进行扫描
9 months ago
jun 3d06845ba9 外部解析条码长度卡控 9 months ago
jun 3f4af68ed3 42602 发运后,客退品返工,生成并打印新条码
42582 线边库存报表
9 months ago
王杰 c8c7f5530c 读设备 日志重复问题修复; 扫描主条码 未知逻辑变更;读条码增加最大死循环次数后反馈到客户端再重试; 9 months ago
王杰 9ee803d5a1 读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 9 months ago
王杰 2001a6ab8a 工步: 进出零件验证逻辑调整 工位增加字段:是否不累加工单完成数量 9 months ago
jun 7db20fcf4b AuthUtil修改为前端传参 9 months ago
jun 25236ecdae Merge remote-tracking branch 'origin/dev' into dev 9 months ago
jun e30b5fcbb5 装车,发运强过,跳过功能开发 9 months ago
王杰 9c9831aeeb 工位扫描 切换工单 立即生效 9 months ago
王杰 23b8e9fc51 装配件匹配提示优化 9 months ago
jun 8c11e1e852 打印模板增加打印时间字段 10 months ago
jun 64caf50651 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
王杰 0866a27027 查询加工记录表加工厂条件; 匹配加工规则 提示优化;增加配置允许其他工位的未知条码扫描的生产线配置;同零件条码同物料限制汇报一次 10 months ago
jun 715f8be640 打印模板调整 10 months ago
jun fb52cb2394 打印模板增加打印时间字段 10 months ago
jun 655f495f7b 问题清单修复 10 months ago
王杰 29759184b6 mes报表验证分表配置 10 months ago
王杰 f5904f4430 客户端下线 不再清除数据 变更成 上线时清除 10 months ago
王杰 2c57875b0c 工步打印 逻辑修改 10 months ago
王杰 4cbd0558ee status 10 months ago
王杰 d8e0e44a94 NC问题修复 10 months ago
臧学普 96f9fc2b66 修改条码打印分隔符 10 months ago
王杰 a817f7eb01 电子化检验 AB bug 生产零件条码 策略bug 10 months ago
王杰 8ea2581ab3 装车单 发运单 问题修改 10 months ago
jun a69b7d44d5 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 1ce33f14ab 问题清单修复 10 months ago
王杰 aa828063a7 编码策略: gqxnyNumberRuleStrategyService 修改 工步未传 客户零件对象 10 months ago
jun fd5dbfb7df Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 62a45210fd 问题清单修复 10 months ago
王杰 15c5f12837 设备日志 10 months ago
jun a4324b8f3a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun ba7985c238 bug 41915 10 months ago
微笑着面对明天 77b8304de0 报工问题修改 10 months ago
王杰 45f53779b7 读设备工步 禁用扫描框、 10 months ago
王杰 869132254e 装配件发送爆炸图 音频文件到客户端 10 months ago
微笑着面对明天 486a7f9306 mqtt开发 10 months ago
王杰 984f9488d8 pcn step 代码优化 10 months ago
微笑着面对明天 4ef60c5324 业务履历修改 10 months ago
王杰 0227927903 复用装配件 bug 10 months ago
王杰 cfea02b3b7 顺序防错 10 months ago
jun 79a5fbbb1e 41794 MES-PDA:点检-新增点检单问题汇总 10 months ago
jun fb6c3843fc Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 02ac595c82 41806 组件返工作业--返工单选择页面,增加一列“责任人”,从NC处理选择的责任人取值 10 months ago
administrator bc571b6173 重构打印 11 months ago
王杰 5742015206 工位扫描 日志 11 months ago
王杰 74d5cb101b 条码生成工步 11 months ago
王杰 3ee38c6e7a 条码生成 11 months ago
王杰 f78108c702 装配件重置 11 months ago
王杰 a443453c9c assemnly skip code 11 months ago
王杰 ba107475aa 读设备 优化 11 months ago
王杰 13d721d936 工艺路线防错 11 months ago
王杰 dc2da6c5ba step 11 months ago
王杰 1d6bd87867 时效性验证 11 months ago
王杰 fa5046f056 工厂扫描 日志记录 11 months ago
jun 28a6c74ad8 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 6cb853902e 加料防错功能开发 11 months ago
王杰 be4a094485 保存设备日志 11 months ago
王杰 c282a05088 设备日志 11 months ago
王杰 f595d98629 pcn 客户端下线 11 months ago
王杰 863917dfb7 上下文key 变更 11 months ago
jun 7574dfe698 生产开模统计数据发送
追溯报表开发
11 months ago
王杰 b416e13e41 前道防错 11 months ago
administrator 6400ab2846 生产条码时增加小鹏一维码规则 11 months ago
administrator 2a2f606ed7 工步条码打印 11 months ago
administrator 9b421f4ac9 Merge remote-tracking branch 'origin/dev' into dev 11 months ago