1465 Commits (7470ab94bfd5ac111f791ca51b637749d05d2720)

Author	SHA1	Message	Date
王杰	7470ab94bf	Merge remote-tracking branch 'origin/uat-temp-nht-2502100000-45019' into dev	4 months ago
臧学普	b9c32f9a9e	Merge branch 'uat-temp-castle-2502071033-kitting' into dev ... # Conflicts: # modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties	4 months ago
xiangwei.zhang	3dbd65ab92	Merge branch 'dev-temp-xw-202502170000-45112' into dev ... # Conflicts: # modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java	4 months ago
xiangwei.zhang	bb49d87d5a	45112 MES：发运明细报表需要按照客户要求到货时间筛选发运明细	4 months ago
王杰	8026daaee8	Merge branch 'uat-temp-castle-2412251631-44430' into test	5 months ago
王杰	8600e15fe6	Merge remote-tracking branch 'origin/uat-temp-castle-2502070911-44952' into test	5 months ago
王杰	ae830a3c9c	45106 MES-产品检验总报表问题	5 months ago
xiangwei.zhang	39cfb67414	Merge remote-tracking branch 'origin/dev' into dev	5 months ago
xiangwei.zhang	6f5ecda4aa	Merge branch 'dev_temp_xw_202502120000_45071' into dev	5 months ago
xiangwei.zhang	d912b19680	45071 新增字段 顺序号（没填写则默认0），计划开始时间、计划结束时间	5 months ago
臧学普	277ebd94e7	同步拉动单数据到wms中间表	5 months ago
Janson	daf654b481	45019 修改不可用规则维护功能	5 months ago
Janson	6b82f97b73	45019 新增不可用规则维护功能	5 months ago
臧学普	b63431ef8f	深汕kitting拉动完成	5 months ago
王杰	e8a6eb4eb2	merge uat-temp-pzj-250123-Assembly-Report 解决冲突	5 months ago
王杰	8ddb559e36	Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test	5 months ago
王杰	a99182a0a3	Merge branch 'uat-temp-wj-250206-45014' into dev	5 months ago
王杰	7c1e398550	Merge branch 'uat-temp-wj-250206-45014' into test	5 months ago
王杰	aac1c5c970	45014 通用导出报表针对PTR替换的零件没有显示出来	5 months ago
xiangwei.zhang	ae99dcbf12	Merge branch 'dev-temp-xw-202501150000-44838' into dev	5 months ago
xiangwei.zhang	13e8e84e10	44838 MES:裁片补片逻辑更新＆裁片报表	5 months ago
王杰	c147289e65	Merge remote-tracking branch 'origin/uat-temp-pzj-250123-Assembly-Report' into test	5 months ago
王杰	0b61c7a143	Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test	5 months ago
王杰	f47eb3accd	Merge remote-tracking branch 'origin/uat-temp-wj-250122-44907' into test	5 months ago
王杰	3530a65d0c	Merge remote-tracking branch 'origin/dev-temp-xw-202502100000-44915' into test	5 months ago
xiangwei.zhang	17e7e2dd45	44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件	5 months ago
王杰	b98710fa96	Merge remote-tracking branch 'origin/dev_temp-xw-202502100000-44985' into test	5 months ago
xiangwei.zhang	7ca161a717	44985 离线排序加工规则job执行后没有生成对应数据	5 months ago
王杰	e736d7b591	Merge remote-tracking branch 'origin/uat-temp--logic-20250208-44991' into test	5 months ago
xiangwei.zhang	da09e0afaf	44863 PCN-零件生产组增加“使用BOM方式”枚举最终确认版逻辑优化	5 months ago
logic.fang	7f517a0a51	Merge remote-tracking branch 'refs/remotes/origin/uat-temp--logic-20250208-44991' into dev	5 months ago
logic.fang	cf1c76b57e	44991 产线看板问题（10点正以后才能看到8-9点的报工数据）	5 months ago
臧学普	d7377fa4c6	深汕kitting拉动,按数量完成	5 months ago
臧学普	9543a7a674	深汕kitting拉动,按套完成	5 months ago
xiangwei.zhang	3e735d98cb	Merge remote-tracking branch 'origin/dev' into dev	5 months ago
xiangwei.zhang	4debdd0b55	Merge branch 'dev_temp_xw_202502070000_44985' into dev	5 months ago
xiangwei.zhang	fde75716bc	44985 离线排序加工规则job执行后没有生成对应数据	5 months ago
pzj	628592c67a	44939 装配件报表查询优化	5 months ago
Janson	00a33f9bde	Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev	5 months ago
Janson	3ff9564b61	44953 新增条码打印模板的字段支持自定义配置	5 months ago
臧学普	29b78d3385	Merge branch 'uat-temp-castle-2502070911-44952' into dev	5 months ago
臧学普	deff0ac43b	fix bug 44952 MES-零件生产组明细、零件发运组明细、客户车型配置明细输入客户零件号后将零件号带出来	5 months ago
pzj	85ef2dd7cf	Merge remote-tracking branch 'origin/dev' into dev	5 months ago
王杰	d751010c52	Merge branch 'uat-temp-wj-250124-equ-check-step' into dev	5 months ago
王杰	123ac16c08	红外焊超差预警	5 months ago
xiangwei.zhang	ed7863b633	Merge branch 'dev-temp-xw-202501150000-44838' into dev	5 months ago
xiangwei.zhang	756bfeeea6	44838 MES:裁片补片逻辑更新＆裁片报表	5 months ago
pzj	400ae3500c	Merge branch 'dev' into uat-temp-pzj-250123-Assembly-Report	5 months ago
pzj	d4e58b6449	装配件报表	5 months ago
xiangwei.zhang	c600dbedf7	44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件	5 months ago