Commit Graph

2262 Commits (5f09777adafdde98e996372cf03a74168a959eee)
 

Author SHA1 Message Date
王杰 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
王杰 059f00eca3 Merge branch 'mes-uat-temp-47040' into mes-dev 2 months ago
王杰 209911bbdb Merge remote-tracking branch 'origin/uat-temp-nht-2505160000-46987' into mes-dev 2 months ago
王杰 888275dd6b 选择产成零件按钮 2 months ago
王杰 438e4d88df Merge branch 'mes-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-dev 2 months ago
王杰 b665ffbe66 回头46981 电子化检验 NC判定 虚结构不可录入 需求总部不同意变更 2 months ago
王杰 5a8339521b 回头46981 电子化检验 NC判定 虚结构不可录入 需求总部不同意变更 2 months ago
jason 6aa9febaad Merge branch 'uat-temp-nht-2505200000-47042' into mes-dev 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
王杰 a91d27ad85 合并 46981 电子化检验 NC判定 虚结构不可录入 解决冲突 2 months ago
jason 1a2c6efd58 46987 MES&PCN-装箱防错功能,增加配置开关 “包装码中是否为客户零件号”,默认逻辑关闭,为是则包装条码中的零件号为客户零件号。 2 months ago
王杰 c31d5e44c6 合并 46881 PCN:龙兴发运看板优化 解决冲突 2 months ago
王杰 566a91562e 合并 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
王杰 0f576159dc Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into mes-dev 2 months ago
王杰 20c13d6f82 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion' into mes-dev 2 months ago
王杰 300e73dbe2 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-dev 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
xiangwei.zhang 82556d70a1 46824 [PCN] 1. 增加校验电子化检验次数功能需求; 2. 客退电子化检验,NC处理拆解需按照pisces功能按工序退回 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 b20698f63c Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 2 months ago
jason a181c3c0d9 修复宁德二次发运写入JIS_SHIPPING表逻辑 2 months ago
jason c3657bd3c6 修复宁德二次发运写入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