1451 Commits (f389b546d6693a56fe062cdd7b460dd5f053a452)

Author	SHA1	Message	Date
xiangwei.zhang	6f5ecda4aa	Merge branch 'dev_temp_xw_202502120000_45071' into dev	9 months ago
xiangwei.zhang	d912b19680	45071 新增字段 顺序号（没填写则默认0），计划开始时间、计划结束时间	9 months ago
castle.zang	277ebd94e7	同步拉动单数据到wms中间表	9 months ago
Janson	daf654b481	45019 修改不可用规则维护功能	9 months ago
Janson	6b82f97b73	45019 新增不可用规则维护功能	9 months ago
castle.zang	b63431ef8f	深汕kitting拉动完成	9 months ago
王杰	e8a6eb4eb2	merge uat-temp-pzj-250123-Assembly-Report 解决冲突	9 months ago
王杰	8ddb559e36	Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test	9 months ago
王杰	a99182a0a3	Merge branch 'uat-temp-wj-250206-45014' into dev	9 months ago
王杰	7c1e398550	Merge branch 'uat-temp-wj-250206-45014' into test	9 months ago
王杰	aac1c5c970	45014 通用导出报表针对PTR替换的零件没有显示出来	9 months ago
xiangwei.zhang	ae99dcbf12	Merge branch 'dev-temp-xw-202501150000-44838' into dev	9 months ago
xiangwei.zhang	13e8e84e10	44838 MES:裁片补片逻辑更新＆裁片报表	9 months ago
王杰	c147289e65	Merge remote-tracking branch 'origin/uat-temp-pzj-250123-Assembly-Report' into test	9 months ago
王杰	0b61c7a143	Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test	9 months ago
王杰	3530a65d0c	Merge remote-tracking branch 'origin/dev-temp-xw-202502100000-44915' into test	9 months ago
xiangwei.zhang	17e7e2dd45	44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件	9 months ago
王杰	b98710fa96	Merge remote-tracking branch 'origin/dev_temp-xw-202502100000-44985' into test	9 months ago
xiangwei.zhang	7ca161a717	44985 离线排序加工规则job执行后没有生成对应数据	9 months ago
王杰	e736d7b591	Merge remote-tracking branch 'origin/uat-temp--logic-20250208-44991' into test	9 months ago
xiangwei.zhang	da09e0afaf	44863 PCN-零件生产组增加“使用BOM方式”枚举最终确认版逻辑优化	9 months ago
logic.fang	7f517a0a51	Merge remote-tracking branch 'refs/remotes/origin/uat-temp--logic-20250208-44991' into dev	9 months ago
logic.fang	cf1c76b57e	44991 产线看板问题（10点正以后才能看到8-9点的报工数据）	9 months ago
castle.zang	d7377fa4c6	深汕kitting拉动,按数量完成	9 months ago
castle.zang	9543a7a674	深汕kitting拉动,按套完成	9 months ago
xiangwei.zhang	3e735d98cb	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
xiangwei.zhang	4debdd0b55	Merge branch 'dev_temp_xw_202502070000_44985' into dev	9 months ago
xiangwei.zhang	fde75716bc	44985 离线排序加工规则job执行后没有生成对应数据	9 months ago
pzj	628592c67a	44939 装配件报表查询优化	9 months ago
Janson	00a33f9bde	Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev	9 months ago
Janson	3ff9564b61	44953 新增条码打印模板的字段支持自定义配置	9 months ago
castle.zang	29b78d3385	Merge branch 'uat-temp-castle-2502070911-44952' into dev	9 months ago
castle.zang	deff0ac43b	fix bug 44952 MES-零件生产组明细、零件发运组明细、客户车型配置明细输入客户零件号后将零件号带出来	9 months ago
pzj	85ef2dd7cf	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
王杰	d751010c52	Merge branch 'uat-temp-wj-250124-equ-check-step' into dev	9 months ago
王杰	123ac16c08	红外焊超差预警	9 months ago
xiangwei.zhang	ed7863b633	Merge branch 'dev-temp-xw-202501150000-44838' into dev	9 months ago
xiangwei.zhang	756bfeeea6	44838 MES:裁片补片逻辑更新＆裁片报表	9 months ago
pzj	400ae3500c	Merge branch 'dev' into uat-temp-pzj-250123-Assembly-Report	9 months ago
pzj	d4e58b6449	装配件报表	9 months ago
xiangwei.zhang	c600dbedf7	44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件	9 months ago
xiangwei.zhang	a0e07ca940	44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件	9 months ago
王杰	599ae54988	Merge branch 'test-temp-wj-250117-pack' into dev	9 months ago
王杰	58f87b6e85	打包	9 months ago
王杰	4cf0a5a7b9	Merge branch 'test-temp-wj-250117-pack' into dev	9 months ago
xiangwei.zhang	9bd8ecee92	Merge branch 'uat-temp-xw-202501200000-44905' into dev	9 months ago
xiangwei.zhang	fba028267d	44905 MES-发运异常处理	9 months ago
xiangwei.zhang	58ea818942	Merge branch 'uat-temp-xw-202501200000-44905' into dev	9 months ago
xiangwei.zhang	5fcef2d14f	44905 MES-发运异常处理	9 months ago
xiangwei.zhang	c3abf292e1	Merge branch 'uat-temp-xw-202501200000-44905' into dev	9 months ago
xiangwei.zhang	a4d6e8009a	44905 MES-发运异常处理	9 months ago
xiangwei.zhang	890bd1472b	Merge branch 'uat-temp-xw-202501200000-44905' into dev	9 months ago
xiangwei.zhang	939c515fc2	44905 MES-发运异常处理	9 months ago
xiangwei.zhang	10456e74a9	Merge branch 'uat-temp-xw-202501200000-44905' into dev	9 months ago
xiangwei.zhang	463ec92cbf	44905 MES-发运异常处理	9 months ago
xiangwei.zhang	6b5432d5b9	Merge branch 'uat-temp-xw-202501200000-44905' into dev	9 months ago
xiangwei.zhang	be1749fb92	44905 MES-发运异常处理	9 months ago
王杰	6ef72a6bee	打包	9 months ago
xiangwei.zhang	3c7d252537	Merge branch 'dev-temp-xw-202501150000-44838' into dev	9 months ago
xiangwei.zhang	b633fbaeb9	44838 MES:裁片补片逻辑更新＆裁片报表	9 months ago
王杰	d152a464ca	打包	9 months ago
xiangwei.zhang	08301bc9a2	44905 MES-发运异常处理	9 months ago
xiangwei.zhang	e834732d74	44838 MES:裁片补片逻辑更新＆裁片报表	9 months ago
王杰	ec7f396e33	重庆打包	10 months ago
xiangwei.zhang	45c7fe23da	Merge branch 'dev-temp-ljs-202501091824-44656' into dev	10 months ago
王杰	bf114910e2	Merge branch 'uat-temp-wj-2501090000-44517' into test	10 months ago
王杰	585a8edc62	Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into test	10 months ago
王杰	1c33dce687	Merge remote-tracking branch 'origin/dev-temp-xw-202501130000-44813' into test	10 months ago
xiangwei.zhang	a1b3d04f30	Merge branch 'dev-temp-xw-202501150000-44838' into dev	10 months ago
xiangwei.zhang	f6b3a36560	44838 MES:裁片补片逻辑更新＆裁片报表	10 months ago
xiangwei.zhang	973ff08b91	Merge branch 'dev-temp-xw-202501150000-44838' into dev	10 months ago
xiangwei.zhang	338dd627ca	44838 MES:裁片补片逻辑更新＆裁片报表	10 months ago
xiangwei.zhang	1815794e04	Merge branch 'dev-temp-xw-202501150000-44838' into dev	10 months ago
xiangwei.zhang	6e756d0065	44813 PC: 缺陷类型与零件类型关系导入后，没有关联显示出来缺陷类型名称和零件类型名称	10 months ago
xiangwei.zhang	10131f750e	44838 MES:裁片补片逻辑更新＆裁片报表	10 months ago
王杰	87f42674da	Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into test	10 months ago
王杰	132f7d53d7	Merge branch 'uat-temp-wj-2501090000-44746' into test	10 months ago
王杰	f3dd964e48	Merge remote-tracking branch 'origin/dev-temp-xw-202501071939-44728' into test	10 months ago
王杰	d7e9810924	Merge remote-tracking branch 'origin/dev-temp-xw-202501151600-44670' into test	10 months ago
王杰	8e29e74429	merge dev-temp-ljs-202501091824-44656 解决冲突	10 months ago
xiangwei.zhang	d8fcc8abfd	44670 PC: 模板导入时报错问题	10 months ago
xiangwei.zhang	471967fd7e	44756 版本回退	10 months ago
王杰	3c152132ca	Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into test	10 months ago
王杰	663f430d23	Merge branch 'dev-temp-xw-202412301219-44255' into test	10 months ago
王杰	5faa656bd2	Merge branch 'dev-temp-xw-202412301219-44255' into test	10 months ago
王杰	4f5f24f84a	Merge branch 'uat-temp-wj-2412300000-44653' into test	10 months ago
王杰	f1294f551c	Merge branch 'uat-temp-wj-2412300000-44615' into test	10 months ago
jun	e42cdd4f76	44656 报工调整报表中原因为空 测试问题修复	10 months ago
xiangwei.zhang	06cb051548	Merge branch 'dev-temp-xw-202412301219-44255' into dev	10 months ago
xiangwei.zhang	620ae11ebd	44255-优化：非排序工艺路线支持所有路线主表明细批量导入	10 months ago
xiangwei.zhang	732d8acea6	Merge branch 'dev-temp-xw-202501090000-44270' into dev	10 months ago
xiangwei.zhang	6d160bfc2e	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
xiangwei.zhang	a16cf1e759	Merge branch 'dev-temp-xw-202501130000-44813' into dev	10 months ago
xiangwei.zhang	6ff07cd721	44813 PC: 缺陷类型与零件类型关系导入后，没有关联显示出来缺陷类型名称和零件类型名称	10 months ago
xiangwei.zhang	ce6e53fd72	44270 PC：非排序产品加工规则的批量导入	10 months ago
jun	f08ab29045	44656 报工调整报表中原因为空 提示信息错误	10 months ago
王杰	d283381dd5	Merge branch 'uat-temp-wj-2501090000-44517' into dev	10 months ago
王杰	d4725e67c2	44517 装箱防错后吐条码需求（芜湖）	10 months ago
王杰	d953cb8202	Merge branch 'uat-temp-wj-2501090000-44746' into dev	10 months ago
王杰	29026a1051	44746 产量统计报表增加报工调整数据查询	10 months ago