2157 Commits (6a83990a7038213676db3d0339af5f30d1223467)

 

All Branches   

Search

Author	SHA1	Message	Date
jason	6a83990a70	Merge branch 'uat-temp-nht-202505090001-46746' into yfai-20250418-dev	2 months ago
jason	4fb98f07a6	修复替换装配件后的查询问题	2 months ago
王杰	cbb9eace0e	Merge branch 'yfai-20250418-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into yfai-20250418-dev	2 months ago
王杰	6627fb368d	Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428' into yfai-20250418-dev	2 months ago
王杰	7742daad31	46428 PCN：龙兴条码打印直接从数据库里取，不走redis	2 months ago
jason	a1a73ef2b4	Merge branch 'uat-temp-nht-202505090001-46746' into yfai-20250418-dev	2 months ago
jason	a26d6fb90a	Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev	2 months ago
jason	eeacec72bf	修复条码强过后，检验这个条码是不是扫过了	2 months ago
jason	edb53d3384	修复替换装配件后的查询问题	2 months ago
jason	b880272e7d	Merge branch 'uat-temp-nht-202505090001-46746' into yfai-20250418-dev	3 months ago
jason	5f88ad674a	46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能	3 months ago
jason	ebaebe449e	46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能	3 months ago
王杰	ca4b45c9f7	解决冲突	3 months ago
王杰	cfab2095ad	Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-logic-20250508-46601' into yfai-20250418-dev	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
王杰	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