Commit Graph

302 Commits (5bfb403b48a031cf44abd7f05dbdae838b64452a)

Author SHA1 Message Date
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 e92c29a07a 装配件扫描 置顶 9 months ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 9 months ago
臧学普 e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 1ebb40569f 电测试 9 months ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 5f604adc9d 显示前道所有装配件 9 months ago
王杰 ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 fdf8c283e8 设备日志明细分表 9 months ago
臧学普 ad2a7f8722 电测试开发 9 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 797904c87a Merge branch 'dev' 10 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 10 months ago
gsz 44f72a56a6 PCN发运单打印页面1 10 months ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
jun c9d4d0fa2f 排序汇报job开发 10 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 1cb80d9451 merge dev pom冲突 10 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 10 months ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 c39b5a9ab1 排序 保存工单装配件 10 months ago
王杰 413f68de13 保存加工结果 排序 10 months ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun fc3e0bab38 排序发运功能开发 10 months ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
yxw a9e45c3a00 装配目视单打印 10 months ago
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 a431455f9f 保存工艺参数工步 10 months ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 40f8d63189 设备点检 10 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 10 months ago
yxw 91f6148ac7 新增打印工单打印队列 10 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 10 months ago
王杰 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 10 months ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 05038cf65c 排序 匹配装配件工步 10 months ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 bbd0f74b5c Merge branch 'dev' 10 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 10 months ago
yxw 3c60fd4487 PCN裁片工单打印 10 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw e476c0c4dc 裁片相关pojo修改 10 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 10 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 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