Commit Graph

390 Commits (5f0eb647af64ca3edca8327bcc00bb64f290327c)

Author SHA1 Message Date
臧学普 6554e176f4 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 fe3c342dee 离线客户条码打印 6 months ago
王杰 6e2ce20b3b 展示组件 初始化 时禁用扫描框 ; 排序工单 及条码 的上线时间赋值 扫描工单的时间 6 months ago
王杰 16d03491d3 打印 增加零件条码参数属性;离线部分代码提交;选择工单按钮 开始结束查询条件默认值接口返回; 6 months ago
jun f079ee5f03 生产过程控制查询工单增加时间查询条件 6 months ago
jun ac90d30220 设备点检最新方案调整 6 months ago
jun 51567a7b7f 广州发运慢问题修复 6 months ago
王杰 1c3e2656d8 排序 跳过 6 months ago
王杰 bb78d98afc 注释代码 6 months ago
王杰 872f8e9413 去除离线生产配置 6 months ago
jun a92e9ab627 打印模板事务问题修复 6 months ago
王杰 a237d0672e 可复用 逻辑重写 6 months ago
臧学普 a319b05ce9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
王杰 1e146c8596 裁片工单工步 修改 6 months ago
臧学普 a0e27add57 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
王杰 15f8d56864 离线同步JOB 7 months ago
臧学普 3d77e70d79 离线检查是否拉数据 7 months ago
jun 3b3e8014b5 武汉汇报job&装配目视单打印问题修复 7 months ago
jun 61c351f458 芜湖发运增加唯一性校验 7 months ago
王杰 d693da28c8 扫描产成零件工步 7 months ago
王杰 96c55eaad5 排序装配件 保存 记录 bug 修复 7 months ago
臧学普 12ca42f386 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 84361a3027 查询条件没加工厂代码排查 7 months ago
臧学普 5c53be2c16 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java
7 months ago
臧学普 08b0b58982 重构sps代码 7 months ago
王杰 bc8533f0c8 装配件 唯一性 验证 增加 模内验证 7 months ago
jun 827ba97c7b 应急件库位管理演示问题修复 7 months ago
jun e2433f1a78 打印模板调整 7 months ago
jun b1f27d6e72 SPS 生成webservice从MES换到PCN 7 months ago
jun 18b4d11e9b CBR报工逻辑调整 7 months ago
王杰 bd72537b82 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 7 months ago
王杰 5af8d8faf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
jun 176fb4505f 应急件库位管理开发 7 months ago
jun d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
臧学普 54caad459e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 409c979c0e 优化电测试 7 months ago
jun 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 31de710227 客户条码补打 7 months ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 e92c29a07a 装配件扫描 置顶 7 months ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 7 months ago
臧学普 e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
臧学普 1ebb40569f 电测试 7 months ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 5f604adc9d 显示前道所有装配件 7 months ago
王杰 ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 fdf8c283e8 设备日志明细分表 7 months ago
臧学普 ad2a7f8722 电测试开发 7 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 797904c87a Merge branch 'dev' 8 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 8 months ago
gsz 44f72a56a6 PCN发运单打印页面1 8 months ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
jun c9d4d0fa2f 排序汇报job开发 8 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 1cb80d9451 merge dev pom冲突 8 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 8 months ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 c39b5a9ab1 排序 保存工单装配件 8 months ago
王杰 413f68de13 保存加工结果 排序 8 months ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun fc3e0bab38 排序发运功能开发 8 months ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
yxw a9e45c3a00 装配目视单打印 8 months ago
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 a431455f9f 保存工艺参数工步 8 months ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 40f8d63189 设备点检 8 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 8 months ago
yxw 91f6148ac7 新增打印工单打印队列 8 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 8 months ago
王杰 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 8 months ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 8 months ago
王杰 05038cf65c 排序 匹配装配件工步 8 months ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 8 months ago
王杰 bbd0f74b5c Merge branch 'dev' 8 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 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
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
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 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
王杰 f1f1d8fcdf 前道防错 8 months ago
xiangwei.zhang 55984cee69 判断可疑 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
王杰 49549429cb 漏信号 优化 8 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 8 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 33cbf3d537 等离子功能开发 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