Commit Graph

2200 Commits (yfai-20250418-dev)
 

Author SHA1 Message Date
王杰 8d4ac268c6 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 1d18681b40 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
jason 24395a9b58 Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev 3 months ago
jason e1f8bca3c6 修复宁德二次发运问题 3 months ago
王杰 851df7994c Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 3 months ago
王杰 4997a5819d Merge remote-tracking branch 'origin/uat-temp-nht-2504240000-data-matrix' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 3 months ago
logic.fang 08e9c103cd 46601 电子化检验返工拆解时候需要全部进行拆解 3 months ago
王杰 ce7e467540 礼嘉缝纫批量汇报 3 months ago
王杰 d8186cb52f 礼嘉缝纫批量汇报 3 months ago
jason b83ea0c0e2 Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev 3 months ago
jason 86619bd6b5 Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into uat-temp-nht-2504300000-46708 3 months ago
jason ace1efd6d9 46708 PCN-龙兴发运看板增加折线图,和现有看板页面定时翻页显示 3 months ago
jason 5d7b0c91cc Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev 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 6b47ba660f Merge branch 'uat-temp-nht-2505060001-46742' into yfai-20250418-dev 3 months ago
jason 6aafc9c317 修改成都条码生成策略的CustPartNo取值逻辑 3 months ago
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
王杰 5f8b5d042e 临时提交 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
王杰 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
jason 67c3d79905 Merge branch 'uat-temp-nht-2505060001-46742' into yfai-20250418-dev 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
王杰 b5bf8a3d3f Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug' 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 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