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

Commit Graph

  • 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
  • 97ada9a13c 合并冲突 王杰 2024-09-24 10:24:05 +0800
  • 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 王杰 2024-09-24 10:22:55 +0800
  • abd4a0546f 漏信号 改LOG状态增加修改时间条件 王杰 2024-09-24 10:22:36 +0800
  • 3215c2957e 漏信号 改LOG状态增加修改时间条件 王杰 2024-09-24 10:21:21 +0800
  • ce2dc13c8b jdbc连接url增加allowMultiQueries=true 王杰 2024-09-24 00:52:51 +0800
  • 543e006ff3 Merge branch 'master' into dev-wuhan-temp 王杰 2024-09-24 00:49:13 +0800
  • 8b70f63423 漏信息问题修复 王杰 2024-09-24 00:48:51 +0800
  • 0ea80b7ea0 Merge branch 'master' into dev-wuhan-temp 王杰 2024-09-23 19:30:32 +0800
  • 42c5101d09 漏信号 王杰 2024-09-23 19:29:23 +0800
  • c95c16fdcb Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-23 18:18:41 +0800
  • 99437630bf 非排序无显示装配件匹配工步 王杰 2024-09-23 18:17:50 +0800
  • 8a9d4d55c8 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-23 18:07:35 +0800
  • fb713f5e5d Merge branch 'master' into dev-wuhan-temp 王杰 2024-09-23 18:07:15 +0800
  • d84adae7f5 漏信号 代码修改 王杰 2024-09-23 18:06:34 +0800
  • 8655825afc 弹框工步 王杰 2024-09-23 17:18:11 +0800
  • 70cca89c41 Merge branch 'master' into dev-wuhan-temp 王杰 2024-09-23 17:13:14 +0800
  • 8c5c959c3a 漏信号 bug 王杰 2024-09-23 17:12:52 +0800
  • 2c196e4f47 显示装配件 json to string 序列号 null 异常处理 王杰 2024-09-23 16:58:33 +0800
  • 4e2056d1fa Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-23 16:31:51 +0800
  • 7f7c46d92e 显示装配件 json to string 序列号 null 异常处理 王杰 2024-09-23 16:31:30 +0800
  • 0c1bfef981 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-23 16:06:24 +0800
  • def629d6a2 排序产线工单发布新增装配目视单打印队列 yxw 2024-09-23 15:56:07 +0800
  • 672df80254 漏信号 代码 报错 问题修复 查询id bigint 转long 王杰 2024-09-23 15:20:11 +0800
  • 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-23 11:12:18 +0800
  • d8bbb932a9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-23 11:11:56 +0800
  • 5c1e7a1124 30.6配置文件密码修改 yxw 2024-09-23 11:11:38 +0800
  • 825891b51a 漏信号 代码 报错 问题修复 查询id bigint 转long 王杰 2024-09-23 10:30:47 +0800
  • 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 王杰 2024-09-23 10:21:16 +0800
  • 6b99d852d7 合并 冲突 王杰 2024-09-23 09:42:14 +0800
  • 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-09-22 18:49:20 +0800
  • d94723f1d3 排序 匹配装配件工步 王杰 2024-09-22 18:49:00 +0800
  • 05038cf65c 排序 匹配装配件工步 王杰 2024-09-22 18:45:00 +0800
  • b1905b75e3 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-21 18:16:16 +0800
  • 70d83d76c7 打印队列表 yxw 2024-09-21 18:15:44 +0800
  • 63493c7fd9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-09-21 16:21:00 +0800
  • 9ceb874f19 通用包装组零件校验(VKM)功能开发 jun 2024-09-21 16:20:05 +0800
  • 89e087632e 电子化检验弹框数据处理 yxw 2024-09-21 15:23:21 +0800
  • bbf6577607 电子化检验弹框数据处理 yxw 2024-09-21 15:22:31 +0800
  • 3acc35c0ab 电子化检验弹框数据处理 yxw 2024-09-21 14:16:27 +0800
  • db81a86fe7 电子化检验弹框数据处理 yxw 2024-09-21 14:16:19 +0800
  • 764744cba5 电子化检验弹框数据处理 yxw 2024-09-21 14:13:27 +0800
  • 2dcadee21b 工步弹框 王杰 2024-09-21 13:49:47 +0800
  • 1988ac9e83 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 王杰 2024-09-21 12:09:50 +0800
  • e22a91f580 排序 匹配工步 王杰 2024-09-21 12:09:44 +0800
  • de08e40843 裁片工单打印 yxw 2024-09-21 11:19:52 +0800
  • 8e81257831 排序 匹配装配件工步 王杰 2024-09-20 18:03:06 +0800
  • ca1aa4a652 裁片工单打印优化 yxw 2024-09-20 15:57:17 +0800
  • 8290261d5b JIS物料拉动PCN页面2 gsz 2024-09-20 15:31:01 +0800
  • 188741a4dd Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-20 12:56:24 +0800
  • 04e7942d04 裁片原材料防错优化 yxw 2024-09-20 12:56:00 +0800
  • ba1a743d20 Merge branch 'master' into dev-wuhan-temp 王杰 2024-09-20 10:36:00 +0800
  • 0113527434 JIS物料拉动PCN页面2 gsz 2024-09-20 10:35:37 +0800
  • bbd0f74b5c Merge branch 'dev' 王杰 2024-09-20 09:55:31 +0800
  • b578de2b1a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-20 09:52:40 +0800
  • 82a6beef27 MesPcnExtConstWords VERTICAL_BAR 参数名更改 yxw 2024-09-20 09:52:08 +0800
  • a149c7cb55 Merge branch 'dev' into dev-wuhan 王杰 2024-09-20 09:51:35 +0800
  • 0957d7c212 PCN裁片工单打印 yxw 2024-09-19 23:26:15 +0800
  • 3c60fd4487 PCN裁片工单打印 yxw 2024-09-19 23:24:50 +0800
  • a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-19 19:29:41 +0800
  • e476c0c4dc 裁片相关pojo修改 yxw 2024-09-19 19:29:17 +0800
  • 08aa3def34 打印非报废条码工步 王杰 2024-09-19 19:15:49 +0800
  • c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan gsz 2024-09-19 18:11:32 +0800
  • 932f06d023 JIS物料拉动PCN页面1 gsz 2024-09-19 18:11:13 +0800
  • 0e5b02c65d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-19 16:20:43 +0800
  • 739136d035 查询bom增加生效开始时间分组 jun 2024-09-19 16:20:33 +0800
  • 550fcee7aa 裁片功能优化 yxw 2024-09-19 16:20:12 +0800
  • 8f3dd7bc9b 排序 显示前道所有装配件扫描项 王杰 2024-09-19 16:08:49 +0800
  • e9d2615935 裁片功能优化 yxw 2024-09-19 15:44:22 +0800
  • ab9f3dde09 裁片功能优化 yxw 2024-09-19 15:18:42 +0800
  • e783d75ae2 裁片功能优化 yxw 2024-09-19 14:48:51 +0800
  • 213e349773 新增bomCode xiangwei.zhang 2024-09-19 13:59:57 +0800
  • d2d1d98281 43072 加料防错 料箱自动初始化 jun 2024-09-19 11:49:58 +0800
  • 2322cc606c 43063 PDA点检重复扫描了同一个条码，希望提示清晰 jun 2024-09-19 10:54:34 +0800
  • ab3fd934cf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan yxw 2024-09-19 09:06:27 +0800