Commit Graph

1136 Commits (b741c1deb5a3b0666c343b30069d1a52658c0428)

Author SHA1 Message Date
xiangwei.zhang 70456a3df5 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
xiangwei.zhang 3d9b4e6aa2 判断可疑 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
王杰 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
王杰 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
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 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 2b1e11ebf9 装配目视单打印 8 months ago
xiangwei.zhang c210f5e8b2 判断可疑 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
王杰 ce2dc13c8b jdbc连接url增加allowMultiQueries=true 8 months ago
王杰 99437630bf 非排序无显示装配件匹配工步 8 months ago
王杰 8655825afc 弹框工步 8 months ago
王杰 7f7c46d92e 显示装配件 json to string 序列号 null 异常处理 8 months ago
yxw def629d6a2 排序产线工单发布新增装配目视单打印队列 8 months ago
yxw d8bbb932a9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 5c1e7a1124 30.6配置文件密码修改 8 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 8 months ago
王杰 d94723f1d3 排序 匹配装配件工步 8 months ago
王杰 05038cf65c 排序 匹配装配件工步 8 months ago
yxw b1905b75e3 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 70d83d76c7 打印队列表 8 months ago
jun 63493c7fd9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 9ceb874f19 通用包装组零件校验(VKM)功能开发 8 months ago
yxw 89e087632e 电子化检验弹框数据处理 8 months ago
yxw bbf6577607 电子化检验弹框数据处理 8 months ago
yxw 3acc35c0ab 电子化检验弹框数据处理 8 months ago
yxw db81a86fe7 电子化检验弹框数据处理 8 months ago
yxw 764744cba5 电子化检验弹框数据处理 8 months ago
王杰 2dcadee21b 工步弹框 8 months ago
王杰 1988ac9e83 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 e22a91f580 排序 匹配工步 8 months ago
yxw de08e40843 裁片工单打印 8 months ago
王杰 8e81257831 排序 匹配装配件工步 8 months ago
yxw ca1aa4a652 裁片工单打印优化 8 months ago
gsz 8290261d5b JIS物料拉动PCN页面2 8 months ago
yxw 188741a4dd Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 04e7942d04 裁片原材料防错优化 8 months ago
gsz 0113527434 JIS物料拉动PCN页面2 8 months ago
yxw b578de2b1a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 82a6beef27 MesPcnExtConstWords VERTICAL_BAR 参数名更改 8 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 8 months ago
yxw 0957d7c212 PCN裁片工单打印 8 months ago
yxw 3c60fd4487 PCN裁片工单打印 8 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw e476c0c4dc 裁片相关pojo修改 8 months ago
王杰 08aa3def34 打印非报废条码工步 8 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 8 months ago
yxw 0e5b02c65d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 739136d035 查询bom增加生效开始时间分组 8 months ago
yxw 550fcee7aa 裁片功能优化 8 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 8 months ago
yxw e9d2615935 裁片功能优化 8 months ago
yxw ab9f3dde09 裁片功能优化 8 months ago
yxw e783d75ae2 裁片功能优化 8 months ago
xiangwei.zhang 213e349773 新增bomCode 8 months ago
jun d2d1d98281 43072 加料防错 料箱自动初始化 8 months ago
jun 2322cc606c 43063 PDA点检重复扫描了同一个条码,希望提示清晰 8 months ago
yxw ab3fd934cf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 312a57c4be 裁片工单标签打印接口开发 8 months ago
jun ca7e6bb915 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun f4ebfa030e 包装解绑功能开发 8 months ago
yxw e798943bfe 裁片工单标签打印工步修改 8 months ago