Commit Graph

1061 Commits (ad2a7f8722337db227025f1b771ca63ca6500062)

Author SHA1 Message Date
王杰 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
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
王杰 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
yxw cab28f1ba8 裁片箱标签打印参数增加时间 8 months ago
yxw 8a0ccc46f9 裁片箱条码打印工步增加修改裁片工单状态为已打印逻辑 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
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 c658a8a5b8 裁片打印策略类 8 months ago
yxw 5ea796fb79 裁片打印工步 8 months ago
王杰 d83d750632 排序装配件确认方式:通用自制件补条码字符 8 months ago
王杰 984a761881 前道防错, 顺序防错 逻辑调整 8 months ago
王杰 da07938e34 扫描主条码 工步 剔除排序场景 8 months ago
王杰 ac408df8b5 排序 设备加工参数工步 8 months ago
王杰 c5d1382724 生产线增加字段 是否忽略 工单质量状态 8 months ago
王杰 d51bcd2278 排序 显示装配件扫描项 8 months ago
王杰 f1f1d8fcdf 前道防错 8 months ago
王杰 ebc7bcd0b4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
王杰 377e8aa2e9 工步弹框 8 months ago
yxw 63cd8c2671 裁片功能 8 months ago
yxw 641c881f94 裁片功能-》弹框展示成品列表Function 8 months ago
xiangwei.zhang 55984cee69 判断可疑 8 months ago
yxw b99fded8f5 裁片功能-》弹框展示成品列表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
gsz b36912724c SPS物料拉动PCN扫描页面2 8 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 8 months ago
jun 2f3b3b0761 number同时存在大于小于某个字段问题修复 8 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 33cbf3d537 等离子功能开发 8 months ago
gsz 430d3556da 把拉动单打印产线 拉动组多选 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
jun 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 8 months ago
王杰 2314130e5a 上下文 物料 8 months ago
王杰 5e1f6de520 工步弹框 8 months ago
王杰 2af9d8f125 工步弹框 8 months ago
jun 59c44cb199 发运单,装车单跳过逻辑调整 8 months ago
jun 17a2254f3a 站点信息基础数据 8 months ago
jun e22af55524 装车单跳过,是否要将装车单关联的发运单也一并完成,同时一并发给WMS 8 months ago