2135 Commits (375ace3baa0cb80b3ab2d273e5df20291562f031)

 

All Branches   

Search

Author	SHA1	Message	Date
王杰	375ace3baa	Merge remote-tracking branch 'origin/uat-temp-nht-2505160000-46987' into mes-test	2 months ago
王杰	5a8339521b	回头46981 电子化检验 NC判定 虚结构不可录入 需求总部不同意变更	2 months ago
王杰	a159411fb1	合并 46981 电子化检验 NC判定 虚结构不可录入 解决冲突	2 months ago
jason	7680553d4e	46987 MES&PCN-装箱防错功能，增加配置开关 “包装码中是否为客户零件号”，默认逻辑关闭，为是则包装条码中的零件号为客户零件号。	2 months ago
jason	1a2c6efd58	46987 MES&PCN-装箱防错功能，增加配置开关 “包装码中是否为客户零件号”，默认逻辑关闭，为是则包装条码中的零件号为客户零件号。	2 months ago
王杰	c31d5e44c6	合并 46881 PCN：龙兴发运看板优化 解决冲突	2 months ago
王杰	f41ae22e28	Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion' into mes-test	2 months ago
王杰	4c89c16a09	Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into mes-test	2 months ago
王杰	0c0cdd2465	第二天自动创建工单汇报 生产版本问题 逻辑调整	2 months ago
王杰	0cca6a1765	Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak	2 months ago
xiangwei.zhang	335dbb8e52	46970 返工拆解查询装配件条码，不能根据装配件条码而要根据id去查询并且修改	2 months ago
王杰	3dbbf23a99	Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak	2 months ago
xiangwei.zhang	e608665df9	46970 返工拆解查询装配件条码，不能根据装配件条码而要根据id去查询并且修改	2 months ago
jason	dbf8e91547	46987 MES&PCN-装箱防错功能，增加配置开关 “是否校验工厂代码”，默认逻辑开启，需要校验，字段为空也为校验	2 months ago
jason	beee1d6277	46881 PCN：发运看板开启多个导致CPU很高，优化查询SQL	2 months ago
王杰	bee1c8e17c	合并46970礼嘉测试环境批量返工报废不需要从责任人库位移到正常库位，保持不动 解决冲突	2 months ago
xiangwei.zhang	2a0cb8222a	46970 礼嘉测试环境批量返工报废不需要从责任人库位移到正常库位，保持不动	2 months ago
王杰	7576219ed8	合并宁德发运	2 months ago
王杰	b0f2c2cc61	Merge remote-tracking branch 'origin/uat-temp-nht-2504020000-3520' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2	2 months ago
王杰	a7e48f928c	Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-publish0415' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2	2 months ago
王杰	6daaf09684	Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2	2 months ago
王杰	f1f8f0b68b	Merge remote-tracking branch 'origin/uat-temp-nht-202505090001-46746' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415	2 months ago
王杰	2284e39a86	Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415	2 months ago
王杰	f13c1b960a	Merge remote-tracking branch 'origin/dev_temp_xw_202505120000_46850' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415	2 months ago
王杰	5b67c38b3a	Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415	2 months ago
jason	b20698f63c	Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499	2 months ago
jason	a181c3c0d9	修复宁德二次发运写入JIS_SHIPPING表逻辑	2 months ago
jason	c3657bd3c6	修复宁德二次发运写入JIS_SHIPPING表逻辑	2 months ago
jason	4fb98f07a6	修复替换装配件后的查询问题	2 months ago
jason	eeacec72bf	修复条码强过后，检验这个条码是不是扫过了	2 months ago
jason	edb53d3384	修复替换装配件后的查询问题	2 months ago
xiangwei.zhang	2d06f12771	46850 排序报工慢的问题	2 months ago
jason	5f88ad674a	46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能	2 months ago
jason	ebaebe449e	46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能	2 months ago
jason	e1f8bca3c6	修复宁德二次发运问题	2 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	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	73e5cc9034	宁德二次发运问题修复	3 months ago
王杰	122cb3fa32	46751 MES：设备实时值查询，条码字段没有展示。	3 months ago
王杰	930acdd2af	46751 MES：设备实时值查询，条码字段没有展示。	3 months ago
王杰	60bd600fde	46751 MES：设备实时值查询，条码字段没有展示。	3 months ago
jason	6aafc9c317	修改成都条码生成策略的CustPartNo取值逻辑	3 months ago
王杰	5f8b5d042e	临时提交	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