1157 Commits (8d832557c409f4ef03725571105b18b918ebe18a)

Author	SHA1	Message	Date
gsz	8d832557c4	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	9 months ago
gsz	84e6e65172	SPS单据打印插入PrintedSnLog表	9 months ago
jun	be37923e97	排序报工演示问题修复	9 months ago
xiangwei.zhang	f30dea31ba	合并广州代码	9 months ago
xiangwei.zhang	a2c4488860	Merge branch 'dev' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.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-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportNoSortStepService.java # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportSortStepService.java	9 months ago
王杰	fbf1bfce20	装配件排序	9 months ago
王杰	27086124ae	装配件工步调整	9 months ago
王杰	b32bef4d09	装配件整腔跳过ug	9 months ago
xiangwei.zhang	48f0360fb8	加工记录时间加毫秒，客退品和电子化检验查询串的问题修改	9 months ago
王杰	8cafc24d35	装配件整腔跳过	9 months ago
王杰	5f604adc9d	显示前道所有装配件	9 months ago
gsz	f3b4e08a10	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	9 months ago
gsz	4a72b849e9	JIS拉动组规则校验	9 months ago
jun	b741c1deb5	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	9 months ago
jun	1a4c94f88a	getById方法增加organizeCode条件	9 months ago
王杰	860b4d9c49	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	9 months ago
王杰	53ba608c16	打印	9 months ago
yxw	265f4ef7dc	排序展示组件 展示工单序号	9 months ago
王杰	84436a5b0f	修复产品加工记录 数据覆盖 没有新增的问题	9 months ago
jun	c0feb1dde4	排序发运逻辑调整	9 months ago
臧学普	c45b5724f6	暂时注释掉webservice	9 months ago
xiangwei.zhang	c301a99fd2	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
xiangwei.zhang	9a20923aa9	判断可疑	9 months ago
王杰	fa064ebd7d	打印策略 零件条码编码规则 字段用错	9 months ago
gsz	01dac4fe8c	初始化料筒修改	9 months ago
臧学普	f3e2254e45	电测试开发	9 months ago
臧学普	14817b8d61	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesCustomerSnTransformService.java # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java	9 months ago
gsz	630ac61e31	SPS打印增加打印时间	9 months ago
xiangwei.zhang	c82eb99317	判断可疑	9 months ago
jun	94c320d2cb	排序发运逻辑调整	9 months ago
yxw	31072fac39	排序展示组件报错	9 months ago
臧学普	ad2a7f8722	电测试开发	9 months ago
yxw	8252c90f03	裁片原材料防错	9 months ago
jun	09b9c21a47	发运明细顺序校验逻辑调整	9 months ago
jun	082e83a94a	排序发运逻辑调整	9 months ago
jun	1ae36b99e2	发运数据double	9 months ago
jun	d035447f29	报工增加bom总行数字段	9 months ago
王杰	838d1f82db	merge dev 冲突解决	9 months ago
王杰	8930187f6f	代码优化	9 months ago
王杰	23b774af3a	工单修改工步 修改方式变更	9 months ago
王杰	893f307284	工单修改工步， 修改方式调整	10 months ago
jun	4d9d03725b	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	10 months ago
jun	24d2cd89e6	非排序报工功能开发（代码调整）	10 months ago
jun	d708e96d46	非排序报工功能开发	10 months ago
xiangwei.zhang	7343c0e462	判断可疑	10 months ago
王杰	3a81d887a5	前道防错工步	10 months ago
gsz	3b955236e6	43302 加料防错扫码流程优化	10 months ago
王杰	315009b22c	合并dev	10 months ago
王杰	e20e160034	合并dev	10 months ago
王杰	24fd34c088	合并dev	10 months ago