Commit Graph

1342 Commits (cfd48f4b3e865d45dac605f1610a83799337eb2a)
 

Author SHA1 Message Date
xiangwei.zhang f9415668a3 判断可疑 8 months ago
王杰 70adc2f3a9 条码生成 对象增加 生产线 工位 8 months ago
王杰 2b362500b1 条码生成 对象增加 生产线 工位 8 months ago
xiangwei.zhang 70456a3df5 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
xiangwei.zhang 3d9b4e6aa2 判断可疑 8 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw 19dc318f2f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw bd4d547f4b 保存裁片工单结果工步-裁片工单号获取方式修改 8 months ago
王杰 3e11aff239 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 1cb80d9451 merge dev pom冲突 8 months ago
yxw c8576f6f92 1、MesProductionPartContext 增加cutQty(裁片工单数量)
2、裁片工单绑定问题修复
8 months ago
yxw 0f3a1cb964 1、MesProductionPartContext 增加cutQty(裁片工单数量)
2、裁片工单绑定问题修复
8 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 8 months ago
xiangwei.zhang f2a453f549 判断可疑 8 months ago
王杰 df5757bec8 排序 保存加工结果 8 months ago
yxw d1b5e32076 非排序产出零件条码 去掉cutWorkOrderNo 字段 8 months ago
yxw fac38e24c5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw bdceeb26f5 排序展示组件开发 8 months ago
gsz c94b44ceee Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 176b418709 排序返工作业2 8 months ago
王杰 f441b07b4b 上下文 获取生产线类型 不验证工序 8 months ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 c5ef060b85 Merge branch 'dev' 8 months ago
王杰 4e94622cfd Merge branch 'dev' into dev-wuhan 8 months ago
王杰 c39b5a9ab1 排序 保存工单装配件 8 months ago
yxw 30082cc4ae 裁片工步修改:
1、加工规则匹配时,对进料条件封装foreignKey
2、保存裁片条码工步取消引用保存条码工步,改为在本工步实现根据是否存在进料条码保存条码逻辑
3、裁片工单号存值改为产出零件上下文中
8 months ago
王杰 51bf7e01ec Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 d8cabab1d8 展示组件 8 months ago
yxw 63dbcf1eb0 装配目视单预览 8 months ago
yxw 16ee98410f 装配目视单打印 8 months ago
yxw 6efdf95220 装配目视单打印 8 months ago
王杰 413f68de13 保存加工结果 排序 8 months ago
gsz a25a8b92e0 排序返工作业1 8 months ago
gsz 007256524b Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 5fb9601736 JIS物料拉动演示问题修改 8 months ago
jun 78f398a7fb 排序发运演示问题修复 8 months ago
jun 3218721983 排序发运功能开发 8 months ago
yxw 75edad4f97 装配目视单预览 8 months ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun fc3e0bab38 排序发运功能开发 8 months ago
gsz 2bb948e6c4 JIS物料拉动PCN 修改根据工单号排序校验 8 months ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw 01e7e45737 装配目视单打印 8 months ago
yxw 8ed36a5e6b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw a9e45c3a00 装配目视单打印 8 months ago
王杰 7ae9519b26 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 7e795f15d2 排序 保存加工结果 8 months ago
gsz 361eb7e455 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 0aafab31c8 排序电子化检验支持加工单扫描或者加工单客户条码1 8 months ago
yxw 7d68d9f4f9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 8 months ago