Commit Graph

1229 Commits (8419842a177bec1cabdb038f90de00b982c1d419)

Author SHA1 Message Date
jun 94c320d2cb 排序发运逻辑调整 9 months ago
yxw 31072fac39 排序展示组件报错 9 months ago
臧学普 ad2a7f8722 电测试开发 9 months ago
yxw 8252c90f03 裁片原材料防错 9 months ago
jun 09b9c21a47 发运明细顺序校验逻辑调整 9 months ago
jun 082e83a94a 排序发运逻辑调整 9 months ago
jun 1ae36b99e2 发运数据double 9 months ago
jun d035447f29 报工增加bom总行数字段 9 months ago
王杰 838d1f82db merge dev 冲突解决 9 months ago
王杰 8930187f6f 代码优化 9 months ago
王杰 23b774af3a 工单修改工步 修改方式变更 9 months ago
王杰 893f307284 工单修改工步, 修改方式调整 9 months ago
jun 4d9d03725b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 24d2cd89e6 非排序报工功能开发(代码调整) 9 months ago
jun d708e96d46 非排序报工功能开发 9 months ago
xiangwei.zhang 7343c0e462 判断可疑 9 months ago
王杰 80677847b1 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 3a81d887a5 前道防错工步 9 months ago
gsz 3b955236e6 43302 加料防错扫码流程优化 9 months ago
王杰 1a734d52d0 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 315009b22c 合并dev 9 months ago
王杰 0f88c13f3b Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 e20e160034 合并dev 9 months ago
王杰 24fd34c088 合并dev 9 months ago
王杰 3b3edc9b46 条码修改工步 update 改成updateByProperties 9 months ago
jun 80c6aaf1f5 发运工单表中条码字段修改 9 months ago
王杰 4922e1bd58 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 aa719fb463 通用客户条码转换逻辑变更 9 months ago
王杰 b4e500dd6d 合并 dev-wuhan master(工位扫描监控日志去除分表配置,直接使用动态sql写入生产线对应的分表) 9 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 cfed01aa5c 工位扫描 日志 去除分表 写DB改成sql执行 10 months ago
王杰 36ee2c007a 临时存储 10 months ago
王杰 797904c87a Merge branch 'dev' 10 months ago
yxw 1cf4524daf 客户条码打印 10 months ago
王杰 78fb82c88a 规则并截取右侧流水装配件规则, 生成零件条码工步需要使用此流水生成新的零件条码 10 months ago
yxw a536b82cfd 排序产线客户条码打印 10 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 10 months ago
yxw f82c6626a1 装配目视单打印策略类字段引用修改 10 months ago
yxw f930bb092b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 5eaf01b076 排序展示组件查询逻辑优化 10 months ago
gsz 44f72a56a6 PCN发运单打印页面1 10 months ago
gsz ad5934cfd8 43289 SPS拉动提示系统异常 10 months ago
xiangwei.zhang a05cd762bc 条码打印次数更新 10 months ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 4092793204 排序流程 盲写代码 自测 问题修复 10 months ago
jun 4440d368a0 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun c9d4d0fa2f 排序汇报job开发 10 months ago
王杰 b3cdc996ed Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 7176608355 排序 加工记录 根据工单装配件写加工记录的汇报方式状态汇报零件号 10 months ago
jun 92845822c7 打印模板开发 10 months ago
xiangwei.zhang f9415668a3 判断可疑 10 months ago
王杰 70adc2f3a9 条码生成 对象增加 生产线 工位 10 months ago
王杰 2b362500b1 条码生成 对象增加 生产线 工位 10 months ago
xiangwei.zhang 70456a3df5 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
xiangwei.zhang 3d9b4e6aa2 判断可疑 10 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
yxw 19dc318f2f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw bd4d547f4b 保存裁片工单结果工步-裁片工单号获取方式修改 10 months ago
王杰 3e11aff239 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 1cb80d9451 merge dev pom冲突 10 months ago
yxw c8576f6f92 1、MesProductionPartContext 增加cutQty(裁片工单数量)
2、裁片工单绑定问题修复
10 months ago
yxw 0f3a1cb964 1、MesProductionPartContext 增加cutQty(裁片工单数量)
2、裁片工单绑定问题修复
10 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 10 months ago
xiangwei.zhang f2a453f549 判断可疑 10 months ago
王杰 df5757bec8 排序 保存加工结果 10 months ago
yxw d1b5e32076 非排序产出零件条码 去掉cutWorkOrderNo 字段 10 months ago
yxw fac38e24c5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw bdceeb26f5 排序展示组件开发 10 months ago
gsz c94b44ceee Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz 176b418709 排序返工作业2 10 months ago
王杰 f441b07b4b 上下文 获取生产线类型 不验证工序 10 months ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 c5ef060b85 Merge branch 'dev' 10 months ago
王杰 4e94622cfd Merge branch 'dev' into dev-wuhan 10 months ago
王杰 c39b5a9ab1 排序 保存工单装配件 10 months ago
yxw 30082cc4ae 裁片工步修改:
1、加工规则匹配时,对进料条件封装foreignKey
2、保存裁片条码工步取消引用保存条码工步,改为在本工步实现根据是否存在进料条码保存条码逻辑
3、裁片工单号存值改为产出零件上下文中
10 months ago
王杰 51bf7e01ec Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 d8cabab1d8 展示组件 10 months ago
yxw 63dbcf1eb0 装配目视单预览 10 months ago
yxw 16ee98410f 装配目视单打印 10 months ago
yxw 6efdf95220 装配目视单打印 10 months ago
王杰 413f68de13 保存加工结果 排序 10 months ago
gsz a25a8b92e0 排序返工作业1 10 months ago
gsz 007256524b Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz 5fb9601736 JIS物料拉动演示问题修改 10 months ago
jun 78f398a7fb 排序发运演示问题修复 10 months ago
jun 3218721983 排序发运功能开发 10 months ago
yxw 75edad4f97 装配目视单预览 10 months ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun fc3e0bab38 排序发运功能开发 10 months ago
gsz 2bb948e6c4 JIS物料拉动PCN 修改根据工单号排序校验 10 months ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
yxw 01e7e45737 装配目视单打印 10 months ago
yxw 8ed36a5e6b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw a9e45c3a00 装配目视单打印 10 months ago
王杰 7ae9519b26 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 7e795f15d2 排序 保存加工结果 10 months ago
gsz 361eb7e455 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz 0aafab31c8 排序电子化检验支持加工单扫描或者加工单客户条码1 10 months ago
yxw 7d68d9f4f9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 10 months ago