Commit Graph

521 Commits (5f09777adafdde98e996372cf03a74168a959eee)

Author SHA1 Message Date
logic.fang 3c80aa7d99 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang 9f0b69405c 47700 MES-PCN:站点容器绑定问题汇总:(优化) 1 month ago
logic.fang 37af94c1f2 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang 1a60f3cdca 47700 MES-PCN:站点容器绑定问题汇总: 1 month ago
logic.fang 0327f63828 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang 8c3a6b9f10 3533 主数据表设计与开发(容器条码与站点关系表-接口变更) 1 month ago
logic.fang 0408c2ef84 Revert "3533 主数据表设计与开发(容器条码与站点关系表-接口变更)"
This reverts commit eaf858b684.
1 month ago
logic.fang eaf858b684 3533 主数据表设计与开发(容器条码与站点关系表-接口变更) 1 month ago
logic.fang a5fc0bbeef Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev 1 month ago
logic.fang 7886c85e1c 3533 主数据表设计与开发(容器条码与站点关系表) 1 month ago
xiangwei.zhang 2b94d171b9 Merge branch 'dev_temp_xw_202506090000_47023' into mes-dev 1 month ago
xiangwei.zhang a84d2dbb0e 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 1 month ago
王杰 5d4aafd24b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-test-merge-daxiaoxie 2 months ago
logic.fang bd756babdb Merge branch 'refs/heads/mes-uat-temp-logic-20250529-47241' into mes-dev 2 months ago
logic.fang 7cc05f616f 47241 PCN:赛力斯jis队列接收和赛力斯JIS单接收,增加取消订单按钮,按钮需要权限管控 2 months ago
xiangwei.zhang 34658be192 Merge branch 'dev_temp_xw_202505230000_47023' into mes-dev 2 months ago
xiangwei.zhang a19b5b43b2 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 2 months ago
jason 1b6728d26f Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java
2 months ago
jason 958edd3435 46824 客退电子化检验,NC处理拆解需按照pisces功能按工序退回 2 months ago
王杰 352221cceb Merge branch 'mes-uat-temp-47040' into mes-test 2 months ago
王杰 e3d5501b05 合并46894 MES PCN: 吉翔下线条码,客户零件号优先取客户待开票物料 uat-temp-nht202505120000-46757 2 months ago
王杰 ed99eb4389 合并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
王杰 059f00eca3 Merge branch 'mes-uat-temp-47040' into mes-dev 2 months ago
王杰 888275dd6b 选择产成零件按钮 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
王杰 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
王杰 300e73dbe2 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-dev 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
王杰 7576219ed8 合并宁德发运 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
王杰 373dd1e038 大小写问题 2 months ago
jason 6b67fa78df 46757 代开票业务支持条码打印 2 months ago
王杰 7742daad31 46428 PCN:龙兴条码打印直接从数据库里取,不走redis 2 months ago
王杰 ce0e486efb Merge branch 'uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 d8186cb52f 礼嘉缝纫批量汇报 3 months ago
王杰 60bd600fde 46751 MES:设备实时值查询,条码字段没有展示。 3 months ago
王杰 5f8b5d042e 临时提交 3 months ago
jason 36918bbbfc 46708 PCN-龙兴发运看板增加折线图,和现有看板页面定时翻页显示 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
王杰 41724faa8b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
王杰 86196f23c0 合并代码 3 months ago
jason 5b4231bdc8 46499 MES-PCN: 宁德二次发运逻辑更新 3 months ago
王杰 1b09e9a175 46615 MES-PCN:保存工艺参数JOB报错 3 months ago
王杰 42f59c1d9f 46215 PCN:发运防错增加显示后续待发运单号信息 3 months ago