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

Commit Graph

  • 5d7b0c91cc Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev jason 2025-05-07 17:05:23 +0800
  • 73e5cc9034 宁德二次发运问题修复 jason 2025-05-07 17:04:33 +0800
  • 122cb3fa32 46751 MES：设备实时值查询，条码字段没有展示。 王杰 2025-05-07 15:48:41 +0800
  • 930acdd2af 46751 MES：设备实时值查询，条码字段没有展示。 王杰 2025-05-07 14:42:25 +0800
  • 60bd600fde 46751 MES：设备实时值查询，条码字段没有展示。 王杰 2025-05-07 14:42:17 +0800
  • 6b47ba660f Merge branch 'uat-temp-nht-2505060001-46742' into yfai-20250418-dev jason 2025-05-07 14:34:04 +0800
  • 6aafc9c317 修改成都条码生成策略的CustPartNo取值逻辑 uat-temp-nht-2505060001-46742 jason 2025-05-07 14:30:00 +0800
  • 9aca4dcf0c Merge remote-tracking branch 'origin/yfai-20250418-dev' into yfai-20250418-dev jason 2025-05-07 14:00:50 +0800
  • 766393f95a 合并宁德二次发运功能 jason 2025-05-07 13:52:16 +0800
  • bdd20b3977 合并宁德二次发运功能 jason 2025-05-07 13:52:16 +0800
  • 5f8b5d042e 临时提交 王杰 2025-05-07 11:13:11 +0800
  • 6220d82369 Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev jason 2025-05-07 10:57:39 +0800
  • 03c150420c Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into uat-temp-nht-2504300000-46708 jason 2025-05-07 10:51:58 +0800
  • 36918bbbfc 46708 PCN-龙兴发运看板增加折线图，和现有看板页面定时翻页显示 jason 2025-05-06 17:56:49 +0800
  • 9a74a0ffab Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev jason 2025-05-07 09:17:24 +0800
  • 6165cfb243 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 王杰 2025-05-06 21:55:47 +0800
  • b7999bbee5 Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 王杰 2025-05-06 21:55:18 +0800
  • b16fe77a0a 合并龙兴发运看板 王杰 2025-05-06 21:54:27 +0800
  • 2e5f8e6919 合并龙兴发运 王杰 2025-05-06 21:50:21 +0800
  • 67c3d79905 Merge branch 'uat-temp-nht-2505060001-46742' into yfai-20250418-dev jason 2025-05-06 21:49:38 +0800
  • 373c32d7c0 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 王杰 2025-05-06 21:48:36 +0800
  • b5bf8a3d3f Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 王杰 2025-05-06 21:45:42 +0800
  • b06ae8cca3 merge cd 解决冲突 王杰 2025-05-06 21:35:55 +0800
  • 664259ed22 46742 成都零件条码打印客户零件号取值逻辑修改，先取mes_cust_invoiced_part表中的客户零件号。 jason 2025-05-06 20:48:34 +0800
  • 700c8e6aeb Merge branch 'uat-temp-nht-2505060000-shippingScanSn' into yfai-20250418-dev jason 2025-05-06 19:05:27 +0800
  • 3aa785ba64 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-nht-2505060000-shippingScanSn uat-temp-nht-2505060000-shippingScanSn jason 2025-05-06 19:04:54 +0800
  • b1fc30cf85 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 jason 2025-05-06 18:14:11 +0800
  • 37b2935bb8 Merge branch 'uat-temp-nht-2505060000-shippingScanSn' into yfai-20250418-dev jason 2025-05-06 18:16:01 +0800
  • fc4dfeef2f 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 jason 2025-05-06 18:14:11 +0800
  • 762ed54cf7 46708 PCN-龙兴发运看板增加折线图，和现有看板页面定时翻页显示 jason 2025-05-06 17:56:49 +0800
  • f70c936199 解决冲突 王杰 2025-05-04 11:20:28 +0800
  • f60d22c2f2 修复龙兴发运看板生产JPH查询问题 uat-temp-nht-2505020000-shippingkanban jason 2025-05-02 11:18:55 +0800
  • 41724faa8b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 王杰 2025-05-01 14:27:23 +0800
  • 0dc2272806 合并代码 王杰 2025-04-30 23:14:49 +0800
  • a1c552ed75 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 王杰 2025-04-30 23:07:24 +0800
  • 86196f23c0 合并代码 王杰 2025-04-30 23:02:40 +0800
  • af0c638397 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 王杰 2025-04-30 22:31:28 +0800
  • 9846138e4a Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 jason 2025-04-30 15:38:06 +0800
  • 0803089369 Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 jason 2025-04-30 15:34:43 +0800
  • 6d03f36882 Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 jason 2025-04-30 15:34:43 +0800
  • 5b4231bdc8 46499 MES-PCN: 宁德二次发运逻辑更新 jason 2025-04-27 17:11:00 +0800
  • 38e2f72945 46499 MES-PCN: 宁德二次发运逻辑更新 jason 2025-04-27 17:11:00 +0800
  • 3c382281b6 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into yfai-20250418-dev 王杰 2025-04-29 12:58:16 +0800
  • 056b423c31 46664 裁切工单无法打印 uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia 王杰 2025-04-29 12:51:08 +0800
  • 466f7f83eb Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save' into yfai-20250418-dev 王杰 2025-04-29 09:28:44 +0800
  • c0966141a2 46648 热板焊接3扫描速度慢 uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save 王杰 2025-04-29 08:41:22 +0800
  • 84990b0f30 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615' into yfai-20250418-dev 王杰 2025-04-27 22:20:00 +0800
  • 1b09e9a175 46615 MES-PCN：保存工艺参数JOB报错 uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615 王杰 2025-04-27 22:19:34 +0800
  • e03ad02ae3 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug' into yfai-20250418-dev 王杰 2025-04-27 21:58:29 +0800
  • 4ceb411a94 46613 发运扫描条码重复提交问题修复 uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug 王杰 2025-04-25 15:11:21 +0800
  • 15e9bc41cb Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 王杰 2025-04-25 09:17:04 +0800
  • ddfbe5f0ab 修复二维码打印为dataMatrix格式 uat-temp-nht-2504240000-data-matrix jason 2025-04-24 21:05:18 +0800
  • 5c6e543f8c Merge remote-tracking branch 'origin/dev_temp_xw_202504170000_45858' into uat-temp-wj-chongqingdaqu-prod-huaweiyun yfai-pcn-ext-v3.7 王杰 2025-04-24 14:51:59 +0800
  • 5f5f021c9f Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 王杰 2025-04-24 14:41:23 +0800
  • c80472d2e2 礼嘉 福特小件发运 第二个table空的异常问题修复 王杰 2025-04-24 10:58:55 +0800
  • 5dec26fcef 芜湖 设备可疑 系统异常 修复 王杰 2025-04-23 21:14:57 +0800
  • d0505ffd72 芜湖 设备可疑 系统异常 修复 王杰 2025-04-23 19:21:11 +0800
  • 12cc0a015c 芜湖 设备可疑 系统异常 修复 王杰 2025-04-23 19:11:01 +0800
  • 670e0c8b17 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 王杰 2025-04-23 13:28:34 +0800
  • a049b715c2 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into yfai-20250418-dev 王杰 2025-04-23 13:27:38 +0800
  • fd74d045fb Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into yfai-20250418-dev 王杰 2025-04-23 13:27:18 +0800
  • fb6f1f02a9 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into yfai-20250418-dev 王杰 2025-04-23 13:26:17 +0800
  • 9a1adf3285 工步方法优化 uat-temp-wj-chongqingdaqu-prod-temp-46319 王杰 2025-04-23 13:10:39 +0800
  • 7abfa524fd 礼嘉发运单 打印 王杰 2025-04-22 22:07:36 +0800
  • bb33823140 礼嘉发运单 打印 王杰 2025-04-22 22:07:21 +0800
  • bc9ddc502b 46215 PCN：发运防错增加显示后续待发运单号信息 uat-temp-wj-chongqingdaqu-prod-temp-46503 王杰 2025-04-22 21:08:33 +0800
  • 42f59c1d9f 46215 PCN：发运防错增加显示后续待发运单号信息 王杰 2025-04-22 20:34:40 +0800
  • c44d0cdcdf 46317 PCN：发运看板最近发运VIN流水号、当天整车数、生产JPH问题解决 uat-temp-nht-2504140000-46317 xiangwei.zhang 2025-04-22 20:21:05 +0800
  • 4d9b9aef77 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into yfai-20250418-dev 王杰 2025-04-22 16:13:14 +0800
  • 0342d9f4ba 46503 PCN：排序发运卡控product_sn和cust_sn 王杰 2025-04-22 16:12:37 +0800
  • 0201fd95db Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 王杰 2025-04-22 14:52:57 +0800
  • 40044b6271 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into yfai-20250418-dev 王杰 2025-04-22 13:35:01 +0800
  • 3c1f866b57 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd' into yfai-20250418-dev 王杰 2025-04-22 13:34:34 +0800
  • 37db6694a3 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia 王杰 2025-04-22 11:38:54 +0800
  • abee8487ec 修改发运单打印生产日期取值问题 uat-temp-nht-chengdu-publish jason 2025-04-21 22:22:01 +0800
  • 91c948db00 46466 插E单偶发目视单未自动打印 dev_temp_xw_202504210000_46466 xiangwei.zhang 2025-04-21 17:44:14 +0800
  • 0afffbf8f9 修复龙兴发运看板生产JPH统计问题 jason 2025-04-21 16:24:08 +0800
  • 673d726962 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd 王杰 2025-04-21 10:31:38 +0800
  • 36f68e1772 修复创建Volvo 发运单打印生产日期问题 jason 2025-04-21 10:28:04 +0800
  • b5ae36a7ea Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd 王杰 2025-04-21 10:07:17 +0800
  • 84b898ce22 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping 王杰 2025-04-21 09:58:55 +0800
  • 4549c4937f Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping 王杰 2025-04-21 09:55:58 +0800
  • 6eb1e57e14 礼嘉发运单 王杰 2025-04-21 09:21:50 +0800
  • 6ddda38d9b merge 46348 排序汇报的汇报类型错误，显示“报工调整” 代码调整 uat-temp-wj-chongqingdaqu-prod-merge-longxing 王杰 2025-04-20 02:09:34 +0800
  • f48929e914 Merge remote-tracking branch 'origin/dev_temp_xw_202504180000_46348' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 王杰 2025-04-20 01:48:49 +0800
  • ba847ea723 Merge branch 'dev_temp_xw_202504170000_45858' into yfai-20250418-dev xiangwei.zhang 2025-04-19 13:42:53 +0800
  • 529efb5ea0 45858 MES：电子化检验初判和终判批量导入 dev_temp_xw_202504170000_45858 xiangwei.zhang 2025-04-19 13:42:07 +0800
  • 489b624b3a Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into yfai-20250418-dev 王杰 2025-04-18 20:01:12 +0800
  • 0526434f16 加工零件统计Sheet页 uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty 王杰 2025-04-18 19:59:44 +0800
  • 54a681e8f9 Merge branch 'dev_temp_xw_202504180000_46348' into yfai-20250418-dev xiangwei.zhang 2025-04-18 19:23:36 +0800
  • dea86d3e38 46348 PCN：排序汇报的汇报类型错误，显示“报工调整” dev_temp_xw_202504180000_46348 xiangwei.zhang 2025-04-18 19:22:32 +0800
  • 876dd2dcce Merge remote-tracking branch 'origin/yfai-20250418-dev' into yfai-20250418-dev xiangwei.zhang 2025-04-18 17:22:33 +0800
  • 84d9ef2f57 Merge branch 'dev_temp_xw_202504170000_45858' into yfai-20250418-dev xiangwei.zhang 2025-04-18 17:21:59 +0800
  • 06cd72a348 45858 MES：电子化检验初判和终判批量导入 xiangwei.zhang 2025-04-18 17:21:10 +0800
  • 874f127ea7 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-46420' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 王杰 2025-04-18 17:03:29 +0800
  • 118400e0dc Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-denglizi' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 王杰 2025-04-18 16:26:58 +0800
  • bae43ce630 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 王杰 2025-04-18 16:25:43 +0800
  • aa49e3d9b3 merge 46139 王杰 2025-04-18 16:16:00 +0800
  • 9bc3922048 更新打印状态, 不改同步标志[如果打印在保存加工结果前面会导致未知状态同步到云] 王杰 2025-04-18 15:26:18 +0800
  • 4aafc83aed merge 45843 & 45894 yfai-pcn-ext-v3.45 uat-temp uat 王杰 2025-04-18 14:04:33 +0800