430 Commits (a237d0672e3bb91c2dfc960498d08012fc5c6023)

Author	SHA1	Message	Date
王杰	838d1f82db	merge dev 冲突解决	7 months ago
王杰	1a734d52d0	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	315009b22c	合并dev	7 months ago
王杰	b4e500dd6d	合并 dev-wuhan master(工位扫描监控日志去除分表配置,直接使用动态sql写入生产线对应的分表)	7 months ago
王杰	1c2c03dccb	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	cfed01aa5c	工位扫描 日志 去除分表 写DB改成sql执行	8 months ago
yxw	1cf4524daf	客户条码打印	8 months ago
yxw	a536b82cfd	排序产线客户条码打印	8 months ago
王杰	b8cf5c7cfe	byd 装配件策略 截取右侧流水	8 months ago
王杰	d379ad543e	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
王杰	4092793204	排序流程 盲写代码 自测 问题修复	8 months ago
jun	c9d4d0fa2f	排序汇报job开发	8 months ago
王杰	b3cdc996ed	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
jun	92845822c7	打印模板开发	8 months ago
王杰	9b685988ed	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
yxw	bd4d547f4b	保存裁片工单结果工步-裁片工单号获取方式修改	8 months ago
王杰	df5757bec8	排序 保存加工结果	8 months ago
yxw	d1b5e32076	非排序产出零件条码 去掉cutWorkOrderNo 字段	8 months ago
yxw	bdceeb26f5	排序展示组件开发	8 months ago
王杰	5e2d89d6af	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
王杰	c5ef060b85	Merge branch 'dev'	8 months ago
王杰	4e94622cfd	Merge branch 'dev' into dev-wuhan	8 months ago
王杰	c39b5a9ab1	排序 保存工单装配件	8 months ago
yxw	30082cc4ae	裁片工步修改： ... 1、加工规则匹配时，对进料条件封装foreignKey 2、保存裁片条码工步取消引用保存条码工步，改为在本工步实现根据是否存在进料条码保存条码逻辑 3、裁片工单号存值改为产出零件上下文中	8 months ago
yxw	16ee98410f	装配目视单打印	8 months ago
yxw	6efdf95220	装配目视单打印	8 months ago
王杰	413f68de13	保存加工结果 排序	8 months ago
jun	b026ee071c	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	fc3e0bab38	排序发运功能开发	8 months ago
yxw	ffbc8c888d	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
yxw	8ed36a5e6b	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	a9e45c3a00	装配目视单打印	8 months ago
gsz	361eb7e455	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	8 months ago
gsz	0aafab31c8	排序电子化检验支持加工单扫描或者加工单客户条码1	8 months ago
xiangwei.zhang	c210f5e8b2	判断可疑	8 months ago
王杰	98843e2581	Merge branch 'master' into dev-wuhan-temp	8 months ago
王杰	c403807421	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
王杰	40f8d63189	设备点检	8 months ago
yxw	aad6e2dd48	装配目视单打印	8 months ago
yxw	91f6148ac7	新增打印工单打印队列	8 months ago
王杰	857f7c4fc2	Merge branch 'master' into dev-wuhan-temp	8 months ago
王杰	3215c2957e	漏信号 改LOG状态增加修改时间条件	8 months ago
王杰	70cca89c41	Merge branch 'master' into dev-wuhan-temp	8 months ago
王杰	8c5c959c3a	漏信号 bug	8 months ago
王杰	4e2056d1fa	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
王杰	7f7c46d92e	显示装配件 json to string 序列号 null 异常处理	8 months ago
王杰	0c1bfef981	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
yxw	def629d6a2	排序产线工单发布新增装配目视单打印队列	8 months ago
王杰	825891b51a	漏信号 代码 报错 问题修复 查询id bigint 转long	8 months ago
王杰	1a05d6deb5	Merge branch 'dev-wuhan' into dev-wuhan-temp	8 months ago
王杰	05038cf65c	排序 匹配装配件工步	8 months ago
jun	63493c7fd9	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	9ceb874f19	通用包装组零件校验(VKM)功能开发	8 months ago
王杰	e22a91f580	排序 匹配工步	8 months ago
王杰	8e81257831	排序 匹配装配件工步	8 months ago
yxw	ca1aa4a652	裁片工单打印优化	8 months ago
王杰	ba1a743d20	Merge branch 'master' into dev-wuhan-temp	8 months ago
yxw	3c60fd4487	PCN裁片工单打印	8 months ago
王杰	8f3dd7bc9b	排序 显示前道所有装配件扫描项	8 months ago
yxw	312a57c4be	裁片工单标签打印接口开发	8 months ago
yxw	cab28f1ba8	裁片箱标签打印参数增加时间	8 months ago
yxw	6e90772d0f	裁片箱条码打印	8 months 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	8 months ago
yxw	a6a399205d	裁片箱条码打印	8 months ago
yxw	226ee0be3f	裁片方案、工单增加属性	8 months ago
jun	b387f9c11e	增加常量3定义	8 months 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	8 months ago
jun	e931661d01	包装解绑功能开发	8 months ago
yxw	5ea796fb79	裁片打印工步	8 months ago
王杰	984a761881	前道防错， 顺序防错 逻辑调整	8 months ago
王杰	da07938e34	扫描主条码 工步 剔除排序场景	8 months ago
王杰	d51bcd2278	排序 显示装配件扫描项	8 months ago
yxw	63cd8c2671	裁片功能	8 months ago
yxw	70de9c9b15	裁片功能-》弹框展示成品列表Function	8 months ago
yxw	4b6d081ede	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	f105f37d7f	裁片功能-》弹框展示成品列表Function	8 months ago
王杰	89c1240140	合并dev	8 months ago
王杰	49549429cb	漏信号 优化	8 months ago
jun	aae08f45b1	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	33cbf3d537	等离子功能开发	8 months ago
gsz	03bf31ef50	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	8 months ago
gsz	bc7d209620	SPS物料拉动PCN扫描页面1	8 months ago
jun	96f6e5cdd6	返工拆解逻辑调整	8 months ago
王杰	2314130e5a	上下文 物料	8 months ago
王杰	2af9d8f125	工步弹框	8 months ago
jun	bf49601ad1	扫描可回用包装开发	8 months ago
yxw	ae725102b7	保存裁片加工记录	8 months ago
王杰	59fc125885	通用顺序防错工步	8 months ago
jun	fd46d3ab15	发运跳过逻辑优化	8 months ago
yxw	b3c75bb50a	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	1e8f6672cf	裁片功能	8 months ago
jun	2ef4f1e2f0	料包绑定功能开发	8 months ago
王杰	8d704d6a9e	排序顺序防错	8 months ago
yxw	2a6bcfc4dc	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	487c627bf8	裁片工单生成问题修复	8 months ago
王杰	f894210e6f	Merge branch 'dev' into dev-wuhan	8 months ago
王杰	ba80057ac8	读设备数据 写日志 增加	8 months ago
yxw	d5d51e0585	Merge remote-tracking branch 'origin/dev' into dev-wuhan	8 months ago
王杰	fae918112f	Merge branch 'dev' into dev-wuhan	8 months ago
王杰	f06716eec8	生产零件号 可复用 报错 问题修复	8 months ago