Commit Graph

495 Commits (yfai-20250418-dev)

Author SHA1 Message Date
jason d44dfd6771 Merge branch 'uat-temp-nht202505120000-46757' into yfai-20250418-dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/ChengDuSimpleYearNumberRuleStrategyService.java
2 months ago
王杰 a572836ee9 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into yfai-20250418-dev 3 months ago
王杰 373dd1e038 大小写问题 3 months ago
jason 6b67fa78df 46757 代开票业务支持条码打印 3 months ago
王杰 6627fb368d Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428' into yfai-20250418-dev 3 months ago
王杰 7742daad31 46428 PCN:龙兴条码打印直接从数据库里取,不走redis 3 months ago
王杰 ca4b45c9f7 解决冲突 3 months ago
王杰 a7bb6ae289 解决冲突 3 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
jason 766393f95a 合并宁德二次发运功能 3 months ago
王杰 5f8b5d042e 临时提交 3 months ago
jason 9a74a0ffab Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev 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 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
王杰 86196f23c0 合并代码 3 months ago
jason 5b4231bdc8 46499 MES-PCN: 宁德二次发运逻辑更新 3 months ago
王杰 84990b0f30 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615' into yfai-20250418-dev 3 months ago
王杰 1b09e9a175 46615 MES-PCN:保存工艺参数JOB报错 3 months ago
王杰 42f59c1d9f 46215 PCN:发运防错增加显示后续待发运单号信息 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 824517b558 合并成都Volvo发运单及装车单打印功能 3 months ago
王杰 ea0d8b0188 46281 PCN-按工位统计产量信息 4 months ago
王杰 bb93d155e3 控制加工单数量 新表 4 months ago
王杰 14e5f7ef2f l临时提交 4 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 4 months ago
logic.fang 7855af58a4 46141 PCN:赛力斯JIS单接收日志和赛力斯JIS队列接收日志增加零件类查询条件模糊查询 4 months ago
王杰 6fcb521343 Merge remote-tracking branch 'origin/uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
王杰 1763659468 Merge remote-tracking branch 'origin/dev_temp_xw_202503310000_45843' into uat-temp-wj-chongqingdaqu-prod-temp-merge 4 months ago
jason b3e340d251 装车单支持多发运组 4 months ago
王杰 fc93cba1f8 发运rfid工位逻辑变更 增加人工模式 4 months ago
王杰 a553f8f955 Merge branch 'uat-temp-wj-chongqingdaqu-dev-bak' into uat-temp-wj-chongqingdaqu-prod-temp-rfid 4 months ago
王杰 4e31c06716 装配件前道防错 4 months ago
王杰 6dfcc536ef 平行工位的问题处理 4 months ago
王杰 b920d30445 重庆 显示前道所有装配件 配置 考虑平行与后端的数据过滤 4 months ago
xiangwei.zhang 5673649ce4 45843
1 无工单补报工JOB针对多生产版本场景,默认使用SAP 主数据0001进行补报工
2 无工单报工,根据产线物料号为一个事务去校验生产版本是否存在
4 months ago
logic.fang 22e987369d 赛力斯报表部分迁移至工位端-添加查询条件 4 months ago
logic.fang 77ef72b2f4 赛力斯报表部分迁移至工位端 4 months ago
王杰 d61f098384 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 d0ca6a26eb Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
logic.fang 9647eac5cc Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 4d6b8b5be6 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 6e877925b6 45822 库位与责任关系增加责任关系 4 months ago
logic.fang 51e4f3663d 45820 电子化检验-NC处理界面(检验人查询优化) 4 months ago
logic.fang bf1030accf Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev 4 months ago