jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

Commit Graph

  • 3a81d887a5 前道防错工步 王杰 2024-10-08 15:13:40 +0800
  • 3b955236e6 43302 加料防错扫码流程优化 gsz 2024-10-08 15:10:03 +0800
  • 1a734d52d0 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-08 12:39:44 +0800
  • 315009b22c 合并dev 王杰 2024-10-08 12:39:27 +0800
  • 0f88c13f3b Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-08 12:31:07 +0800
  • e20e160034 合并dev 王杰 2024-10-08 12:30:41 +0800
  • 24fd34c088 合并dev 王杰 2024-10-08 12:28:42 +0800
  • 3b3edc9b46 条码修改工步 update 改成updateByProperties 王杰 2024-10-08 12:16:40 +0800
  • 80c6aaf1f5 发运工单表中条码字段修改 jun 2024-10-08 10:05:26 +0800
  • 4922e1bd58 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-08 09:54:52 +0800
  • aa719fb463 通用客户条码转换逻辑变更 王杰 2024-10-08 09:54:33 +0800
  • b4e500dd6d 合并 dev-wuhan master(工位扫描监控日志去除分表配置,直接使用动态sql写入生产线对应的分表) 王杰 2024-10-08 09:47:29 +0800
  • 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-08 09:40:06 +0800
  • cfed01aa5c 工位扫描 日志 去除分表 写DB改成sql执行 王杰 2024-09-30 19:42:43 +0800
  • 36ee2c007a 临时存储 王杰 2024-09-30 17:15:02 +0800
  • 797904c87a Merge branch 'dev' 王杰 2024-09-30 15:52:18 +0800
  • 1cf4524daf 客户条码打印 yxw 2024-09-30 15:30:38 +0800
  • 78fb82c88a 规则并截取右侧流水装配件规则, 生成零件条码工步需要使用此流水生成新的零件条码 王杰 2024-09-30 14:43:45 +0800
  • a536b82cfd 排序产线客户条码打印 yxw 2024-09-29 17:49:32 +0800
  • b8cf5c7cfe byd 装配件策略 截取右侧流水 王杰 2024-09-29 17:39:11 +0800
  • f82c6626a1 装配目视单打印策略类字段引用修改 yxw 2024-09-29 14:59:02 +0800
  • f930bb092b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-29 14:51:39 +0800
  • 5eaf01b076 排序展示组件查询逻辑优化 yxw 2024-09-29 14:51:20 +0800
  • 44f72a56a6 PCN发运单打印页面1 gsz 2024-09-29 11:57:34 +0800
  • ad5934cfd8 43289 SPS拉动提示系统异常 gsz 2024-09-29 09:45:13 +0800
  • a05cd762bc 条码打印次数更新 xiangwei.zhang 2024-09-29 09:32:11 +0800
  • d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-28 19:22:44 +0800
  • 4092793204 排序流程 盲写代码 自测 问题修复 王杰 2024-09-28 19:22:23 +0800
  • 4440d368a0 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-09-28 18:01:41 +0800
  • c9d4d0fa2f 排序汇报job开发 jun 2024-09-28 18:01:24 +0800
  • b3cdc996ed Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-28 13:39:57 +0800
  • 7176608355 排序 加工记录 根据工单装配件写加工记录的汇报方式状态汇报零件号 王杰 2024-09-28 13:37:43 +0800
  • 92845822c7 打印模板开发 jun 2024-09-27 19:53:14 +0800
  • ccc52308e3 判断可疑 xiangwei.zhang 2024-09-27 19:41:34 +0800
  • f9415668a3 判断可疑 xiangwei.zhang 2024-09-27 18:26:37 +0800
  • 70adc2f3a9 条码生成 对象增加 生产线 工位 王杰 2024-09-27 15:12:31 +0800
  • 2b362500b1 条码生成 对象增加 生产线 工位 王杰 2024-09-27 15:08:26 +0800
  • 70456a3df5 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2024-09-27 14:33:32 +0800
  • 3d9b4e6aa2 判断可疑 xiangwei.zhang 2024-09-27 14:32:52 +0800
  • 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-27 14:23:16 +0800
  • 19dc318f2f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-27 14:15:10 +0800
  • bd4d547f4b 保存裁片工单结果工步-裁片工单号获取方式修改 yxw 2024-09-27 14:14:53 +0800
  • 3e11aff239 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 王杰 2024-09-27 13:38:18 +0800
  • 1cb80d9451 merge dev pom冲突 王杰 2024-09-27 13:38:07 +0800
  • c8576f6f92 1、MesProductionPartContext 增加cutQty（裁片工单数量） 2、裁片工单绑定问题修复 yxw 2024-09-27 13:30:37 +0800
  • 0f3a1cb964 1、MesProductionPartContext 增加cutQty（裁片工单数量） 2、裁片工单绑定问题修复 yxw 2024-09-27 13:30:17 +0800
  • 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 王杰 2024-09-27 13:29:04 +0800
  • f2a453f549 判断可疑 xiangwei.zhang 2024-09-27 12:40:02 +0800
  • df5757bec8 排序 保存加工结果 王杰 2024-09-27 11:18:09 +0800
  • d1b5e32076 非排序产出零件条码 去掉cutWorkOrderNo 字段 yxw 2024-09-26 17:51:23 +0800
  • fac38e24c5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-26 17:40:11 +0800
  • bdceeb26f5 排序展示组件开发 yxw 2024-09-26 17:39:44 +0800
  • c94b44ceee Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan gsz 2024-09-26 17:33:41 +0800
  • 176b418709 排序返工作业2 gsz 2024-09-26 17:33:35 +0800
  • f441b07b4b 上下文 获取生产线类型 不验证工序 王杰 2024-09-26 16:39:53 +0800
  • 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-26 16:22:46 +0800
  • c5ef060b85 Merge branch 'dev' 王杰 2024-09-26 16:22:08 +0800
  • 4e94622cfd Merge branch 'dev' into dev-wuhan 王杰 2024-09-26 16:21:33 +0800
  • c39b5a9ab1 排序 保存工单装配件 王杰 2024-09-26 16:02:58 +0800
  • 30082cc4ae 裁片工步修改： 1、加工规则匹配时，对进料条件封装foreignKey 2、保存裁片条码工步取消引用保存条码工步，改为在本工步实现根据是否存在进料条码保存条码逻辑 3、裁片工单号存值改为产出零件上下文中 yxw 2024-09-26 13:51:45 +0800
  • 51bf7e01ec Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 王杰 2024-09-26 11:53:53 +0800
  • d8cabab1d8 展示组件 王杰 2024-09-26 11:53:46 +0800
  • 63dbcf1eb0 装配目视单预览 yxw 2024-09-25 15:09:50 +0800
  • 16ee98410f 装配目视单打印 yxw 2024-09-26 09:24:07 +0800
  • 6efdf95220 装配目视单打印 yxw 2024-09-26 09:24:07 +0800
  • 413f68de13 保存加工结果 排序 王杰 2024-09-25 19:42:50 +0800
  • a25a8b92e0 排序返工作业1 gsz 2024-09-25 18:22:34 +0800
  • 007256524b Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan gsz 2024-09-25 18:17:54 +0800
  • 5fb9601736 JIS物料拉动演示问题修改 gsz 2024-09-25 18:17:45 +0800
  • 78f398a7fb 排序发运演示问题修复 jun 2024-09-25 16:47:57 +0800
  • 3218721983 排序发运功能开发 jun 2024-09-25 16:39:51 +0800
  • 75edad4f97 装配目视单预览 yxw 2024-09-25 15:09:50 +0800
  • b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-09-25 14:19:40 +0800
  • fc3e0bab38 排序发运功能开发 jun 2024-09-25 14:19:21 +0800
  • 2bb948e6c4 JIS物料拉动PCN 修改根据工单号排序校验 gsz 2024-09-25 13:15:11 +0800
  • ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp yxw 2024-09-25 09:36:44 +0800
  • 01e7e45737 装配目视单打印 yxw 2024-09-25 09:34:40 +0800
  • 8ed36a5e6b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-24 18:40:07 +0800
  • a9e45c3a00 装配目视单打印 yxw 2024-09-24 18:39:37 +0800
  • 7ae9519b26 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 王杰 2024-09-24 16:22:34 +0800
  • 7e795f15d2 排序 保存加工结果 王杰 2024-09-24 16:22:28 +0800
  • 361eb7e455 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan gsz 2024-09-24 15:55:25 +0800
  • 0aafab31c8 排序电子化检验支持加工单扫描或者加工单客户条码1 gsz 2024-09-24 15:55:14 +0800
  • 7d68d9f4f9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp yxw 2024-09-24 15:24:21 +0800
  • 9453928bf8 Merge branch 'dev-wuhan' into dev-wuhan-temp yxw 2024-09-24 15:24:02 +0800
  • 2b1e11ebf9 装配目视单打印 yxw 2024-09-24 15:00:44 +0800
  • c210f5e8b2 判断可疑 yfai-pcn-ext-v2.0 xiangwei.zhang 2024-09-24 14:35:39 +0800
  • 9695bfae11 Merge branch 'master' into dev-wuhan-temp 王杰 2024-09-24 14:07:17 +0800
  • a431455f9f 保存工艺参数工步 王杰 2024-09-24 13:46:41 +0800
  • bc534df0ec 装配目视单打印 yxw 2024-09-24 13:34:17 +0800
  • f7b48f9801 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp yxw 2024-09-24 13:16:00 +0800
  • bfa34b5cef Merge branch 'dev-wuhan' into dev-wuhan-temp yxw 2024-09-24 13:15:33 +0800
  • 98843e2581 Merge branch 'master' into dev-wuhan-temp 王杰 2024-09-24 12:30:34 +0800
  • c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-24 12:30:23 +0800
  • 40f8d63189 设备点检 王杰 2024-09-24 12:29:21 +0800
  • aad6e2dd48 装配目视单打印 yxw 2024-09-24 11:54:08 +0800
  • ae996c361c PCN根据产线查询零件生产组信息集合 yxw 2024-09-24 11:11:45 +0800
  • 798ec0d3ff Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-24 10:55:45 +0800
  • 91f6148ac7 新增打印工单打印队列 yxw 2024-09-24 10:55:10 +0800
  • 949da88cea Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-24 10:24:51 +0800