Commit Graph

2256 Commits (mes-uat-changshu0609)

Author SHA1 Message Date
logic.fang f0cd2ca1e3 47700 MES-PCN:站点容器绑定问题汇总:(优化) 1 month ago
xiangwei.zhang 6233a5f31a 大包套小包逻辑 1 month ago
xiangwei.zhang ce178a01ef 大包套小包逻辑 1 month ago
logic.fang 9f0b69405c 47700 MES-PCN:站点容器绑定问题汇总:(优化) 1 month ago
xiangwei.zhang 7a0c88a975 大包套小包逻辑 1 month ago
logic.fang 1a60f3cdca 47700 MES-PCN:站点容器绑定问题汇总: 1 month ago
xiangwei.zhang d62cc785c8 大包套小包逻辑 1 month ago
xiangwei.zhang 5aa5c776af 大包套小包逻辑 1 month ago
jason 3231d46ea5 常熟上料功能 1 month ago
王杰 9bc0945a11 temp commit 1 month ago
logic.fang 8c3a6b9f10 3533 主数据表设计与开发(容器条码与站点关系表-接口变更) 1 month ago
logic.fang d91200dad9 3533 主数据表设计与开发(容器条码与站点关系表-软删除接口请求方式变更) 1 month ago
logic.fang 7886c85e1c 3533 主数据表设计与开发(容器条码与站点关系表) 1 month ago
logic.fang e181519b04 47191 DM202504290012 龙兴工厂CKPT线排序信息拆单需求-EDI功能修改(扫描发运新增“校验是否末单”、“发送用户自定义指令至PLC点位”) 1 month ago
jason ece6e4f88d 修复成都工位端打印DataMatrix格式问题 1 month ago
王杰 1f2bf0a276 Merge branch 'mes-test' into mes-uat-changshu0609 1 month ago
王杰 e73b501e70 打包 编码规则 策略变更 流水号递增不使用零件维度 1 month ago
jason 60b5ea30d8 47389 成都零件标签打印模板修改 1 month ago
jason 3f4e77dec4 47389 成都零件标签打印模板修改 2 months ago
王杰 5d4aafd24b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-test-merge-daxiaoxie 2 months ago
王杰 20c3601ae9 Merge branch 'mes-uat' into mes-test 2 months ago
王杰 aace498cfb 生产线开班逻辑调整 2 months ago
王杰 122214e896 Merge remote-tracking branch 'origin/dev_temp_xw_202505230000_47023' into mes-test 2 months ago
王杰 eb900174e5 Merge remote-tracking branch 'origin/uat-temp-nht-2505260000-47177' into mes-test 2 months ago
王杰 ab6dd22282 Merge remote-tracking branch 'origin/uat-temp-nht-2505210000-chengdu-custpart' into mes-test 2 months ago
xiangwei.zhang ef6b9ee270 第二天报工取错生产版本问题修复 2 months ago
xiangwei.zhang e3ed2f3ce3 Merge remote-tracking branch 'origin/mes-uat' into mes-uat 2 months ago
xiangwei.zhang 92fa3eb930 第二天报工取错生产版本问题修复 2 months ago
王杰 0feb2ac82a Merge branch 'mes-uat' into mes-test 2 months ago
xiangwei.zhang 575038e5c0 第二天报工取错生产版本问题修复 2 months ago
王杰 618209785e Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-test 2 months ago
logic.fang 7cc05f616f 47241 PCN:赛力斯jis队列接收和赛力斯JIS单接收,增加取消订单按钮,按钮需要权限管控 2 months ago
xiangwei.zhang c2d9e2207e 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 2 months ago
logic.fang 6fa7d7dc2c 47187 PCN-电子化返工拆解功能问题(优化) 2 months ago
logic.fang 4a66446687 47187 PCN-电子化返工拆解功能问题 2 months ago
xiangwei.zhang 41d63d1beb 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 2 months ago
xiangwei.zhang a19b5b43b2 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 2 months ago
jason 7e7ef291a8 47177 PCN-装箱放错,扫描已经封箱的箱条码,目前只能显示十行已扫描的明细,没有按照实际扫描数量显示 2 months ago
jason b268c7804e 47122 PCN-成都发运单打印加载发运单明细,增加按位置号排序 2 months ago
jason d731205471 47122 PCN-成都发运单打印加载发运单明细 2 months ago
jason 083baffc93 47122 PCN-成都发运单打印加载发运单明细 2 months ago
王杰 641a8d5fbd Merge branch 'mes-test-batch-report-bug' into mes-test 2 months ago
王杰 352221cceb Merge branch 'mes-uat-temp-47040' into mes-test 2 months ago
王杰 967cde9401 批量汇报未完成数计数不准bug 2 months ago
jason 72ca534717 合并成都打印及条码生成客户零件号取待开票物料中的客户零件号 2 months ago
王杰 e3d5501b05 合并46894 MES PCN: 吉翔下线条码,客户零件号优先取客户待开票物料 uat-temp-nht202505120000-46757 2 months ago
王杰 ce4fce0b7f Merge remote-tracking branch 'origin/uat-temp-nht-2505200000-47042' into mes-test 2 months ago
王杰 375ace3baa Merge remote-tracking branch 'origin/uat-temp-nht-2505160000-46987' into mes-test 2 months ago
王杰 888275dd6b 选择产成零件按钮 2 months ago
王杰 5a8339521b 回头46981 电子化检验 NC判定 虚结构不可录入 需求总部不同意变更 2 months ago
jason 73df0409ad 47042 MES: PCN发运校验:发运单明细,优先校验客户待开票物料中对应的零件关系主数据 2 months ago
王杰 a159411fb1 合并 46981 电子化检验 NC判定 虚结构不可录入 解决冲突 2 months ago
jason 7680553d4e 46987 MES&PCN-装箱防错功能,增加配置开关 “包装码中是否为客户零件号”,默认逻辑关闭,为是则包装条码中的零件号为客户零件号。 2 months ago
jason 1a2c6efd58 46987 MES&PCN-装箱防错功能,增加配置开关 “包装码中是否为客户零件号”,默认逻辑关闭,为是则包装条码中的零件号为客户零件号。 2 months ago
王杰 c31d5e44c6 合并 46881 PCN:龙兴发运看板优化 解决冲突 2 months ago
王杰 f41ae22e28 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion' into mes-test 2 months ago
王杰 4c89c16a09 Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into mes-test 2 months ago
王杰 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 2 months ago
王杰 4997a5819d Merge remote-tracking branch 'origin/uat-temp-nht-2504240000-data-matrix' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
logic.fang 08e9c103cd 46601 电子化检验返工拆解时候需要全部进行拆解 2 months ago
王杰 ce7e467540 礼嘉缝纫批量汇报 2 months ago
王杰 d8186cb52f 礼嘉缝纫批量汇报 2 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