Commit Graph

1120 Commits (5e2d89d6afb6894af8ef25926e58ffb326295fea)
 

Author SHA1 Message Date
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 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
yxw 9453928bf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw 2b1e11ebf9 装配目视单打印 8 months ago
xiangwei.zhang c210f5e8b2 判断可疑 8 months ago
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 a431455f9f 保存工艺参数工步 8 months ago
yxw bc534df0ec 装配目视单打印 8 months ago
yxw f7b48f9801 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 8 months ago
yxw bfa34b5cef Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 40f8d63189 设备点检 8 months ago
yxw aad6e2dd48 装配目视单打印 8 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 8 months ago
yxw 798ec0d3ff Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 91f6148ac7 新增打印工单打印队列 8 months ago
王杰 949da88cea Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 97ada9a13c 合并冲突 8 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 abd4a0546f 漏信号 改LOG状态增加修改时间条件 8 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 8 months ago
王杰 ce2dc13c8b jdbc连接url增加allowMultiQueries=true 8 months ago
王杰 543e006ff3 Merge branch 'master' into dev-wuhan-temp 8 months ago