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

Commit Graph

  • 4e27437e23 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into yfai-20250418-dev 王杰 2025-04-18 11:17:12 +0800
  • c9d8fc9fb3 Merge branch 'dev_temp_xw_202504170000_45858' into yfai-20250418-dev xiangwei.zhang 2025-04-18 10:47:24 +0800
  • ccd313952d 45858 MES：电子化检验初判和终判批量导入 xiangwei.zhang 2025-04-18 10:19:44 +0800
  • 0cddd49849 MesCommonYear2Service 王杰 2025-04-18 10:04:47 +0800
  • 7727b7feb4 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-temp-merge-all uat-temp-wj-chongqingdaqu-prod-temp-merge-all 王杰 2025-04-17 22:04:34 +0800
  • c68e77815a 46281 PCN-按工位统计产量信息 王杰 2025-04-17 22:04:10 +0800
  • 3a06434acf Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-denglizi' into uat-temp-wj-chongqingdaqu-prod-temp-merge-chengdu 王杰 2025-04-17 20:30:07 +0800
  • a1240198eb 46281 PCN-按工位统计产量信息 王杰 2025-04-17 20:23:40 +0800
  • b47163bc31 等离子多汇报问题解决 uat-temp-wj-chongqingdaqu-prod-temp-denglizi 王杰 2025-04-17 19:26:00 +0800
  • 88837ac681 46420 试制单在工步中默认不汇报 uat-temp-wj-chongqingdaqu-prod-temp-46420 王杰 2025-04-17 17:17:26 +0800
  • e69d160c0c Merge branch 'dev_temp_xw_202503260000_45858' into dev_temp_xw_202504170000_45858 xiangwei.zhang 2025-04-17 11:26:39 +0800
  • 24b84acaf0 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-temp-merge-chengdu 王杰 2025-04-17 10:16:50 +0800
  • b92a3052ec Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-temp-merge-chengdu 王杰 2025-04-17 10:15:56 +0800
  • 2c696e89d1 Merge branch 'uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-temp-merge-chengdu 王杰 2025-04-17 10:15:32 +0800
  • 690b21b224 45858 MES：电子化检验初判和终判批量导入 dev_temp_xw_202503260000_45858 xiangwei.zhang 2025-04-17 09:13:08 +0800
  • 8ee6747873 46363 MES: 宁德新条码需要对应模板的开发方法 王杰 2025-04-16 22:41:25 +0800
  • aa935176ff 46363 MES: 宁德新条码需要对应模板的开发方法 王杰 2025-04-16 22:37:29 +0800
  • f460e311fd 46256 PCN：返工作业页面，点击返工完成后，数量字段为0，产线代码为空 王杰 2025-04-16 20:43:22 +0800
  • a5f07acab4 Merge branch 'uat-temp-nht-2503250001-twoshippingcheck' into uat-temp-wj-chongqingdaqu-dev uat-temp-wj-chongqingdaqu-dev jason 2025-04-16 14:55:31 +0800
  • 7f1d86ebc4 45524 PCN：武汉cockpit发运，需要卡控客户条码不允许重复扫描 dev_temp_xw_202504160000_45524 xiangwei.zhang 2025-04-16 13:56:21 +0800
  • 0113fff330 Merge branch 'uat-temp-nht-2504100000-46214' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-16 13:11:33 +0800
  • a8701b7915 新增成都二次发运返回发运单状态 uat-temp-nht-2503250001-twoshippingcheck jason 2025-04-16 13:05:08 +0800
  • 04791a3d67 Merge branch 'uat-temp-nht-2504070000-46139' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-15 11:22:20 +0800
  • 73bcd308a8 修改装车犯错后未更新修改时间问题 uat-temp-nht-2504070000-46139 jason 2025-04-15 11:21:54 +0800
  • 588b014422 Merge branch 'uat-temp-nht-2504140000-46317' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-15 10:48:58 +0800
  • 273e022117 修复装车单校验完成后同步标志未变更问题 jason 2025-04-15 10:48:06 +0800
  • 497cec6e10 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-15 10:43:57 +0800
  • 3408ec22d4 Merge branch 'uat-temp-nht-2504070000-46139' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-15 10:34:20 +0800
  • 9cb395d33d 修复装车单校验完成后同步标志未变更问题 jason 2025-04-15 10:30:21 +0800
  • adef68a81d 46317 PCN：发运看板最近发运VIN流水号、当天整车数、生产JPH问题解决 jason 2025-04-15 10:23:04 +0800
  • 824517b558 合并成都Volvo发运单及装车单打印功能 jason 2025-04-14 18:06:54 +0800
  • 93ea4e647d 合并成都Volvo排序发运功能 jason 2025-04-14 17:46:50 +0800
  • 77ddb2cc7c 装配件匹配工步 提示信息优化 王杰 2025-04-14 15:57:32 +0800
  • e74aaa03af 控制工单数量 王杰 2025-04-14 14:19:23 +0800
  • c623014a76 装配件匹配工步 提示信息优化 王杰 2025-04-14 14:13:29 +0800
  • 185807b910 调整部分代码涉及到大小写比对的问题 王杰 2025-04-14 13:13:21 +0800
  • 713fab421f 46319 PCN：装配件时效性规则需要支持大小写 王杰 2025-04-14 10:15:18 +0800
  • 2f9c19ee6b Merge branch 'uat-temp-nht-2504100000-46214' into uat-temp-wj-chongqingdaqu-prod-temp-merge yfai-pcn-ext-v3.6 uat-temp-wj-chongqingdaqu-prod-temp-merge jason 2025-04-13 21:46:01 +0800
  • 9fe83748cc Merge remote-tracking branch 'origin/uat-temp-nht-2504100000-46214' into uat-temp-nht-2504100000-46214 uat-temp-nht-2504100000-46214 jason 2025-04-13 21:45:34 +0800
  • 3993b18a0e 46214 PCN：发运校验界面，写入发运队列表时，需要配置进行卡控 jason 2025-04-11 09:36:27 +0800
  • e809114d2c Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge jason 2025-04-13 21:43:23 +0800
  • d89c2ab784 解决排序发运后装车无装车单问题 uat-temp-nht-2504090000-46216 jason 2025-04-13 21:39:00 +0800
  • 06f83b65f8 test 王杰 2025-04-13 18:15:30 +0800
  • d0909faaed 46281 PCN-按工位统计产量信息 王杰 2025-04-12 15:11:10 +0800
  • ea0d8b0188 46281 PCN-按工位统计产量信息 王杰 2025-04-12 15:06:06 +0800
  • bb93d155e3 控制加工单数量 新表 王杰 2025-04-11 20:26:01 +0800
  • e70c057aa3 Merge branch 'uat-temp-nht-2504100000-46214' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-11 10:52:10 +0800
  • 7eb393a508 46214 PCN：发运校验界面，写入发运队列表时，需要配置进行卡控 jason 2025-04-11 09:36:27 +0800
  • 0a4562c3f5 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge jason 2025-04-11 00:47:34 +0800
  • 284bed70e7 解决排序发运后装车无装车单问题 jason 2025-04-11 00:46:36 +0800
  • 14e5f7ef2f l临时提交 王杰 2025-04-11 00:45:03 +0800
  • 7df592150a Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-10 21:07:39 +0800
  • 3b7562db16 修复发运校验是否记忆功能 uat-temp-nht-2503130000-chengdu-shipping jason 2025-04-10 21:05:13 +0800
  • 59d75d5ae3 临时保存 王杰 2025-04-10 19:15:04 +0800
  • fe6781eadc Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge jason 2025-04-10 17:26:38 +0800
  • c5e83d7b1c 合并bug46139代码 jason 2025-04-10 17:26:10 +0800
  • 3ee2bcece0 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-logic-20250410-46141' into uat-temp-wj-chongqingdaqu-prod-temp-merge 王杰 2025-04-10 17:05:14 +0800
  • 9ba8c0622d 临时保存 王杰 2025-04-10 17:03:35 +0800
  • cfdcbe30b1 临时保存 王杰 2025-04-10 16:50:04 +0800
  • 7855af58a4 46141 PCN：赛力斯JIS单接收日志和赛力斯JIS队列接收日志增加零件类查询条件模糊查询 uat-temp-wj-chongqingdaqu-prod-temp-logic-20250410-46141 logic.fang 2025-04-10 16:36:19 +0800
  • 7546a0a3c2 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge jason 2025-04-10 16:25:47 +0800
  • 55c8b6b619 装车校验支持按不同发运组进行顺序卡控 jason 2025-04-10 16:24:49 +0800
  • 08fa65f0c1 Merge remote-tracking branch 'origin/dev_temp_xw_202504100000_46256' into uat-temp-wj-chongqingdaqu-prod-temp-merge 王杰 2025-04-10 15:48:44 +0800
  • 3a81376e60 临时保存 王杰 2025-04-10 15:45:16 +0800
  • 8b4febd729 46229 PCN：客退品电子化检验，排序线需要支持扫描客户条码和工单号 dev_temp_xw_202504100000_46256 xiangwei.zhang 2025-04-10 15:40:07 +0800
  • ad4c284b58 46229 PCN：客退品电子化检验，排序线需要支持扫描客户条码和工单号 xiangwei.zhang 2025-04-10 15:37:02 +0800
  • 43b301401a 礼嘉提出 可复用条码 再重选工单的时候 需要进行失效 王杰 2025-04-10 14:10:43 +0800
  • 64b9c12fa2 46256 PCN：返工作业页面，点击返工完成后，数量字段为0，产线代码为空 xiangwei.zhang 2025-04-10 13:54:52 +0800
  • dd59470280 46256 PCN：返工作业页面，点击返工完成后，数量字段为0，产线代码为空 xiangwei.zhang 2025-04-10 12:00:52 +0800
  • 6fcb521343 Merge remote-tracking branch 'origin/uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 王杰 2025-04-10 02:33:16 +0800
  • 3e8bdb0a23 merge 45787 PDA 点检界面，工单排序顺序：新工单需要显示最前面 王杰 2025-04-10 02:25:28 +0800
  • caf61b21cb merge 45787 PDA 点检界面，工单排序顺序：新工单需要显示最前面 王杰 2025-04-10 02:23:57 +0800
  • 1763659468 Merge remote-tracking branch 'origin/dev_temp_xw_202503310000_45843' into uat-temp-wj-chongqingdaqu-prod-temp-merge 王杰 2025-04-10 02:17:48 +0800
  • 880edbdede Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-09 22:29:59 +0800
  • 948ff54ba1 装车单支持多发运组 jason 2025-04-09 22:28:35 +0800
  • d0bb4145d3 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-09 20:48:16 +0800
  • b3e340d251 装车单支持多发运组 jason 2025-04-09 20:40:47 +0800
  • 952cbdbae0 排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态 yfai-pcn-ext-v3.55 王杰 2025-04-09 19:40:33 +0800
  • ce2f10fe98 排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态 王杰 2025-04-09 18:25:47 +0800
  • e2d186fa2a 46196 MES-PCN:返工作业-替换装配件查询应根据product_sn进行查询，不能使用cust_sn dev_temp_xw_202504090000_46196 xiangwei.zhang 2025-04-09 17:43:40 +0800
  • 6ef5597926 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-09 17:31:38 +0800
  • e5bee3dfcd 装车单支持多发运组 jason 2025-04-09 17:30:18 +0800
  • 0b2cc11778 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev xiangwei.zhang 2025-04-09 16:46:22 +0800
  • 4cc3d98011 Merge branch 'dev_temp_xw_202504090000_46196' into uat-temp-wj-chongqingdaqu-dev xiangwei.zhang 2025-04-09 16:45:35 +0800
  • 9528d539c0 宁德二次装箱 uat-temp-nht-2504020000-3520 jason 2025-04-09 14:09:53 +0800
  • 240080eb58 46196 MES-PCN:返工作业-替换装配件查询应根据product_sn进行查询，不能使用cust_sn xiangwei.zhang 2025-04-09 11:33:20 +0800
  • 7619d98390 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-04-08 21:30:31 +0800
  • 845a7aba45 龙兴排序目视单增加打印属性 工单号 王杰 2025-04-08 21:29:08 +0800
  • 103480a43c Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 王杰 2025-04-08 20:34:56 +0800
  • ae9582d18d Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-rfid' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-04-08 20:34:24 +0800
  • 89e94c65c1 Merge remote-tracking branch 'origin/uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-08 17:51:19 +0800
  • 1892779240 修复成都发运扫位置码条码判断问题 jason 2025-04-08 17:50:24 +0800
  • bf11d54c1e Merge remote-tracking branch 'origin/uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-08 16:38:51 +0800
  • 4bcdf788f8 修复成都发运Vin号判断问题 jason 2025-04-08 16:37:15 +0800
  • fc93cba1f8 发运rfid工位逻辑变更 增加人工模式 uat-temp-wj-chongqingdaqu-prod-temp-rfid 王杰 2025-04-08 16:29:00 +0800
  • 91d9268448 Merge remote-tracking branch 'origin/uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-prod-chengdu uat-temp-wj-chongqingdaqu-prod-chengdu jason 2025-04-08 16:28:54 +0800
  • f4069c4698 宁德二次装箱 jason 2025-04-08 12:43:16 +0800
  • 0630bd420f Merge branch 'uat-temp-nht-2504070000-46139' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-08 09:51:48 +0800
  • 2be53f46ac 46139 CN：发运单的状态增加“已装车”枚举（50），完成装车防错校验后更新为“已装车”状态。 jason 2025-04-08 09:50:41 +0800
  • 9135368cc8 45843 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在 xiangwei.zhang 2025-04-08 09:31:03 +0800