Commit Graph

1099 Commits (ad2a7f8722337db227025f1b771ca63ca6500062)

Author SHA1 Message Date
王杰 7e795f15d2 排序 保存加工结果 9 months ago
gsz 361eb7e455 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 9 months ago
gsz 0aafab31c8 排序电子化检验支持加工单扫描或者加工单客户条码1 9 months ago
yxw 2b1e11ebf9 装配目视单打印 9 months ago
xiangwei.zhang c210f5e8b2 判断可疑 9 months ago
yxw aad6e2dd48 装配目视单打印 9 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 9 months ago
yxw 798ec0d3ff Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 91f6148ac7 新增打印工单打印队列 9 months ago
王杰 ce2dc13c8b jdbc连接url增加allowMultiQueries=true 9 months ago
王杰 99437630bf 非排序无显示装配件匹配工步 9 months ago
王杰 8655825afc 弹框工步 9 months ago
王杰 7f7c46d92e 显示装配件 json to string 序列号 null 异常处理 9 months ago
yxw def629d6a2 排序产线工单发布新增装配目视单打印队列 9 months ago
yxw d8bbb932a9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 5c1e7a1124 30.6配置文件密码修改 9 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 9 months ago
王杰 d94723f1d3 排序 匹配装配件工步 9 months ago
王杰 05038cf65c 排序 匹配装配件工步 9 months ago
yxw b1905b75e3 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 70d83d76c7 打印队列表 9 months ago
jun 63493c7fd9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 9ceb874f19 通用包装组零件校验(VKM)功能开发 9 months ago
yxw 89e087632e 电子化检验弹框数据处理 9 months ago
yxw bbf6577607 电子化检验弹框数据处理 9 months ago
yxw 3acc35c0ab 电子化检验弹框数据处理 9 months ago
yxw db81a86fe7 电子化检验弹框数据处理 9 months ago
yxw 764744cba5 电子化检验弹框数据处理 9 months ago
王杰 2dcadee21b 工步弹框 9 months ago
王杰 1988ac9e83 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 9 months ago
王杰 e22a91f580 排序 匹配工步 9 months ago
yxw de08e40843 裁片工单打印 9 months ago
王杰 8e81257831 排序 匹配装配件工步 9 months ago
yxw ca1aa4a652 裁片工单打印优化 9 months ago
gsz 8290261d5b JIS物料拉动PCN页面2 9 months ago
yxw 188741a4dd Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 04e7942d04 裁片原材料防错优化 9 months ago
gsz 0113527434 JIS物料拉动PCN页面2 9 months ago
yxw b578de2b1a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 82a6beef27 MesPcnExtConstWords VERTICAL_BAR 参数名更改 9 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 9 months ago
yxw 0957d7c212 PCN裁片工单打印 9 months ago
yxw 3c60fd4487 PCN裁片工单打印 9 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw e476c0c4dc 裁片相关pojo修改 9 months ago
王杰 08aa3def34 打印非报废条码工步 9 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 9 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 9 months ago
yxw 0e5b02c65d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 739136d035 查询bom增加生效开始时间分组 9 months ago
yxw 550fcee7aa 裁片功能优化 9 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 9 months ago
yxw e9d2615935 裁片功能优化 9 months ago
yxw ab9f3dde09 裁片功能优化 9 months ago
yxw e783d75ae2 裁片功能优化 9 months ago
xiangwei.zhang 213e349773 新增bomCode 9 months ago
jun d2d1d98281 43072 加料防错 料箱自动初始化 9 months ago
jun 2322cc606c 43063 PDA点检重复扫描了同一个条码,希望提示清晰 9 months ago
yxw ab3fd934cf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 312a57c4be 裁片工单标签打印接口开发 9 months ago
jun ca7e6bb915 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun f4ebfa030e 包装解绑功能开发 9 months ago
yxw e798943bfe 裁片工单标签打印工步修改 10 months ago
yxw cab28f1ba8 裁片箱标签打印参数增加时间 10 months ago
yxw 8a0ccc46f9 裁片箱条码打印工步增加修改裁片工单状态为已打印逻辑 10 months ago
yxw 6e90772d0f 裁片箱条码打印 10 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
10 months ago
yxw a6a399205d 裁片箱条码打印 10 months ago
yxw 226ee0be3f 裁片方案、工单增加属性 10 months ago
jun b387f9c11e 增加常量3定义 10 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
10 months ago
jun e931661d01 包装解绑功能开发 10 months ago
yxw c658a8a5b8 裁片打印策略类 10 months ago
yxw 5ea796fb79 裁片打印工步 10 months ago
王杰 d83d750632 排序装配件确认方式:通用自制件补条码字符 10 months ago
王杰 984a761881 前道防错, 顺序防错 逻辑调整 10 months ago
王杰 da07938e34 扫描主条码 工步 剔除排序场景 10 months ago
王杰 ac408df8b5 排序 设备加工参数工步 10 months ago
王杰 c5d1382724 生产线增加字段 是否忽略 工单质量状态 10 months ago
王杰 d51bcd2278 排序 显示装配件扫描项 10 months ago
王杰 f1f1d8fcdf 前道防错 10 months ago
王杰 ebc7bcd0b4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 377e8aa2e9 工步弹框 10 months ago
yxw 63cd8c2671 裁片功能 10 months ago
yxw 641c881f94 裁片功能-》弹框展示成品列表Function 10 months ago
xiangwei.zhang 55984cee69 判断可疑 10 months ago
yxw 70de9c9b15 裁片功能-》弹框展示成品列表Function 10 months ago
yxw b99fded8f5 裁片功能-》弹框展示成品列表Function 10 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 10 months ago
王杰 89c1240140 合并dev 10 months ago
gsz b36912724c SPS物料拉动PCN扫描页面2 10 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 10 months ago
jun 2f3b3b0761 number同时存在大于小于某个字段问题修复 10 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 33cbf3d537 等离子功能开发 10 months ago
gsz 430d3556da 把拉动单打印产线 拉动组多选 10 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 10 months ago
jun 96f6e5cdd6 返工拆解逻辑调整 10 months ago