2224 Commits (2b94d171b9c39084521489b1b55633bfc8a24155)

 

All Branches   

Search

Author	SHA1	Message	Date
xiangwei.zhang	2b94d171b9	Merge branch 'dev_temp_xw_202506090000_47023' into mes-dev	2 months ago
xiangwei.zhang	a84d2dbb0e	47023 PCN: NC报废流程相关优化设计文档[DM202505140012]	2 months ago
jason	411e5f4b93	Merge remote-tracking branch 'origin/uat-temp-nht-2506050000-47389' into mes-dev	2 months ago
jason	60b5ea30d8	47389 成都零件标签打印模板修改	2 months ago
jason	7bf163abde	Merge remote-tracking branch 'origin/uat-temp-nht-2506050000-47389' into mes-dev	2 months ago
jason	3f4e77dec4	47389 成都零件标签打印模板修改	2 months ago
jason	4589dd6fcf	Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev	2 months ago
jason	b1f6ded5e6	修复电子化检验演示问题	2 months ago
jason	94fedf1bbf	Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev	2 months ago
jason	640d87bc3b	47318 电子化检验其他工位不良需报错提示，质检单赋值选择的产线	2 months ago
王杰	c4729819a8	Merge branch 'mes-test' into mes-dev	2 months ago
王杰	20c3601ae9	Merge branch 'mes-uat' into mes-test	2 months ago
王杰	aace498cfb	生产线开班逻辑调整	2 months ago
王杰	122214e896	Merge remote-tracking branch 'origin/dev_temp_xw_202505230000_47023' into mes-test	2 months ago
王杰	eb900174e5	Merge remote-tracking branch 'origin/uat-temp-nht-2505260000-47177' into mes-test	2 months ago
王杰	ab6dd22282	Merge remote-tracking branch 'origin/uat-temp-nht-2505210000-chengdu-custpart' into mes-test	2 months ago
王杰	e462e1e5b3	t : Merge branch 'mes-test' into mes-dev	2 months ago
xiangwei.zhang	ef6b9ee270	第二天报工取错生产版本问题修复	2 months ago
xiangwei.zhang	e3ed2f3ce3	Merge remote-tracking branch 'origin/mes-uat' into mes-uat	2 months ago
xiangwei.zhang	92fa3eb930	第二天报工取错生产版本问题修复	2 months ago
王杰	8fe860f2a3	Merge branch 'mes-test' into mes-dev	2 months ago
王杰	0feb2ac82a	Merge branch 'mes-uat' into mes-test	2 months ago
xiangwei.zhang	575038e5c0	第二天报工取错生产版本问题修复	2 months ago
王杰	618209785e	Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-test	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	0c01f5fef9	Merge remote-tracking branch 'origin/mes-dev' into mes-dev	2 months ago
xiangwei.zhang	8c567de79a	Merge branch 'dev_temp_xw_202505230000_47023' into mes-dev	2 months ago
xiangwei.zhang	c2d9e2207e	47023 PCN: NC报废流程相关优化设计文档[DM202505140012]	2 months ago
logic.fang	9ae050a020	Merge remote-tracking branch 'refs/remotes/origin/mes-uat-temp-logic-20250526-47187' into mes-dev	2 months ago
logic.fang	6fa7d7dc2c	47187 PCN-电子化返工拆解功能问题（优化）	2 months ago
logic.fang	df532b43d2	Merge remote-tracking branch 'refs/remotes/origin/mes-uat-temp-logic-20250526-47187' into mes-dev	2 months ago
logic.fang	4a66446687	47187 PCN-电子化返工拆解功能问题	2 months ago
xiangwei.zhang	34658be192	Merge branch 'dev_temp_xw_202505230000_47023' into mes-dev	2 months ago
jason	32c647ec66	Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev	2 months ago
jason	5c1c222e2a	修改工位类型的枚举，避免名称重复	2 months ago
xiangwei.zhang	41d63d1beb	47023 PCN: NC报废流程相关优化设计文档[DM202505140012]	2 months ago
jason	ca64d811ed	Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev	2 months ago
jason	6390c6b7b5	修改工位类型的枚举，避免名称重复	2 months ago
xiangwei.zhang	a19b5b43b2	47023 PCN: NC报废流程相关优化设计文档[DM202505140012]	2 months ago
jason	92d28e9baa	Merge remote-tracking branch 'origin/uat-temp-nht-2505260000-47177' into mes-dev	2 months ago
jason	7e7ef291a8	47177 PCN-装箱放错，扫描已经封箱的箱条码，目前只能显示十行已扫描的明细，没有按照实际扫描数量显示	2 months ago
jason	a4d30a11d9	Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev	2 months ago
jason	b268c7804e	47122 PCN-成都发运单打印加载发运单明细，增加按位置号排序	2 months ago
jason	0766d4e2c6	Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev	2 months ago
jason	d731205471	47122 PCN-成都发运单打印加载发运单明细	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	57fa03f81f	46824 客退电子化检验，NC处理拆解需按照pisces功能按工序退回	2 months ago
jason	958edd3435	46824 客退电子化检验，NC处理拆解需按照pisces功能按工序退回	2 months ago
jason	bbdd17796b	Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev	2 months ago