1533 Commits (ec9bc99df38d699597805a925dc4e8e8d42adc33)

Author	SHA1	Message	Date
castle.zang	b8ec695def	电测试	1 year ago
castle.zang	2ab2ecdb80	电测试	1 year ago
jun	e6aa6deb48	流程包含解绑工步[工步参数]逻辑优化	1 year ago
jun	8419842a17	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan-temp	1 year ago
jun	e67dd0fe8d	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	e531d140ae	CBR,排序报工逻辑调整	1 year ago
王杰	34e0e40256	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	c7a5f904a0	代码优化	1 year ago
王杰	b118f22767	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	5ab9d9098b	工艺参数完成 动态sql写入	1 year ago
gsz	8cb8b90b15	SPS拉动不校验强过顺序的	1 year ago
王杰	5bd431ac55	装配件显示 列增加配置	1 year ago
jun	7a4df0d184	排序发运逻辑调整	1 year ago
jun	254687ff81	第一次记录加工记录，同步标识应该为2	1 year ago
castle.zang	e8b651168f	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
castle.zang	1ebb40569f	电测试	1 year ago
gsz	8d832557c4	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
gsz	84e6e65172	SPS单据打印插入PrintedSnLog表	1 year ago
jun	be37923e97	排序报工演示问题修复	1 year ago
xiangwei.zhang	f30dea31ba	合并广州代码	1 year 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	1 year ago
王杰	8cce62b47d	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	fbf1bfce20	装配件排序	1 year ago
王杰	441d28d2e1	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	27086124ae	装配件工步调整	1 year ago
王杰	b32bef4d09	装配件整腔跳过ug	1 year ago
xiangwei.zhang	48f0360fb8	加工记录时间加毫秒，客退品和电子化检验查询串的问题修改	1 year ago
王杰	2d8901489d	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	8cafc24d35	装配件整腔跳过	1 year ago
王杰	d4102a5fcf	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	5f604adc9d	显示前道所有装配件	1 year ago
gsz	f3b4e08a10	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
gsz	4a72b849e9	JIS拉动组规则校验	1 year ago
jun	b741c1deb5	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	1a4c94f88a	getById方法增加organizeCode条件	1 year ago
王杰	c419399787	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	860b4d9c49	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
王杰	53ba608c16	打印	1 year ago
yxw	265f4ef7dc	排序展示组件 展示工单序号	1 year ago
王杰	ab8cb55e4a	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	84436a5b0f	修复产品加工记录 数据覆盖 没有新增的问题	1 year ago
王杰	fdf8c283e8	设备日志明细分表	1 year ago
jun	c0feb1dde4	排序发运逻辑调整	1 year ago
castle.zang	c45b5724f6	暂时注释掉webservice	1 year ago
xiangwei.zhang	c301a99fd2	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
xiangwei.zhang	9a20923aa9	判断可疑	1 year ago
王杰	fa064ebd7d	打印策略 零件条码编码规则 字段用错	1 year ago
gsz	01dac4fe8c	初始化料筒修改	1 year ago
castle.zang	f3e2254e45	电测试开发	1 year ago
castle.zang	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	1 year ago
王杰	0bdce60c37	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	2ef09dee56	mes_equipment_log mes_work_cell_scan_monitor_log 分表动态sql ； 支持云工厂分表	1 year ago
gsz	630ac61e31	SPS打印增加打印时间	1 year ago
xiangwei.zhang	c82eb99317	判断可疑	1 year ago
jun	94c320d2cb	排序发运逻辑调整	1 year ago
yxw	31072fac39	排序展示组件报错	1 year ago
castle.zang	ad2a7f8722	电测试开发	1 year ago
yxw	8252c90f03	裁片原材料防错	1 year ago
jun	09b9c21a47	发运明细顺序校验逻辑调整	1 year ago
jun	082e83a94a	排序发运逻辑调整	1 year ago
jun	1ae36b99e2	发运数据double	1 year ago
jun	d035447f29	报工增加bom总行数字段	1 year ago
王杰	838d1f82db	merge dev 冲突解决	1 year ago
王杰	8930187f6f	代码优化	1 year ago
王杰	23b774af3a	工单修改工步 修改方式变更	1 year ago
王杰	893f307284	工单修改工步， 修改方式调整	1 year ago
jun	4d9d03725b	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	24d2cd89e6	非排序报工功能开发（代码调整）	1 year ago
jun	d708e96d46	非排序报工功能开发	1 year ago
xiangwei.zhang	7343c0e462	判断可疑	1 year ago
王杰	80677847b1	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	3a81d887a5	前道防错工步	1 year ago
gsz	3b955236e6	43302 加料防错扫码流程优化	1 year ago
王杰	1a734d52d0	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	315009b22c	合并dev	1 year ago
王杰	0f88c13f3b	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	e20e160034	合并dev	1 year ago
王杰	24fd34c088	合并dev	1 year ago
王杰	3b3edc9b46	条码修改工步 update 改成updateByProperties	1 year ago
jun	80c6aaf1f5	发运工单表中条码字段修改	1 year ago
王杰	4922e1bd58	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	aa719fb463	通用客户条码转换逻辑变更	1 year ago
王杰	b4e500dd6d	合并 dev-wuhan master(工位扫描监控日志去除分表配置,直接使用动态sql写入生产线对应的分表)	1 year ago
王杰	1c2c03dccb	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	cfed01aa5c	工位扫描 日志 去除分表 写DB改成sql执行	1 year ago
王杰	36ee2c007a	临时存储	1 year ago
王杰	797904c87a	Merge branch 'dev'	1 year ago
yxw	1cf4524daf	客户条码打印	1 year ago
王杰	78fb82c88a	规则并截取右侧流水装配件规则, 生成零件条码工步需要使用此流水生成新的零件条码	1 year ago
yxw	a536b82cfd	排序产线客户条码打印	1 year ago
王杰	b8cf5c7cfe	byd 装配件策略 截取右侧流水	1 year ago
yxw	f82c6626a1	装配目视单打印策略类字段引用修改	1 year ago
yxw	f930bb092b	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	5eaf01b076	排序展示组件查询逻辑优化	1 year ago
gsz	44f72a56a6	PCN发运单打印页面1	1 year ago
gsz	ad5934cfd8	43289 SPS拉动提示系统异常	1 year ago
xiangwei.zhang	a05cd762bc	条码打印次数更新	1 year ago
王杰	d379ad543e	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	4092793204	排序流程 盲写代码 自测 问题修复	1 year ago
jun	4440d368a0	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	c9d4d0fa2f	排序汇报job开发	1 year ago
王杰	b3cdc996ed	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	7176608355	排序 加工记录 根据工单装配件写加工记录的汇报方式状态汇报零件号	1 year ago
jun	92845822c7	打印模板开发	1 year ago
xiangwei.zhang	f9415668a3	判断可疑	1 year ago
王杰	70adc2f3a9	条码生成 对象增加 生产线 工位	1 year ago
王杰	2b362500b1	条码生成 对象增加 生产线 工位	1 year ago
xiangwei.zhang	70456a3df5	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
xiangwei.zhang	3d9b4e6aa2	判断可疑	1 year ago
王杰	9b685988ed	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
yxw	19dc318f2f	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	bd4d547f4b	保存裁片工单结果工步-裁片工单号获取方式修改	1 year ago
王杰	3e11aff239	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
王杰	1cb80d9451	merge dev pom冲突	1 year ago
yxw	c8576f6f92	1、MesProductionPartContext 增加cutQty（裁片工单数量） ... 2、裁片工单绑定问题修复	1 year ago
yxw	0f3a1cb964	1、MesProductionPartContext 增加cutQty（裁片工单数量） ... 2、裁片工单绑定问题修复	1 year ago
王杰	947fa99b48	工位扫描 监控日志信息 设备代码判空补字段值	1 year ago
xiangwei.zhang	f2a453f549	判断可疑	1 year ago
王杰	df5757bec8	排序 保存加工结果	1 year ago
yxw	d1b5e32076	非排序产出零件条码 去掉cutWorkOrderNo 字段	1 year ago
yxw	fac38e24c5	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	bdceeb26f5	排序展示组件开发	1 year ago
gsz	c94b44ceee	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
gsz	176b418709	排序返工作业2	1 year ago
王杰	f441b07b4b	上下文 获取生产线类型 不验证工序	1 year ago
王杰	5e2d89d6af	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	c5ef060b85	Merge branch 'dev'	1 year ago
王杰	4e94622cfd	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	c39b5a9ab1	排序 保存工单装配件	1 year ago
yxw	30082cc4ae	裁片工步修改： ... 1、加工规则匹配时，对进料条件封装foreignKey 2、保存裁片条码工步取消引用保存条码工步，改为在本工步实现根据是否存在进料条码保存条码逻辑 3、裁片工单号存值改为产出零件上下文中	1 year ago
王杰	51bf7e01ec	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
王杰	d8cabab1d8	展示组件	1 year ago
yxw	63dbcf1eb0	装配目视单预览	1 year ago
yxw	16ee98410f	装配目视单打印	1 year ago
yxw	6efdf95220	装配目视单打印	1 year ago
王杰	413f68de13	保存加工结果 排序	1 year ago
gsz	a25a8b92e0	排序返工作业1	1 year ago
gsz	007256524b	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
gsz	5fb9601736	JIS物料拉动演示问题修改	1 year ago
jun	78f398a7fb	排序发运演示问题修复	1 year ago
jun	3218721983	排序发运功能开发	1 year ago
yxw	75edad4f97	装配目视单预览	1 year ago
jun	b026ee071c	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	fc3e0bab38	排序发运功能开发	1 year ago
gsz	2bb948e6c4	JIS物料拉动PCN 修改根据工单号排序校验	1 year ago
yxw	ffbc8c888d	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
yxw	01e7e45737	装配目视单打印	1 year ago
yxw	8ed36a5e6b	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	a9e45c3a00	装配目视单打印	1 year ago
王杰	7ae9519b26	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
王杰	7e795f15d2	排序 保存加工结果	1 year ago
gsz	361eb7e455	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
gsz	0aafab31c8	排序电子化检验支持加工单扫描或者加工单客户条码1	1 year ago
yxw	7d68d9f4f9	Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp	1 year ago
yxw	9453928bf8	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
yxw	2b1e11ebf9	装配目视单打印	1 year ago
xiangwei.zhang	c210f5e8b2	判断可疑	1 year ago
王杰	9695bfae11	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	a431455f9f	保存工艺参数工步	1 year ago
yxw	bc534df0ec	装配目视单打印	1 year ago
王杰	98843e2581	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	c403807421	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	40f8d63189	设备点检	1 year ago
yxw	aad6e2dd48	装配目视单打印	1 year ago
yxw	ae996c361c	PCN根据产线查询零件生产组信息集合	1 year ago
yxw	798ec0d3ff	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	91f6148ac7	新增打印工单打印队列	1 year ago
王杰	949da88cea	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	97ada9a13c	合并冲突	1 year ago
王杰	857f7c4fc2	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	abd4a0546f	漏信号 改LOG状态增加修改时间条件	1 year ago
王杰	3215c2957e	漏信号 改LOG状态增加修改时间条件	1 year ago
王杰	ce2dc13c8b	jdbc连接url增加allowMultiQueries=true	1 year ago
王杰	543e006ff3	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	8b70f63423	漏信息问题修复	1 year ago
王杰	0ea80b7ea0	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	42c5101d09	漏信号	1 year ago
王杰	c95c16fdcb	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	99437630bf	非排序无显示装配件匹配工步	1 year ago
王杰	8a9d4d55c8	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	fb713f5e5d	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	d84adae7f5	漏信号 代码修改	1 year ago
王杰	8655825afc	弹框工步	1 year ago
王杰	70cca89c41	Merge branch 'master' into dev-wuhan-temp	1 year ago
王杰	8c5c959c3a	漏信号 bug	1 year ago
王杰	2c196e4f47	显示装配件 json to string 序列号 null 异常处理	1 year ago
王杰	4e2056d1fa	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	7f7c46d92e	显示装配件 json to string 序列号 null 异常处理	1 year ago
王杰	0c1bfef981	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
yxw	def629d6a2	排序产线工单发布新增装配目视单打印队列	1 year ago
王杰	672df80254	漏信号 代码 报错 问题修复 查询id bigint 转long	1 year ago
王杰	6f590edc81	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
yxw	d8bbb932a9	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	5c1e7a1124	30.6配置文件密码修改	1 year ago
王杰	825891b51a	漏信号 代码 报错 问题修复 查询id bigint 转long	1 year ago
王杰	1fb16f0457	排序 根据工单或者客户条码 获取工单或者条码	1 year ago
王杰	6b99d852d7	合并 冲突	1 year ago
王杰	1a05d6deb5	Merge branch 'dev-wuhan' into dev-wuhan-temp	1 year ago
王杰	d94723f1d3	排序 匹配装配件工步	1 year ago
王杰	05038cf65c	排序 匹配装配件工步	1 year ago
yxw	b1905b75e3	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	70d83d76c7	打印队列表	1 year ago
jun	63493c7fd9	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	9ceb874f19	通用包装组零件校验(VKM)功能开发	1 year ago
yxw	89e087632e	电子化检验弹框数据处理	1 year ago
yxw	bbf6577607	电子化检验弹框数据处理	1 year ago
yxw	3acc35c0ab	电子化检验弹框数据处理	1 year ago
yxw	db81a86fe7	电子化检验弹框数据处理	1 year ago
yxw	764744cba5	电子化检验弹框数据处理	1 year ago
王杰	2dcadee21b	工步弹框	1 year ago
王杰	1988ac9e83	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
王杰	e22a91f580	排序 匹配工步	1 year ago
yxw	de08e40843	裁片工单打印	1 year ago
王杰	8e81257831	排序 匹配装配件工步	1 year ago
yxw	ca1aa4a652	裁片工单打印优化	1 year ago
gsz	8290261d5b	JIS物料拉动PCN页面2	1 year ago
yxw	188741a4dd	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	04e7942d04	裁片原材料防错优化	1 year ago
王杰	ba1a743d20	Merge branch 'master' into dev-wuhan-temp	1 year ago
gsz	0113527434	JIS物料拉动PCN页面2	1 year ago
王杰	bbd0f74b5c	Merge branch 'dev'	1 year ago
yxw	b578de2b1a	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	82a6beef27	MesPcnExtConstWords VERTICAL_BAR 参数名更改	1 year ago
王杰	a149c7cb55	Merge branch 'dev' into dev-wuhan	1 year ago
yxw	0957d7c212	PCN裁片工单打印	1 year ago
yxw	3c60fd4487	PCN裁片工单打印	1 year ago
yxw	a78238b49c	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	e476c0c4dc	裁片相关pojo修改	1 year ago
王杰	08aa3def34	打印非报废条码工步	1 year ago
gsz	c8895560b5	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
gsz	932f06d023	JIS物料拉动PCN页面1	1 year ago
yxw	0e5b02c65d	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	739136d035	查询bom增加生效开始时间分组	1 year ago
yxw	550fcee7aa	裁片功能优化	1 year ago
王杰	8f3dd7bc9b	排序 显示前道所有装配件扫描项	1 year ago
yxw	e9d2615935	裁片功能优化	1 year ago
yxw	ab9f3dde09	裁片功能优化	1 year ago
yxw	e783d75ae2	裁片功能优化	1 year ago
xiangwei.zhang	213e349773	新增bomCode	1 year ago
jun	d2d1d98281	43072 加料防错 料箱自动初始化	1 year ago
jun	2322cc606c	43063 PDA点检重复扫描了同一个条码，希望提示清晰	1 year ago
yxw	ab3fd934cf	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	312a57c4be	裁片工单标签打印接口开发	1 year ago
jun	ca7e6bb915	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	f4ebfa030e	包装解绑功能开发	1 year ago
yxw	e798943bfe	裁片工单标签打印工步修改	1 year ago
yxw	cab28f1ba8	裁片箱标签打印参数增加时间	1 year ago
yxw	8a0ccc46f9	裁片箱条码打印工步增加修改裁片工单状态为已打印逻辑	1 year ago
yxw	6e90772d0f	裁片箱条码打印	1 year ago
yxw	babf855266	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java	1 year ago
yxw	a6a399205d	裁片箱条码打印	1 year ago
yxw	226ee0be3f	裁片方案、工单增加属性	1 year ago
jun	b387f9c11e	增加常量3定义	1 year ago
jun	c454fa84a3	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java	1 year ago
jun	e931661d01	包装解绑功能开发	1 year ago
yxw	c658a8a5b8	裁片打印策略类	1 year ago
yxw	5ea796fb79	裁片打印工步	1 year ago
王杰	d83d750632	排序装配件确认方式：通用自制件补条码字符	1 year ago
王杰	984a761881	前道防错， 顺序防错 逻辑调整	1 year ago
王杰	da07938e34	扫描主条码 工步 剔除排序场景	1 year ago
王杰	ac408df8b5	排序 设备加工参数工步	1 year ago
王杰	c5d1382724	生产线增加字段 是否忽略 工单质量状态	1 year ago
王杰	d51bcd2278	排序 显示装配件扫描项	1 year ago
王杰	f1f1d8fcdf	前道防错	1 year ago
王杰	ebc7bcd0b4	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
王杰	377e8aa2e9	工步弹框	1 year ago
yxw	63cd8c2671	裁片功能	1 year ago
yxw	641c881f94	裁片功能-》弹框展示成品列表Function	1 year ago
xiangwei.zhang	55984cee69	判断可疑	1 year ago
yxw	70de9c9b15	裁片功能-》弹框展示成品列表Function	1 year ago
yxw	b99fded8f5	裁片功能-》弹框展示成品列表Function	1 year ago
yxw	4b6d081ede	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	f105f37d7f	裁片功能-》弹框展示成品列表Function	1 year ago
王杰	89c1240140	合并dev	1 year ago
王杰	49549429cb	漏信号 优化	1 year ago
gsz	b36912724c	SPS物料拉动PCN扫描页面2	1 year ago
gsz	bb2a3f1092	43010 PNC增加装配件查询	1 year ago
jun	2f3b3b0761	number同时存在大于小于某个字段问题修复	1 year ago
jun	aae08f45b1	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	33cbf3d537	等离子功能开发	1 year ago
gsz	430d3556da	把拉动单打印产线 拉动组多选	1 year ago
gsz	03bf31ef50	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
gsz	bc7d209620	SPS物料拉动PCN扫描页面1	1 year ago
jun	96f6e5cdd6	返工拆解逻辑调整	1 year ago
jun	023203efaf	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	8680ee4e9b	原箱进原箱出逻辑开发	1 year ago
王杰	2314130e5a	上下文 物料	1 year ago
王杰	5e1f6de520	工步弹框	1 year ago
王杰	2af9d8f125	工步弹框	1 year ago
jun	59c44cb199	发运单，装车单跳过逻辑调整	1 year ago
jun	17a2254f3a	站点信息基础数据	1 year ago
jun	e22af55524	装车单跳过，是否要将装车单关联的发运单也一并完成，同时一并发给WMS	1 year ago
jun	bf49601ad1	扫描可回用包装开发	1 year ago
yxw	47dee04a69	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	ae725102b7	保存裁片加工记录	1 year ago
jun	d883d077fd	料包绑定增加外协件逻辑	1 year ago
王杰	59fc125885	通用顺序防错工步	1 year ago
jun	0cd56db811	返工代码优化	1 year ago
jun	91ff86f2d3	返工完成方法名事务问题修改	1 year ago
yxw	428e0bdce6	修改原材料长度	1 year ago
jun	a63247efc8	返工拆解inspection表里，nc_status增加拆解功能	1 year ago
jun	8a08eaaf53	发运单中默认不写装车单信息，需要反查	1 year ago
jun	fd46d3ab15	发运跳过逻辑优化	1 year ago
yxw	54bc6daf7f	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	add6da8105	修复原材料防错记录修改长度履历时修改类型不对问题	1 year ago
王杰	1cfe0f53c0	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	959eb9aa11	设备计数验证shotCounter	1 year ago
yxw	b3c75bb50a	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	1e8f6672cf	裁片功能	1 year ago
jun	05d89d34bb	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	2ef4f1e2f0	料包绑定功能开发	1 year ago
yxw	df3f552348	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	f6e0ae2118	裁片原材料防错增加长度修改记录	1 year ago
王杰	5cf100bce8	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	1 year ago
王杰	c2b94c2ad6	生成零件号 可复用	1 year ago
王杰	b2325f6ce0	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
王杰	8d704d6a9e	排序顺序防错	1 year ago
yxw	65b902f4ba	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	82db0d1594	10.193.30.22 服务器配置文件	1 year ago
jun	b98c50a6e8	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	408911ff1b	返工拆解，查询树形装配件，增加id,pid关联	1 year ago
王杰	3cf7ef6096	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	8789532066	PcnRepositoryAspect	1 year ago
jun	d76ad89328	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	3a5e4d844e	重新检测生成单据，同步标识重置	1 year ago
gsz	58811fff06	42984 初检创建时修改人和修改时间不能赋值	1 year ago
yxw	78514c8beb	Merge remote-tracking branch 'origin/dev' into dev-wuhan	1 year ago
yxw	2a6bcfc4dc	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	487c627bf8	裁片工单生成问题修复	1 year ago
jun	adfcb960c9	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	a4a612bd9c	点检单同步标识未修改	1 year ago
王杰	f894210e6f	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	0c88633bfa	删除无用的备份工步	1 year ago
王杰	90e6ff708d	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	1 year ago
王杰	ba80057ac8	读设备数据 写日志 增加	1 year ago
jun	05ccf6501f	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	b731d10d44	电子化检验拆解功能开发	1 year ago
yxw	bcf15b1eaa	修改原材料修改记录表	1 year ago
yxw	d5d51e0585	Merge remote-tracking branch 'origin/dev' into dev-wuhan	1 year ago
王杰	fae918112f	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	f06716eec8	生产零件号 可复用 报错 问题修复	1 year ago
王杰	a2c80f138d	代码写错	1 year ago
王杰	f9a1e5322e	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	27b40d6709	设备查询点位数据去除事务	1 year ago
jun	bc60e1a2c1	电子化检验拆解功能开发	1 year ago
yxw	9f6afe14fd	解决代码冲突	1 year ago
yxw	92f9a79e97	PCN长度修改类型获取接口	1 year ago
yxw	abc8599d73	Merge remote-tracking branch 'origin/dev' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java	1 year ago
yxw	9841ac7cde	Merge remote-tracking branch 'origin/dev' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java	1 year ago
jun	5a6b1f1d2a	Merge remote-tracking branch 'origin/dev' into dev	1 year ago