Commit Graph

2199 Commits (mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht)

Author SHA1 Message Date
王杰 0c0cdd2465 第二天自动创建工单汇报 生产版本问题 逻辑调整 2 months ago
王杰 0cca6a1765 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak 2 months ago
xiangwei.zhang 335dbb8e52 46970 返工拆解查询装配件条码,不能根据装配件条码而要根据id去查询并且修改 2 months ago
王杰 3dbbf23a99 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak 2 months ago
xiangwei.zhang e608665df9 46970 返工拆解查询装配件条码,不能根据装配件条码而要根据id去查询并且修改 2 months ago
jason dbf8e91547 46987 MES&PCN-装箱防错功能,增加配置开关 “是否校验工厂代码”,默认逻辑开启,需要校验,字段为空也为校验 2 months ago
jason beee1d6277 46881 PCN:发运看板开启多个导致CPU很高,优化查询SQL 2 months ago
王杰 bee1c8e17c 合并46970礼嘉测试环境批量返工报废不需要从责任人库位移到正常库位,保持不动 解决冲突 2 months ago
xiangwei.zhang 2a0cb8222a 46970 礼嘉测试环境批量返工报废不需要从责任人库位移到正常库位,保持不动 2 months ago
王杰 7576219ed8 合并宁德发运 2 months ago
王杰 b0f2c2cc61 Merge remote-tracking branch 'origin/uat-temp-nht-2504020000-3520' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 a7e48f928c Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-publish0415' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 6daaf09684 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 f1f8f0b68b Merge remote-tracking branch 'origin/uat-temp-nht-202505090001-46746' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 2284e39a86 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 f13c1b960a Merge remote-tracking branch 'origin/dev_temp_xw_202505120000_46850' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 5b67c38b3a Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
jason a181c3c0d9 修复宁德二次发运写入JIS_SHIPPING表逻辑 2 months ago
王杰 373dd1e038 大小写问题 2 months ago
王杰 2e08809199 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 2 months ago
王杰 a2d756cb40 大小写问题 2 months ago
jason 6b67fa78df 46757 代开票业务支持条码打印 2 months ago
jason 4fb98f07a6 修复替换装配件后的查询问题 2 months ago
王杰 7742daad31 46428 PCN:龙兴条码打印直接从数据库里取,不走redis 2 months ago
jason eeacec72bf 修复条码强过后,检验这个条码是不是扫过了 2 months ago
jason edb53d3384 修复替换装配件后的查询问题 2 months ago
xiangwei.zhang 2d06f12771 46850 排序报工慢的问题 2 months ago
jason 5f88ad674a 46746 PCN:在生产控制页面增加“替换装配件”按钮,参考返工作业的“替换装配件”功能 2 months ago
jason ebaebe449e 46746 PCN:在生产控制页面增加“替换装配件”按钮,参考返工作业的“替换装配件”功能 2 months ago
王杰 ce0e486efb Merge branch 'uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 2 months ago
王杰 8d4ac268c6 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 2 months ago
王杰 1d18681b40 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 2 months ago
jason e1f8bca3c6 修复宁德二次发运问题 2 months ago
王杰 851df7994c Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 3 months ago
王杰 4997a5819d Merge remote-tracking branch 'origin/uat-temp-nht-2504240000-data-matrix' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 3 months ago
logic.fang 08e9c103cd 46601 电子化检验返工拆解时候需要全部进行拆解 3 months ago
王杰 ce7e467540 礼嘉缝纫批量汇报 3 months ago
王杰 d8186cb52f 礼嘉缝纫批量汇报 3 months ago
jason ace1efd6d9 46708 PCN-龙兴发运看板增加折线图,和现有看板页面定时翻页显示 3 months ago
jason 73e5cc9034 宁德二次发运问题修复 3 months ago
王杰 122cb3fa32 46751 MES:设备实时值查询,条码字段没有展示。 3 months ago
王杰 930acdd2af 46751 MES:设备实时值查询,条码字段没有展示。 3 months ago
王杰 60bd600fde 46751 MES:设备实时值查询,条码字段没有展示。 3 months ago
jason 6aafc9c317 修改成都条码生成策略的CustPartNo取值逻辑 3 months ago
王杰 5f8b5d042e 临时提交 3 months ago
jason 36918bbbfc 46708 PCN-龙兴发运看板增加折线图,和现有看板页面定时翻页显示 3 months ago
王杰 6165cfb243 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b7999bbee5 Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b16fe77a0a 合并龙兴发运看板 3 months ago
王杰 2e5f8e6919 合并龙兴发运 3 months ago
王杰 373c32d7c0 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b06ae8cca3 merge cd 解决冲突 3 months ago
jason 664259ed22 46742 成都零件条码打印客户零件号取值逻辑修改,先取mes_cust_invoiced_part表中的客户零件号。 3 months ago
jason b1fc30cf85 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 3 months ago
jason 762ed54cf7 46708 PCN-龙兴发运看板增加折线图,和现有看板页面定时翻页显示 3 months ago
王杰 41724faa8b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
王杰 0dc2272806 合并代码 3 months ago
王杰 a1c552ed75 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
王杰 86196f23c0 合并代码 3 months ago
王杰 af0c638397 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
jason 5b4231bdc8 46499 MES-PCN: 宁德二次发运逻辑更新 3 months ago
王杰 056b423c31 46664 裁切工单无法打印 3 months ago
王杰 c0966141a2 46648 热板焊接3扫描速度慢 3 months ago
王杰 1b09e9a175 46615 MES-PCN:保存工艺参数JOB报错 3 months ago
王杰 15e9bc41cb Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 3 months ago
jason ddfbe5f0ab 修复二维码打印为dataMatrix格式 3 months ago
王杰 5c6e543f8c Merge remote-tracking branch 'origin/dev_temp_xw_202504170000_45858' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 5f5f021c9f Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 c80472d2e2 礼嘉 福特小件发运 第二个table空的异常问题修复 3 months ago
王杰 5dec26fcef 芜湖 设备可疑 系统异常 修复 3 months ago
王杰 d0505ffd72 芜湖 设备可疑 系统异常 修复 3 months ago
王杰 12cc0a015c 芜湖 设备可疑 系统异常 修复 3 months ago
王杰 670e0c8b17 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 3 months ago
王杰 9a1adf3285 工步方法优化 3 months ago
王杰 7abfa524fd 礼嘉发运单 打印 3 months ago
王杰 bb33823140 礼嘉发运单 打印 3 months ago
王杰 bc9ddc502b 46215 PCN:发运防错增加显示后续待发运单号信息 3 months ago
王杰 42f59c1d9f 46215 PCN:发运防错增加显示后续待发运单号信息 3 months ago
xiangwei.zhang c44d0cdcdf 46317 PCN:发运看板最近发运VIN流水号、当天整车数、生产JPH问题解决 3 months ago
王杰 0342d9f4ba 46503 PCN:排序发运卡控product_sn和cust_sn 3 months ago
王杰 0201fd95db Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-publish' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd 3 months ago
王杰 37db6694a3 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty' into uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia 3 months ago
jason abee8487ec 修改发运单打印生产日期取值问题 3 months ago
jason 0afffbf8f9 修复龙兴发运看板生产JPH统计问题 3 months ago
jason 36f68e1772 修复创建Volvo 发运单打印生产日期问题 3 months ago
王杰 6ddda38d9b merge 46348 排序汇报的汇报类型错误,显示“报工调整” 代码调整 3 months ago
王杰 f48929e914 Merge remote-tracking branch 'origin/dev_temp_xw_202504180000_46348' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 3 months ago
xiangwei.zhang 529efb5ea0 45858 MES:电子化检验初判和终判批量导入 3 months ago
王杰 0526434f16 加工零件统计Sheet页 3 months ago
xiangwei.zhang dea86d3e38 46348 PCN:排序汇报的汇报类型错误,显示“报工调整” 3 months ago
xiangwei.zhang 06cd72a348 45858 MES:电子化检验初判和终判批量导入 3 months ago
王杰 874f127ea7 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-46420' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 3 months ago
王杰 118400e0dc Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-denglizi' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 3 months ago
王杰 bae43ce630 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into uat-temp-wj-chongqingdaqu-prod-merge-longxing 3 months ago
王杰 aa49e3d9b3 merge 46139 3 months ago
王杰 9bc3922048 更新打印状态, 不改同步标志[如果打印在保存加工结果前面会导致未知状态同步到云] 3 months ago
xiangwei.zhang ccd313952d 45858 MES:电子化检验初判和终判批量导入 3 months ago
王杰 0cddd49849 MesCommonYear2Service 3 months ago
王杰 c68e77815a 46281 PCN-按工位统计产量信息 3 months ago
王杰 b47163bc31 等离子多汇报问题解决 3 months ago
王杰 88837ac681 46420 试制单在工步中默认不汇报 3 months ago
xiangwei.zhang e69d160c0c Merge branch 'dev_temp_xw_202503260000_45858' into dev_temp_xw_202504170000_45858 3 months ago
xiangwei.zhang 690b21b224 45858 MES:电子化检验初判和终判批量导入 3 months ago
王杰 8ee6747873 46363 MES: 宁德新条码需要对应模板的开发方法 3 months ago
王杰 aa935176ff 46363 MES: 宁德新条码需要对应模板的开发方法 3 months ago
王杰 f460e311fd 46256 PCN:返工作业页面,点击返工完成后,数量字段为0,产线代码为空 3 months ago
jason adef68a81d 46317 PCN:发运看板最近发运VIN流水号、当天整车数、生产JPH问题解决 3 months ago
jason 824517b558 合并成都Volvo发运单及装车单打印功能 3 months ago
jason 93ea4e647d 合并成都Volvo排序发运功能 3 months ago
王杰 77ddb2cc7c 装配件匹配工步 提示信息优化 3 months ago
王杰 e74aaa03af 控制工单数量 3 months ago
王杰 c623014a76 装配件匹配工步 提示信息优化 3 months ago
王杰 185807b910 调整部分代码涉及到大小写比对的问题 3 months ago
王杰 713fab421f 46319 PCN:装配件时效性规则需要支持大小写 3 months ago
jason 2f9c19ee6b Merge branch 'uat-temp-nht-2504100000-46214' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
jason 3993b18a0e 46214 PCN:发运校验界面,写入发运队列表时,需要配置进行卡控 3 months ago
jason e809114d2c Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
jason d89c2ab784 解决排序发运后装车无装车单问题 3 months ago
王杰 06f83b65f8 test 3 months ago
王杰 d0909faaed 46281 PCN-按工位统计产量信息 3 months ago
王杰 ea0d8b0188 46281 PCN-按工位统计产量信息 3 months ago
王杰 bb93d155e3 控制加工单数量 新表 3 months ago
jason 0a4562c3f5 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
jason 284bed70e7 解决排序发运后装车无装车单问题 3 months ago
王杰 14e5f7ef2f l临时提交 3 months ago
王杰 59d75d5ae3 临时保存 3 months ago
jason fe6781eadc Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
jason c5e83d7b1c 合并bug46139代码 3 months ago
王杰 3ee2bcece0 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-logic-20250410-46141' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
王杰 9ba8c0622d 临时保存 3 months ago
王杰 cfdcbe30b1 临时保存 3 months ago
logic.fang 7855af58a4 46141 PCN:赛力斯JIS单接收日志和赛力斯JIS队列接收日志增加零件类查询条件模糊查询 3 months ago
jason 7546a0a3c2 Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
jason 55c8b6b619 装车校验支持按不同发运组进行顺序卡控 3 months ago
王杰 08fa65f0c1 Merge remote-tracking branch 'origin/dev_temp_xw_202504100000_46256' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
王杰 3a81376e60 临时保存 3 months ago
xiangwei.zhang 8b4febd729 46229 PCN:客退品电子化检验,排序线需要支持扫描客户条码和工单号 3 months ago
xiangwei.zhang ad4c284b58 46229 PCN:客退品电子化检验,排序线需要支持扫描客户条码和工单号 3 months ago
王杰 43b301401a 礼嘉提出 可复用条码 再重选工单的时候 需要进行失效 3 months ago
xiangwei.zhang 64b9c12fa2 46256 PCN:返工作业页面,点击返工完成后,数量字段为0,产线代码为空 3 months ago
xiangwei.zhang dd59470280 46256 PCN:返工作业页面,点击返工完成后,数量字段为0,产线代码为空 3 months ago
王杰 6fcb521343 Merge remote-tracking branch 'origin/uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
王杰 caf61b21cb merge 45787 PDA 点检界面,工单排序顺序:新工单需要显示最前面 3 months ago
王杰 1763659468 Merge remote-tracking branch 'origin/dev_temp_xw_202503310000_45843' into uat-temp-wj-chongqingdaqu-prod-temp-merge 3 months ago
jason 948ff54ba1 装车单支持多发运组 3 months ago
jason b3e340d251 装车单支持多发运组 3 months ago
王杰 952cbdbae0 排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态 3 months ago
王杰 ce2f10fe98 排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态 3 months ago
jason 9528d539c0 宁德二次装箱 3 months ago
王杰 845a7aba45 龙兴排序目视单增加打印属性 工单号 4 months ago