2132 Commits (dev)

 

All Branches   

Search

Author	SHA1	Message	Date
xiangwei.zhang	11285c597c	Merge branch 'dev_temp_xw_202503310000_45843' into dev	4 months ago
xiangwei.zhang	40ad390f91	45843 ... 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在	4 months ago
xiangwei.zhang	444e98dc7e	Merge branch 'dev_temp_xw_202503310000_45843' into dev	4 months ago
xiangwei.zhang	f70b94e327	45843 ... 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在	4 months ago
xiangwei.zhang	1887c4e4d2	Merge branch 'dev_temp_xw_202503310000_45843' into dev	4 months ago
xiangwei.zhang	282e8a6b99	45843 ... 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在	4 months ago
xiangwei.zhang	d416319260	解决合并冲突	4 months ago
xiangwei.zhang	5e486a0b5b	Merge branch 'dev_temp_xw_202503310000_45843' into dev ... # Conflicts: # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java # pom.xml	4 months ago
xiangwei.zhang	5673649ce4	45843 ... 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在	4 months ago
xiangwei.zhang	4584525a70	Merge branch 'dev_temp_xw_202503280000_45843' into dev	4 months ago
xiangwei.zhang	b599fa1d87	45843 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工	4 months ago
jason	c4154e0696	修复成都排序工单打印问题	4 months ago
logic.fang	4248e91bb2	Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev	4 months ago
logic.fang	22e987369d	赛力斯报表部分迁移至工位端-添加查询条件	4 months ago
王杰	6fb94e98e0	Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev	4 months ago
jason	29f053bfb3	Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev	4 months ago
logic.fang	367cfa8964	赛力斯报表部分迁移至工位端-优化	4 months ago
jason	e88ea56493	修复成都排序工单打印问题	4 months ago
jason	6a101a1183	Merge remote-tracking branch 'origin/uat-temp-nht-2503280000-cdpartsprint' into uat-temp-nht-2503280000-cdpartsprint ... # Conflicts: # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/ChengDuVolvoPartPrintStrategy.java	4 months ago
jason	079a8aad8e	修复成都排序工单打印问题	4 months ago
王杰	ee4b2496ce	Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev	4 months ago
logic.fang	77ef72b2f4	赛力斯报表部分迁移至工位端	4 months ago
jason	77a4eee9d4	Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev	4 months ago
jason	c91f8efba6	修复成都排序工单打印问题	4 months ago
王杰	5e6bd2e36e	排序工单验证工步 bug	4 months ago
王杰	b07c046e4e	排序目视单打印	4 months ago
王杰	27e636b1e5	小鹏新编码规则	4 months ago
xiangwei.zhang	efc977e0b9	Merge remote-tracking branch 'origin/dev' into dev	4 months ago
logic.fang	126a694f00	Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev	4 months ago
logic.fang	bd105b0c8b	Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev	4 months ago
jason	6e5173aaab	Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev	4 months ago
jason	a3c5d923d9	修复成都Volvo发运单打印PCN端问题	4 months ago
王杰	b5c9523665	外库问题	4 months ago
logic.fang	d677eef35b	45822 库位与责任关系增加责任关系（拆分优化）	4 months ago
logic.fang	9647eac5cc	Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev	4 months ago
logic.fang	4d6b8b5be6	Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev	4 months ago
logic.fang	6e877925b6	45822 库位与责任关系增加责任关系	4 months ago
logic.fang	51e4f3663d	45820 电子化检验-NC处理界面（检验人查询优化）	4 months ago
王杰	362dafa25e	扫描可回用包装条码工步	4 months ago
logic.fang	bf1030accf	Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev	4 months ago
logic.fang	8f1aa79ea0	Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev	4 months ago
王杰	23bbd63a4b	Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev	4 months ago
王杰	463bdf1a40	工位队列接收工步	4 months ago
jason	7c9a93154d	Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev	4 months ago
jason	5d1633b833	成都Volvo标签打印修改	4 months ago
jason	766fe359bd	45859:龙兴发运看板无法根据发运组保存数据问题修复	4 months ago
jason	d19d75cb54	Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev	4 months ago
jason	d9cf70a6f3	Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev	4 months ago
logic.fang	9575ece40c	45820 电子化检验-NC处理界面	4 months ago
jason	8240890921	成都标签打印	4 months ago