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

Commit Graph

  • 55984cee69 判断可疑 xiangwei.zhang 2024-09-14 15:50:22 +0800
  • 70de9c9b15 裁片功能-》弹框展示成品列表Function yxw 2024-09-14 15:31:14 +0800
  • b99fded8f5 裁片功能-》弹框展示成品列表Function yxw 2024-09-14 15:31:07 +0800
  • 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-14 09:02:46 +0800
  • f105f37d7f 裁片功能-》弹框展示成品列表Function yxw 2024-09-14 09:01:08 +0800
  • 89c1240140 合并dev 王杰 2024-09-13 18:52:19 +0800
  • 49549429cb 漏信号 优化 王杰 2024-09-13 18:49:06 +0800
  • b36912724c SPS物料拉动PCN扫描页面2 gsz 2024-09-13 16:55:51 +0800
  • bb2a3f1092 43010 PNC增加装配件查询 gsz 2024-09-13 16:46:25 +0800
  • 2f3b3b0761 number同时存在大于小于某个字段问题修复 jun 2024-09-13 15:23:31 +0800
  • aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-09-13 13:37:22 +0800
  • 33cbf3d537 等离子功能开发 jun 2024-09-13 13:37:04 +0800
  • 430d3556da 把拉动单打印产线 拉动组多选 gsz 2024-09-13 13:12:40 +0800
  • 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan gsz 2024-09-13 09:35:34 +0800
  • bc7d209620 SPS物料拉动PCN扫描页面1 gsz 2024-09-13 09:34:46 +0800
  • 96f6e5cdd6 返工拆解逻辑调整 jun 2024-09-12 17:50:30 +0800
  • 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-09-12 17:10:44 +0800
  • 8680ee4e9b 原箱进原箱出逻辑开发 jun 2024-09-12 17:10:18 +0800
  • 2314130e5a 上下文 物料 王杰 2024-09-12 16:05:44 +0800
  • 5e1f6de520 工步弹框 王杰 2024-09-12 15:19:47 +0800
  • 2af9d8f125 工步弹框 王杰 2024-09-12 14:33:55 +0800
  • 59c44cb199 发运单，装车单跳过逻辑调整 jun 2024-09-12 11:11:36 +0800
  • 17a2254f3a 站点信息基础数据 jun 2024-09-12 10:28:12 +0800
  • e22af55524 装车单跳过，是否要将装车单关联的发运单也一并完成，同时一并发给WMS jun 2024-09-11 18:23:30 +0800
  • bf49601ad1 扫描可回用包装开发 jun 2024-09-11 17:21:32 +0800
  • 47dee04a69 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-11 11:31:57 +0800
  • ae725102b7 保存裁片加工记录 yxw 2024-09-11 11:29:59 +0800
  • d883d077fd 料包绑定增加外协件逻辑 jun 2024-09-11 11:26:21 +0800
  • 59fc125885 通用顺序防错工步 王杰 2024-09-10 20:39:13 +0800
  • 0cd56db811 返工代码优化 jun 2024-09-10 19:04:30 +0800
  • 91ff86f2d3 返工完成方法名事务问题修改 jun 2024-09-10 14:46:22 +0800
  • 428e0bdce6 修改原材料长度 yxw 2024-09-10 11:40:44 +0800
  • a63247efc8 返工拆解inspection表里，nc_status增加拆解功能 jun 2024-09-10 11:19:41 +0800
  • 8a08eaaf53 发运单中默认不写装车单信息，需要反查 jun 2024-09-10 08:31:40 +0800
  • fd46d3ab15 发运跳过逻辑优化 jun 2024-09-09 20:32:31 +0800
  • 54bc6daf7f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-09 17:15:20 +0800
  • add6da8105 修复原材料防错记录修改长度履历时修改类型不对问题 yxw 2024-09-09 17:14:58 +0800
  • 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 王杰 2024-09-09 13:21:01 +0800
  • 959eb9aa11 设备计数验证shotCounter 王杰 2024-09-09 10:59:52 +0800
  • b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-09 09:57:21 +0800
  • 1e8f6672cf 裁片功能 yxw 2024-09-09 09:56:16 +0800
  • 05d89d34bb Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-09-07 19:51:06 +0800
  • 2ef4f1e2f0 料包绑定功能开发 jun 2024-09-07 19:50:42 +0800
  • df3f552348 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-07 10:24:46 +0800
  • f6e0ae2118 裁片原材料防错增加长度修改记录 yxw 2024-09-07 10:24:33 +0800
  • 5cf100bce8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev yfai-pcn-ext-v1.9 王杰 2024-09-06 20:47:16 +0800
  • c2b94c2ad6 生成零件号 可复用 王杰 2024-09-06 20:47:04 +0800
  • b2325f6ce0 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 王杰 2024-09-06 17:27:02 +0800
  • 8d704d6a9e 排序顺序防错 王杰 2024-09-06 17:26:53 +0800
  • 65b902f4ba Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-06 13:52:44 +0800
  • 82db0d1594 10.193.30.22 服务器配置文件 yxw 2024-09-06 13:51:32 +0800
  • b98c50a6e8 Merge remote-tracking branch 'origin/dev' into dev jun 2024-09-06 12:35:30 +0800
  • 408911ff1b 返工拆解，查询树形装配件，增加id,pid关联 jun 2024-09-06 12:33:59 +0800
  • 3cf7ef6096 Merge branch 'dev' into dev-wuhan 王杰 2024-09-06 10:28:50 +0800
  • 8789532066 PcnRepositoryAspect 王杰 2024-09-06 10:27:19 +0800
  • d76ad89328 Merge remote-tracking branch 'origin/dev' into dev jun 2024-09-06 10:11:24 +0800
  • 3a5e4d844e 重新检测生成单据，同步标识重置 jun 2024-09-06 10:10:42 +0800
  • 58811fff06 42984 初检创建时修改人和修改时间不能赋值 gsz 2024-09-06 09:25:37 +0800
  • 78514c8beb Merge remote-tracking branch 'origin/dev' into dev-wuhan yxw 2024-09-06 08:39:38 +0800
  • 2a6bcfc4dc Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-06 00:18:53 +0800
  • 487c627bf8 裁片工单生成问题修复 yxw 2024-09-06 00:18:21 +0800
  • adfcb960c9 Merge remote-tracking branch 'origin/dev' into dev jun 2024-09-05 21:37:10 +0800
  • a4a612bd9c 点检单同步标识未修改 jun 2024-09-05 21:36:38 +0800
  • f894210e6f Merge branch 'dev' into dev-wuhan 王杰 2024-09-05 19:52:54 +0800
  • 0c88633bfa 删除无用的备份工步 王杰 2024-09-05 19:27:04 +0800
  • 90e6ff708d Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 王杰 2024-09-05 19:19:45 +0800
  • ba80057ac8 读设备数据 写日志 增加 王杰 2024-09-05 19:19:28 +0800
  • 05ccf6501f Merge remote-tracking branch 'origin/dev' into dev jun 2024-09-05 18:25:34 +0800
  • b731d10d44 电子化检验拆解功能开发 jun 2024-09-05 18:25:19 +0800
  • d818cb08d7 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-05 18:11:17 +0800
  • bcf15b1eaa 修改原材料修改记录表 yxw 2024-09-05 18:10:18 +0800
  • d5d51e0585 Merge remote-tracking branch 'origin/dev' into dev-wuhan yxw 2024-09-05 16:46:09 +0800
  • fae918112f Merge branch 'dev' into dev-wuhan 王杰 2024-09-05 16:38:17 +0800
  • f06716eec8 生产零件号 可复用 报错 问题修复 王杰 2024-09-05 16:32:58 +0800
  • a2c80f138d 代码写错 王杰 2024-09-05 15:54:08 +0800
  • f9a1e5322e Merge branch 'dev' into dev-wuhan 王杰 2024-09-05 15:33:26 +0800
  • 27b40d6709 设备查询点位数据去除事务 王杰 2024-09-05 15:31:01 +0800
  • bc60e1a2c1 电子化检验拆解功能开发 jun 2024-09-05 15:29:56 +0800
  • 9f6afe14fd 解决代码冲突 yxw 2024-09-05 14:54:12 +0800
  • 92f9a79e97 PCN长度修改类型获取接口 yxw 2024-09-05 14:31:29 +0800
  • abc8599d73 Merge remote-tracking branch 'origin/dev' into dev-wuhan yxw 2024-09-05 14:14:25 +0800
  • 9841ac7cde Merge remote-tracking branch 'origin/dev' into dev-wuhan yxw 2024-09-05 13:56:54 +0800
  • 5a6b1f1d2a Merge remote-tracking branch 'origin/dev' into dev jun 2024-09-05 13:42:33 +0800
  • 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-05 13:36:58 +0800
  • a8db4e761c 裁片原材料防错 yxw 2024-09-05 13:36:19 +0800
  • 6537f792ef 裁片原材料防错 yxw 2024-09-05 13:35:38 +0800
  • 43ba2569c1 非排序拆解功能 jun 2024-09-05 13:34:16 +0800
  • a5dd6cf0f3 常量 睡眠2s改500ms 王杰 2024-09-05 13:27:42 +0800
  • 8e321c50ff wuhan 工单 工步 王杰 2024-09-05 13:17:06 +0800
  • 25b01eb43c 判断可疑 xiangwei.zhang 2024-09-04 17:33:58 +0800
  • 17cc0df013 判断可疑 xiangwei.zhang 2024-09-04 15:29:02 +0800
  • 1ae2f9a3f2 42925 原材料防错优化 gsz 2024-09-04 15:03:33 +0800
  • 38c4fa0907 裁片功能主数据表 yxw 2024-09-04 14:49:23 +0800
  • 7fd1e0aa7a Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev gsz 2024-09-04 14:10:59 +0800
  • 6179c4b4b1 电子化检验 质量状态发生变化后，同步标识改为未同步 gsz 2024-09-04 14:10:55 +0800
  • 2d7e14e916 原材料防错，提交逻辑优化(代码回退) jun 2024-09-04 10:32:57 +0800
  • 463a365660 非排序 返工拆解流程开发 jun 2024-09-04 10:30:25 +0800
  • e8395e2062 非排序 返工拆解流程开发 jun 2024-09-04 10:20:03 +0800
  • 8dc523d83d PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号） jun 2024-09-04 09:48:01 +0800
  • 9b7c9e4bb2 原材料防错，提交逻辑优化 jun 2024-09-03 17:22:28 +0800