Commit Graph

1100 Commits (1c2c03dccbfae3b37e99ea68a6c6fb79e4a81be3)

Author SHA1 Message Date
yxw 75edad4f97 装配目视单预览 1 year ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun fc3e0bab38 排序发运功能开发 1 year ago
gsz 2bb948e6c4 JIS物料拉动PCN 修改根据工单号排序校验 1 year ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
yxw 01e7e45737 装配目视单打印 1 year ago
yxw 8ed36a5e6b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw a9e45c3a00 装配目视单打印 1 year ago
王杰 7ae9519b26 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
王杰 7e795f15d2 排序 保存加工结果 1 year ago
gsz 361eb7e455 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
gsz 0aafab31c8 排序电子化检验支持加工单扫描或者加工单客户条码1 1 year ago
yxw 7d68d9f4f9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 1 year ago
yxw 9453928bf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
yxw 2b1e11ebf9 装配目视单打印 1 year ago
xiangwei.zhang c210f5e8b2 判断可疑 1 year ago
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 a431455f9f 保存工艺参数工步 1 year ago
yxw bc534df0ec 装配目视单打印 1 year ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 40f8d63189 设备点检 1 year ago
yxw aad6e2dd48 装配目视单打印 1 year ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 1 year ago
yxw 798ec0d3ff Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw 91f6148ac7 新增打印工单打印队列 1 year ago
王杰 949da88cea Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 97ada9a13c 合并冲突 1 year ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 abd4a0546f 漏信号 改LOG状态增加修改时间条件 1 year ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 1 year ago
王杰 ce2dc13c8b jdbc连接url增加allowMultiQueries=true 1 year ago
王杰 543e006ff3 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 8b70f63423 漏信息问题修复 1 year ago
王杰 0ea80b7ea0 Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 42c5101d09 漏信号 1 year ago
王杰 c95c16fdcb Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 99437630bf 非排序无显示装配件匹配工步 1 year ago
王杰 8a9d4d55c8 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 fb713f5e5d Merge branch 'master' into dev-wuhan-temp 1 year ago
王杰 d84adae7f5 漏信号 代码修改 1 year ago
王杰 8655825afc 弹框工步 1 year ago
王杰 8c5c959c3a 漏信号 bug 1 year ago
王杰 2c196e4f47 显示装配件 json to string 序列号 null 异常处理 1 year ago
王杰 672df80254 漏信号 代码 报错 问题修复 查询id bigint 转long 1 year ago
王杰 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
yxw d8bbb932a9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw 5c1e7a1124 30.6配置文件密码修改 1 year ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 1 year ago
王杰 6b99d852d7 合并 冲突 1 year ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 1 year ago
王杰 d94723f1d3 排序 匹配装配件工步 1 year ago
王杰 05038cf65c 排序 匹配装配件工步 1 year ago
yxw b1905b75e3 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw 70d83d76c7 打印队列表 1 year ago
jun 63493c7fd9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 9ceb874f19 通用包装组零件校验(VKM)功能开发 1 year ago
yxw 89e087632e 电子化检验弹框数据处理 1 year ago
yxw bbf6577607 电子化检验弹框数据处理 1 year ago
yxw 3acc35c0ab 电子化检验弹框数据处理 1 year ago
yxw db81a86fe7 电子化检验弹框数据处理 1 year ago
yxw 764744cba5 电子化检验弹框数据处理 1 year ago
王杰 2dcadee21b 工步弹框 1 year ago
王杰 1988ac9e83 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
王杰 e22a91f580 排序 匹配工步 1 year ago
yxw de08e40843 裁片工单打印 1 year ago
王杰 8e81257831 排序 匹配装配件工步 1 year ago
yxw ca1aa4a652 裁片工单打印优化 1 year ago
gsz 8290261d5b JIS物料拉动PCN页面2 1 year ago
yxw 188741a4dd Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw 04e7942d04 裁片原材料防错优化 1 year ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 1 year ago
gsz 0113527434 JIS物料拉动PCN页面2 1 year ago
王杰 bbd0f74b5c Merge branch 'dev' 1 year ago
yxw b578de2b1a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw 82a6beef27 MesPcnExtConstWords VERTICAL_BAR 参数名更改 1 year ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 1 year ago
yxw 0957d7c212 PCN裁片工单打印 1 year ago
yxw 3c60fd4487 PCN裁片工单打印 1 year ago
王杰 08aa3def34 打印非报废条码工步 1 year ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 1 year ago
gsz 932f06d023 JIS物料拉动PCN页面1 1 year ago
yxw 0e5b02c65d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun 739136d035 查询bom增加生效开始时间分组 1 year ago
yxw 550fcee7aa 裁片功能优化 1 year ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 1 year ago
yxw e9d2615935 裁片功能优化 1 year ago
yxw ab9f3dde09 裁片功能优化 1 year ago
yxw e783d75ae2 裁片功能优化 1 year ago
xiangwei.zhang 213e349773 新增bomCode 1 year ago
jun d2d1d98281 43072 加料防错 料箱自动初始化 1 year ago
jun 2322cc606c 43063 PDA点检重复扫描了同一个条码,希望提示清晰 1 year ago
yxw ab3fd934cf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw 312a57c4be 裁片工单标签打印接口开发 1 year ago
jun ca7e6bb915 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
jun f4ebfa030e 包装解绑功能开发 1 year ago
yxw e798943bfe 裁片工单标签打印工步修改 1 year ago
yxw cab28f1ba8 裁片箱标签打印参数增加时间 1 year ago
yxw 8a0ccc46f9 裁片箱条码打印工步增加修改裁片工单状态为已打印逻辑 1 year 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
1 year ago