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

Commit Graph

  • 309a7ab848 Merge branch 'uat-temp-wj-chongqingdaqu-prod' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-10 15:50:05 +0800
  • 7b04194349 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-10 15:49:55 +0800
  • 4742fb1583 修复bug：45560，根据发运组编码进行配置匹配。 uat-temp-nht-2503100000-45560 jason 2025-03-10 15:39:46 +0800
  • 7d1d6149fc Merge remote-tracking branch 'origin/uat-temp-castle-2502241152-fordFetchWeb' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-10 15:00:02 +0800
  • 4668055c23 推单 王杰 2025-03-10 14:56:33 +0800
  • c64c73971f Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod jason 2025-03-10 14:44:16 +0800
  • ca85a6f637 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod logic.fang 2025-03-10 14:34:36 +0800
  • d42f88d77a 福特抓取网页增加分页 uat-temp-castle-2502241152-fordFetchWeb 臧学普 2025-03-10 14:26:32 +0800
  • 6216692e39 Merge remote-tracking branch 'origin/uat-temp-logic-20250309-45550' into uat-temp-nht-2502110000-chongqing-step uat-temp-nht-2502110000-chongqing-step jason 2025-03-10 14:16:35 +0800
  • 7ac587c05f Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-nht-2502110000-chongqing-step jason 2025-03-10 14:14:52 +0800
  • 0c6e965bf0 修复bug：45560，增加系统参数配置MES_SHIPPING_QUEUE_SAVE_CFG，发运组配置后写入mes_shipping_queue，没有配置则不写入。 jason 2025-03-10 13:59:08 +0800
  • 6513564010 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev jason 2025-03-10 11:00:50 +0800
  • a5df54bc98 修复bug：45420，操作的NC处理，2个人同时操作，产生2笔move数据。 jason 2025-03-10 10:59:47 +0800
  • 5dd7bb7eee 45550 PDA-MES-PDA发运扫描排序方式修改（序号提示优化） uat-temp-logic-20250309-45550 logic.fang 2025-03-09 20:54:46 +0800
  • 486ed45033 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-09 19:43:41 +0800
  • 1afc3574d8 发运RFI去特殊字符 王杰 2025-03-09 19:42:58 +0800
  • 0f573f284d Merge remote-tracking branch 'origin/uat-temp-logic-20250309-45550' into uat-temp-wj-chongqingdaqu 王杰 2025-03-09 18:48:25 +0800
  • d9c2b6c8b1 45550 PDA-MES-PDA发运扫描排序方式修改 logic.fang 2025-03-09 18:35:30 +0800
  • 9dfff1db6e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-09 17:10:37 +0800
  • 4cbaf37b13 发运RFID 王杰 2025-03-09 17:08:29 +0800
  • 228aa76db7 推单 王杰 2025-03-09 16:41:44 +0800
  • 98311a5c2d 设备加工参数【排序】发送异常问题修复 王杰 2025-03-08 22:00:51 +0800
  • 17ec31db78 设备加工参数【排序】发送异常问题修复 王杰 2025-03-08 21:57:15 +0800
  • 33705ef14e Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu 王杰 2025-03-08 00:23:41 +0800
  • 0819b960e2 排序推单 王杰 2025-03-08 00:16:05 +0800
  • 2592f341fe 45527 礼嘉福特发运单打印-优化 logic.fang 2025-03-08 00:07:24 +0800
  • a53f97b8a0 45527 礼嘉福特发运单打印 logic.fang 2025-03-07 22:23:56 +0800
  • 0cf312c04e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-07 14:53:57 +0800
  • 346f8a7bac 推单 王杰 2025-03-07 14:39:53 +0800
  • ef30d1db83 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-07 13:25:20 +0800
  • 7b5ffeb7d4 推单 王杰 2025-03-07 13:23:48 +0800
  • 20ddfa7363 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu jason 2025-03-07 10:29:23 +0800
  • 3848cf1545 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev jason 2025-03-07 10:20:03 +0800
  • 325b82d949 新增看板 jason 2025-03-07 10:13:12 +0800
  • 1226bfd29c 龙兴 排序客户条码打印策略 王杰 2025-03-07 09:49:34 +0800
  • 512c06b5dc 龙兴 排序客户条码打印策略 王杰 2025-03-07 09:48:41 +0800
  • b4bf261646 Merge remote-tracking branch 'origin/uat-temp-castle-2502241152-fordFetchWeb' into uat-temp-wj-chongqingdaqu 王杰 2025-03-06 16:45:49 +0800
  • ed432c6fe1 Merge branch 'uat-temp-castle-2502241152-fordFetchWeb' into dev 臧学普 2025-03-06 11:09:33 +0800
  • 37843777b5 福特抓取网页 臧学普 2025-03-06 11:01:36 +0800
  • 4f529c9d76 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-03-05 16:24:46 +0800
  • 0ed0d4e43f 福特抓取网页 臧学普 2025-03-05 16:15:04 +0800
  • 53330ff307 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-03-05 14:15:21 +0800
  • e6e061967b 重庆大区 王杰 2025-03-05 11:04:33 +0800
  • eadbd49ec2 Merge remote-tracking branch 'origin/uat-temp-nht-2502140000-part-print' into dev jason 2025-03-05 10:23:31 +0800
  • 76f10afa80 去除条码生成规则的零件条码参数卡控逻辑 uat-temp-nht-2502140000-part-print jason 2025-03-05 10:22:14 +0800
  • aeea38b898 Merge remote-tracking branch 'origin/uat-temp-nht-250226-lijia' into uat-temp-wj-chongqingdaqu 王杰 2025-03-05 09:35:32 +0800
  • ef97dbd871 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu 王杰 2025-03-05 09:31:24 +0800
  • d72950b3a3 Merge remote-tracking branch 'origin/uat-temp-wj-lijia-prod' into uat-temp-wj-chongqingdaqu 王杰 2025-03-05 09:17:36 +0800
  • 613625ce19 代码优化 王杰 2025-03-04 14:28:19 +0800
  • 8d7fed8bbc 福特抓取网页 臧学普 2025-03-04 14:24:58 +0800
  • 8ca9f3fad1 排序推单 王杰 2025-03-03 18:46:16 +0800
  • fd740c82f6 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-03-03 14:35:38 +0800
  • bd062c4282 Merge branch 'dev_temp_xw202503020000_45316' into dev xiangwei.zhang 2025-03-03 14:34:56 +0800
  • b809ff0a7c Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev jason 2025-03-03 13:13:29 +0800
  • 4bf1931b39 新增成都条码打印生产时间获取 jason 2025-03-03 13:12:18 +0800
  • 36d259b7fa 45316 裁片加工记录表条码对应的数量为1200，生产汇报需要按照1200数量汇报，不能按照数量为1汇报 xiangwei.zhang 2025-03-02 10:34:55 +0800
  • 50a78c8f08 排序推单展示组件 王杰 2025-02-28 19:11:51 +0800
  • 84aa53b820 Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into test 王杰 2025-02-28 17:49:28 +0800
  • a9cb79ff8b 排序推单 王杰 2025-02-28 17:46:55 +0800
  • 23c9eb8c3f 修改礼嘉条码打印包含时分秒的生产日期为条码的创建时间 uat-temp-nht-250226-lijia jason 2025-02-28 16:26:03 +0800
  • ff3cd4e496 修改礼嘉条码打印包含时分秒的生产日期为条码的创建时间 uat-temp-wj-lijia-prod jason 2025-02-28 16:12:01 +0800
  • 25e4d011fe Merge branch 'uat' into uat-temp-wj-lijia-prod 王杰 2025-02-28 15:53:58 +0800
  • 7036e0f1b4 礼嘉 从重庆分支中单独拉取 根据读条码生成条码工步 王杰 2025-02-28 15:50:22 +0800
  • ccd746fa64 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 王杰 2025-02-28 14:29:41 +0800
  • c3bfa9dc28 工步判可疑 来源库位 代码错误 修正 王杰 2025-02-28 14:29:34 +0800
  • 64380a5f5a 工步判可疑 来源库位 代码错误 修正 yfai-pcn-ext-v3.2 王杰 2025-02-28 14:13:58 +0800
  • aec8a2d3e3 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into dev jason 2025-02-28 10:25:31 +0800
  • 47233e04c4 修复礼嘉条码打印策略丢失问题 jason 2025-02-27 19:18:18 +0800
  • f55139b42e 修改龙兴发运看板 uat-temp-nht-202502180000-shippingkanban jason 2025-02-27 15:33:36 +0800
  • 283cc58820 发运RFID 王杰 2025-02-27 15:02:32 +0800
  • 982f95191a Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into dev jason 2025-02-27 13:37:39 +0800
  • ab6f09114a 45335 修复cockpit发运校验明细数据，扫描跳过码后，往mes_jis_shipping表写入数据问题 jason 2025-02-27 13:36:12 +0800
  • 9f7aa32198 Merge branch 'test-temp-wj-45329' into dev 王杰 2025-02-27 11:00:44 +0800
  • e8ec0688dc 45329 PCN：SPS物料拉动，扫描强过码后报系统异常，导致现场无法正常扫描 test-temp-wj-45329 王杰 2025-02-27 10:59:05 +0800
  • b5a9e63d0a Merge branch 'uat-temp-wj-250208-44424' into uat-temp-wj-2502060000-chongqing-step 王杰 2025-02-27 00:00:18 +0800
  • 1db013d028 合并44424解决冲突 王杰 2025-02-26 23:49:54 +0800
  • db21e38959 Merge branch 'uat-temp-wj-250208-44424' into test 王杰 2025-02-26 23:16:10 +0800
  • 653e9f192b Merge remote-tracking branch 'origin/uat-temp-nht-202502260000-customprint' into test 王杰 2025-02-26 21:32:54 +0800
  • cae8f9af41 排序推单 王杰 2025-02-26 20:54:38 +0800
  • 17b7c10a7a 重新提交自定义打印功能，用于合并test uat-temp-nht-202502260000-customprint jason 2025-02-26 15:08:32 +0800
  • b79ad22d6e Merge remote-tracking branch 'origin/uat-temp-nht-2502200000-lijia-sn-print' into uat-temp-nht-250226-lijia jason 2025-02-26 13:59:08 +0800
  • 2ed8052a73 Merge remote-tracking branch 'origin/test-demp-ljs-202501181621-44904' into test 王杰 2025-02-26 13:57:51 +0800
  • 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 王杰 2025-02-26 13:55:47 +0800
  • 14dba4b720 排序推单 王杰 2025-02-26 13:49:50 +0800
  • 84c3d427f2 完成龙兴发运看板 jason 2025-02-26 11:47:01 +0800
  • c52f12a042 Merge branch 'dev-temp-xw-202502170000-45135' into dev xiangwei.zhang 2025-02-25 20:25:16 +0800
  • 6f9f8f71cc 45135 武汉待排序总成问题 xiangwei.zhang 2025-02-25 20:24:24 +0800
  • 58575c43db Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-25 19:47:07 +0800
  • 65c13bdc8f 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-25 19:36:42 +0800
  • c651c7ef78 Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-25 17:45:52 +0800
  • 8eaa0261ba 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-25 17:45:21 +0800
  • ff7b11e271 完成龙兴发运看板 jason 2025-02-25 16:25:20 +0800
  • c502380266 龙兴 临时增加 根据读条码生成零件条码工步 form 重庆大区新工步 uat-temp-wj-longxin-prod 王杰 2025-02-25 13:34:10 +0800
  • cb50635c6c 完成龙兴发运看板 jason 2025-02-25 13:16:04 +0800
  • 933eef1adb 排序推单 王杰 2025-02-25 13:15:43 +0800
  • 0dc14ff147 修改龙兴发运看板 jason 2025-02-24 21:24:13 +0800
  • 9c79411f52 Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-24 15:44:47 +0800
  • 68b186e431 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-24 15:44:20 +0800
  • 42ab17b031 Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-24 13:13:37 +0800
  • 8b3bf424aa 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-24 13:11:29 +0800