Commit Graph

2113 Commits (9aca4dcf0c8f89c83e911bf9ae14e4b349130376)
 

Author SHA1 Message Date
jason 9aca4dcf0c Merge remote-tracking branch 'origin/yfai-20250418-dev' into yfai-20250418-dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesSortShippingCheckService.java
3 months ago
jason 766393f95a 合并宁德二次发运功能 3 months ago
jason bdd20b3977 合并宁德二次发运功能 3 months ago
jason 6220d82369 Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev 3 months ago
jason 03c150420c Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into uat-temp-nht-2504300000-46708
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java
3 months ago
jason 36918bbbfc 46708 PCN-龙兴发运看板增加折线图,和现有看板页面定时翻页显示 3 months ago
jason 9a74a0ffab Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev 3 months ago
jason 67c3d79905 Merge branch 'uat-temp-nht-2505060001-46742' into yfai-20250418-dev 3 months ago
jason 664259ed22 46742 成都零件条码打印客户零件号取值逻辑修改,先取mes_cust_invoiced_part表中的客户零件号。 3 months ago
jason 700c8e6aeb Merge branch 'uat-temp-nht-2505060000-shippingScanSn' into yfai-20250418-dev 3 months ago
jason 3aa785ba64 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-nht-2505060000-shippingScanSn
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java
3 months ago
jason b1fc30cf85 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 3 months ago
jason 37b2935bb8 Merge branch 'uat-temp-nht-2505060000-shippingScanSn' into yfai-20250418-dev 3 months ago
jason fc4dfeef2f 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 3 months ago
jason 762ed54cf7 46708 PCN-龙兴发运看板增加折线图,和现有看板页面定时翻页显示 3 months ago
王杰 f70c936199 解决冲突 3 months ago
jason f60d22c2f2 修复龙兴发运看板生产JPH查询问题 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 9846138e4a Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 3 months ago
jason 0803089369 Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 3 months ago
jason 6d03f36882 Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 3 months ago
jason 5b4231bdc8 46499 MES-PCN: 宁德二次发运逻辑更新 3 months ago
jason 38e2f72945 46499 MES-PCN: 宁德二次发运逻辑更新 3 months ago
王杰 3c382281b6 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into yfai-20250418-dev 3 months ago
王杰 056b423c31 46664 裁切工单无法打印 3 months ago
王杰 466f7f83eb Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save' into yfai-20250418-dev 3 months ago
王杰 c0966141a2 46648 热板焊接3扫描速度慢 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
王杰 e03ad02ae3 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug' into yfai-20250418-dev 3 months ago
王杰 4ceb411a94 46613 发运扫描条码重复提交问题修复 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
王杰 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
王杰 a049b715c2 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into yfai-20250418-dev 3 months ago
王杰 fd74d045fb Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into yfai-20250418-dev 3 months ago
王杰 fb6f1f02a9 Merge remote-tracking branch 'origin/uat-temp-nht-2504140000-46317' into yfai-20250418-dev 3 months ago
王杰 9a1adf3285 工步方法优化 3 months ago
王杰 7abfa524fd 礼嘉发运单 打印 3 months ago
王杰 bb33823140 礼嘉发运单 打印 3 months ago
王杰 bc9ddc502b 46215 PCN:发运防错增加显示后续待发运单号信息 3 months ago