Commit Graph

474 Commits (d9c2b6c8b19b427c4faccd5b116c0cffea42562c)

Author SHA1 Message Date
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 8 months ago
yxw 3c60fd4487 PCN裁片工单打印 8 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 8 months ago
yxw 312a57c4be 裁片工单标签打印接口开发 8 months ago
yxw cab28f1ba8 裁片箱标签打印参数增加时间 8 months ago
yxw 6e90772d0f 裁片箱条码打印 8 months ago
yxw babf855266 Merge remote-tracking branch 'origin/dev-wuhan' 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 a6a399205d 裁片箱条码打印 8 months ago
yxw 226ee0be3f 裁片方案、工单增加属性 8 months ago
jun b387f9c11e 增加常量3定义 8 months ago
jun c454fa84a3 Merge remote-tracking branch 'origin/dev-wuhan' 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
jun e931661d01 包装解绑功能开发 8 months ago
yxw 5ea796fb79 裁片打印工步 8 months ago
王杰 984a761881 前道防错, 顺序防错 逻辑调整 8 months ago
王杰 da07938e34 扫描主条码 工步 剔除排序场景 8 months ago
王杰 d51bcd2278 排序 显示装配件扫描项 8 months ago
yxw 63cd8c2671 裁片功能 8 months ago
yxw 70de9c9b15 裁片功能-》弹框展示成品列表Function 8 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 8 months ago
王杰 89c1240140 合并dev 8 months ago
王杰 49549429cb 漏信号 优化 8 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 33cbf3d537 等离子功能开发 8 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 8 months ago
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 打印模板增加打印时间字段 9 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
administrator 0c3fe103de 工位端单件条码打印功能完成 11 months ago
王杰 a219cdf441 context 11 months ago
王杰 09dc9c7200 可复用件 11 months ago
administrator 1c65a74374 打印校验 11 months ago
王杰 41126d8e2b pcn 11 months ago
王杰 1c01b3bc24 mes step 11 months ago
王杰 b8f6e67d8b step 11 months ago
王杰 4c3048b236 step 11 months ago
王杰 d6b9195768 step 11 months ago
王杰 cf4b501bd0 step 11 months ago
王杰 43f74b6ce3 step 11 months ago
王杰 a249d62688 steo 11 months ago
微笑着面对明天 0a2bc86618 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun d693181dc7 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun f55811f1ba 广乘-仪表打印模板增加客户物料字段 11 months ago
王杰 265bfafe24 step 11 months ago
jun 32eecc1d49 广乘-仪表打印模板 11 months ago
微笑着面对明天 5a62071de2 展示组件 11 months ago
王杰 de49a8120d step 11 months ago
王杰 2bbffee2ae steo 11 months ago
王杰 3c18ac6527 step 11 months ago
王杰 523ebecc58 steop 11 months ago
王杰 802342330d step 11 months ago
王杰 de1b3c22db step 11 months ago
王杰 433d5eb232 step 11 months ago
微笑着面对明天 17838c071f 工步更新 11 months ago
王杰 7deb1c2b1a step 11 months ago
王杰 3cd49fc831 step 11 months ago
王杰 08c5ccdd3c step 11 months ago
王杰 b846728201 工位按钮 提示信息 11 months ago
王杰 778de8b8fe step 11 months ago
jun c160012a19 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 73b4b0d4d9 条码打印功能开发 11 months ago
微笑着面对明天 f787dfeaee 展示组件 11 months ago
王杰 7f6b9e8ece step 11 months ago
jun d42bba00d2 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 2a665781f6 PCN条码打印功能开发 11 months ago
administrator c00cddc048 仪表读数job 11 months ago
administrator 8e349da2f7 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 74adc4830a 逻辑优化 11 months ago
jun da3691af7b Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun cce62542f3 缺陷录入 11 months ago
微笑着面对明天 06557113e6 展示组件 11 months ago
王杰 f87e216c67 pcn 11 months ago
administrator 349a2a0cf7 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
王杰 6e7f3881b7 step 11 months ago
administrator ae0054cb92 报工工步及非排序报工job 11 months ago
王杰 56fb8a3e3e step 11 months ago
王杰 d2a1b018d4 step 11 months ago
王杰 1374383614 step 11 months ago
jun 49e52fcfd9 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun 104bd117bb 装箱防错功能开发 11 months ago
王杰 c61c9cf2e2 step 11 months ago
王杰 d7fff9d021 pcn step 11 months ago
微笑着面对明天 0338eb1752 展示组件 11 months ago
微笑着面对明天 9b761d52f7 展示组件 11 months ago
王杰 4fe47f60a5 step 11 months ago
王杰 fa13883d13 pcn 11 months ago
王杰 0454bdf8c1 step 11 months ago
微笑着面对明天 8cef863bae 返工修改 12 months ago
王杰 bd6e57c44d pcn 12 months ago
王杰 b250830f3e step 12 months ago
王杰 e8f48d7034 step 12 months ago
王杰 d7fec1f617 step 读主条码工步 12 months ago
微笑着面对明天 9b30b12a00 工步开发 12 months ago
gsz af477f4a5c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 12 months ago
gsz b049a2097a 电子化检验-转正常不需要责任人 12 months ago
王杰 208d876e29 step 12 months ago
王杰 596f6490d8 step 12 months ago
王杰 db4c1846a5 step 12 months ago
王杰 2bb18b5374 pcn step 12 months ago
jun 81578b5f10 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 149f760959 物料信息主数据修改 12 months ago
王杰 c40ecb6c16 opc link 12 months ago