1163 Commits (master)

Author	SHA1	Message	Date
pzj	3f3241d235	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	7 months ago
jun	8e204baadf	报工增加bom总行数字段	7 months ago
gsz	f1c2f71e87	43326 电子化检验，发送给QMS的数据，按照零件号+责任人类型分组发送	7 months ago
臧学普	199565901d	装配件表修改字段	7 months ago
臧学普	ee1e45f425	增加缺少字段-装配件表	7 months ago
pzj	7163788a67	看板优化	7 months ago
pzj	a5e1681537	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	7 months ago
臧学普	f576b00669	按包装圆整异常日志打印	7 months ago
pzj	c3269181c0	完善报表查询条件	7 months ago
xiangwei.zhang	d6a9d33105	对账单信息	7 months ago
pzj	19fc69a084	完善站点和辊道基础数据	7 months ago
pzj	4437d06c96	装配件查询、发运明细报表、可疑品条码信息、检验产品数据子报表	7 months ago
臧学普	2aef1f2e7b	添加缺少字段	7 months ago
臧学普	4c6ee6446e	添加缺少字段	7 months ago
臧学普	fb62ba21db	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	7 months ago
臧学普	a5eef7febd	添加缺少字段	7 months ago
yxw	943c15aeb6	PC端装配目视单打印策略类字段引用修改	7 months ago
gsz	2f36e42def	43285 JIS拉动问题优化	7 months ago
jun	d4971b0cd7	零件拉动组明细更新排除自己	7 months ago
臧学普	c838de8675	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	7 months ago
臧学普	76334222d0	武汉工单--增加包工的装配件	7 months ago
yxw	3e85d967ae	装配目视单补打逻辑优化	7 months ago
yxw	9878633805	1、MesProductionPartContext 增加cutQty（裁片工单数量） ... 2、裁片工单绑定问题修复	7 months ago
王杰	a80e653f08	Merge branch 'dev' into dev-wuhan	7 months ago
xiangwei.zhang	20690c2ae2	对账单信息	7 months ago
gsz	a5ad0e628f	43251 武汉PCN-SPS物料拉动WebService接口修改	7 months ago
yxw	b4e75fc493	装配目视单打印	7 months ago
yxw	e6782d4b76	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	7 months ago
yxw	812a821843	装配目视单打印	7 months ago
gsz	bcadbdb396	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev-wuhan	8 months ago
gsz	926dba8f22	SPS拉动演示问题修改	8 months ago
yxw	73d79d988c	排序工单发布新增装配目视单	8 months ago
yxw	af45d9a655	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
臧学普	ecf2f7d4e4	武汉工单--插入打印工单打印队列	8 months ago
yxw	6768e2802d	装配目视单预览	8 months ago
gsz	5190826722	拉动单规则修改-拉动组号+年月日+工单后5位	8 months ago
gsz	fb9c1904ee	拉动单规则修改-拉动组号+年月日+工单后5位	8 months ago
gsz	e295ce41a1	拉动单规则修改-拉动组号+年月日+工单后5位	8 months ago
臧学普	a7c909deb9	武汉工单工单号拼接位工厂代码+工单类型 +客户工厂代码+班次+流水号,numberRule只需要生成流水号	8 months ago
pzj	6e66dc7645	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
pzj	e130754448	包装组零件规则基础数据主、明细	8 months ago
臧学普	99c177d7ab	武汉工单零件生产组名称	8 months ago
pzj	6d2a8087e9	裁片基础数据完善	8 months ago
臧学普	cc73d3286d	武汉工单生产时间字段	8 months ago
臧学普	e0fa41d549	武汉工单调整代码顺序	8 months ago
臧学普	df68ae5c09	武汉工单生成队列和序列号	8 months ago
xiangwei.zhang	2e525494c6	对账报表	8 months ago
臧学普	3ee557b0c0	武汉工单生成队列和序列号	8 months ago
臧学普	9c6147f706	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	7c82801377	装配目视单打印	8 months ago
pzj	edb6dea585	完善站点信息基础数据校验	8 months ago
pzj	45395bd4d6	辊道设备配置基础数据	8 months ago
臧学普	68f09d4fcf	武汉工单生成队列和序列号	8 months ago
jun	6162899689	CBR报工逻辑调整	8 months ago
yxw	40f8093dd7	新增打印工单打印队列	8 months ago
yxw	3d44436371	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	29dd614d4b	新增打印工单打印队列	8 months ago
pzj	2dbe97741d	裁片设备维护基础数据完善	8 months ago
yxw	9cfe026727	排序产线工单发布新增装配目视单打印队列	8 months ago
pzj	b50fdbe357	裁片方案基础数据问题完善	8 months ago
pzj	1ee988c030	站点信息基础数据	8 months ago
yxw	43ed15739c	裁片工单打印优化	8 months ago
gsz	dd8464903f	43172 点检主数据主表导入和新增时，基于设备代码排序	8 months ago
gsz	286c1c9b59	JIS物料拉动 规则校验设置颜色	8 months ago
gsz	19acc121d2	设备实时值查询 问题	8 months ago
pzj	d02f6ef9fb	裁片基础数据 长度修改类型校验	8 months ago
pzj	5641d27974	裁片基础数据 裁片长度修改类型、裁片配置、裁片原材料配置、裁片成品配置、裁片设备配置、裁片设备配置明细、裁片设备配置设备加工参数	8 months ago
pzj	182186077c	等离子基础数据 可回用包装类型、可回用包装、可回用包装零件	8 months ago
yxw	fdc43ddb1a	PCN裁片工单打印	8 months ago
yxw	5a12b1a7c5	裁片工单打印调整	8 months ago
gsz	737efb5fca	43155 MES-PC:拉动单明细页面问题	8 months ago
臧学普	eceb7d9b5e	修改生成工单	8 months ago
yxw	91f38ad6ae	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	54627db4b1	裁片工单标签打印	8 months ago
xiangwei.zhang	896f6d5aed	对账单信息	8 months ago
jun	0939fe5e6e	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	e0a911defd	工单装配件 工单零件报表开发	8 months ago
yxw	15c92222d6	裁片工单标签打印	8 months ago
jun	5fdc86f857	查询bom增加生效开始时间分组	8 months ago
jun	b77d89ecbf	根据勾选的发运单同步WMS，根据发运单关联对应的装车单； ... 发运单、装车单增加备注的筛选条件，文本框，支持模糊输入；	8 months ago
yxw	cf56f4b7d2	裁片功能优化	8 months ago
yxw	28401a36dd	裁片功能优化	8 months ago
yxw	320248e262	裁片工单标签打印接口开发	8 months ago
yxw	ead750c4df	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	7f17a0edf1	裁片工单标签打印接口开发	8 months ago
臧学普	875883685d	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
臧学普	3a7cb17dab	武汉客户条码生成	8 months ago
yxw	1d29f10f6f	包装定义增加显示客户名称、工单增加可允许多种工单状态查询	8 months ago
gsz	dcff64a03d	43112 MES:PC拉动单页面问题 6.同一拉动组-根据工位代码＆零件号做唯一校验	8 months ago
gsz	b9ea5084fe	缺陷记录表增加查询条件	8 months ago
xiangwei.zhang	7a847d4a53	对账单信息	8 months ago
xiangwei.zhang	7b070c8bbd	新增导入信息	8 months ago
xiangwei.zhang	b86fbdbd3d	对账单信息	8 months ago
xiangwei.zhang	111b90fcb3	对账单信息	8 months ago
xiangwei.zhang	d8d0c0721a	对账单信息	8 months ago
yxw	50066b2ab5	裁片功能-》弹框展示成品列表Function	8 months ago
gsz	97a1df04d8	43100 设备点检设置明细导入完成后，期望序列号可以正排	8 months ago
gsz	9895965c75	43050 报废条码的查询与报表打印	8 months ago
gsz	d0fd30871c	拉动单增加总成零件号描述	8 months ago
gsz	26b7ad8a28	SPS物料拉动 生成拉动单JOB-2	8 months ago
jun	bc8279cb10	43045 ERP物料信息支持零件名称模糊查询	8 months ago
gsz	36f5c4c736	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev-wuhan	8 months ago
gsz	3938ed8b15	SPS物料拉动 生成拉动单JOB	8 months ago
yxw	5ece1cb506	保存裁片加工记录	8 months ago
xiangwei.zhang	66b81a0fcb	报工修改	8 months ago
gsz	46c4bdded3	42966 设备实时查询报表-设备变量名称、设备变量ID可以多选查询，输入时，用逗号隔开	8 months ago
jun	ae7bb006a5	零件条码状态增加custSn查询条件	8 months ago
yxw	6833795264	Merge remote-tracking branch 'origin/dev' into dev-wuhan	8 months ago
jun	27d697c382	43012 关闭工单时，试制单和试制零件不允许回传SAP	8 months ago
gsz	a586b636ef	缺陷记录报表功能加打印功能	8 months ago
gsz	8f751f8330	根据拉动组和生产工单产生拉动单JOB-1	8 months ago
gsz	3554e2677a	缺陷记录报表功能加打印功能	8 months ago
gsz	403ea941c7	缺陷记录报表功能加查询条件	8 months ago
gsz	d62d1ce024	缺陷记录报表功能	8 months ago
臧学普	e9bc105f43	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
臧学普	11ccae7461	提交生产装配件清单，工单，零件清单	8 months ago
gsz	7e17f4c050	42966 设备实时查询报表-回退	8 months ago
xiangwei.zhang	96a94f6763	新增导入信息	8 months ago
yxw	6ae5dfb605	Merge remote-tracking branch 'origin/dev' into dev-wuhan	8 months ago
yxw	e7a64270a0	裁片工单生成问题修复	8 months ago
xiangwei.zhang	7d4b309cd7	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
xiangwei.zhang	7530bb90a9	新增导入信息	8 months ago
jun	3a65eda073	点检单同步标识未修改	8 months ago
yxw	74ed9942d8	解决代码冲突	8 months ago
yxw	3ec92a4f9e	Merge remote-tracking branch 'origin/dev' into dev-wuhan	8 months ago
yxw	69bf4af131	裁片原材料防错	8 months ago
gsz	9ccea904dc	42966 设备实时查询报表-设备变量名称、设备变量ID可以多选查询，输入时,用逗号隔开	8 months ago
gsz	560db850d8	42937 关闭的工单可以做报工调整操作	8 months ago
gsz	9b782c9d1d	42959 QMS可疑品汇总job 会把电子化检验终检人和终检时间覆盖掉	8 months ago
gsz	2261f43453	42942 已关闭、已完成的工单允许做批量汇报，且点”报工“时强制要求用户输入过账日期和时间	8 months ago
yxw	36be5c84ed	Merge branch 'dev' into dev-wuhan	8 months ago
yxw	92b6b1be41	裁片功能主数据表	8 months ago
gsz	0ece263511	42941 mes_qms_scrap这个字段nc_judger这个字段需要赋最终报废人或者返工报废人的工号信息	8 months ago
gsz	cab9779ef0	42939 产量统计报表-产线、工位 支持模糊查询	8 months ago
jun	129f5b00bc	PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号）	8 months ago
gsz	b69151daa1	SPS物料拉动 1.新增拉动单+明细+2.提供给设备webSrevice接口	8 months ago
jun	5b3862b7e3	42904 试制工单和试制零件计划工单信息汇总问题	8 months ago
jun	0d88a90ecc	非排序工单导入模板-导入时校验填写计划日期的格式要与yyyy-MM-dd保持一致，若不一致，导入时弹窗报错(报错要提示具体原因)，整个导入模板无法导入	8 months ago
jun	edfeb08797	自定义脚本同步	8 months ago
jun	7cb382e516	工单关闭增加日志；	8 months ago
jun	6faa207574	责任人区域关系查询逻辑调整；	8 months ago
jun	29efaba4ac	工单汇总需求变更增加完成数量	8 months ago
jun	65e2a26cc8	工单汇总需求变更	8 months ago
jun	e722c262b3	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
jun	6ae6ba0940	汇总工单发送SAP逻辑调整	8 months ago
xiangwei.zhang	7930cd4734	新增导入信息	8 months ago
gsz	55393e79c6	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	8 months ago
gsz	b61b06511e	代码评审问题修改	8 months ago
jun	b7398e4d25	工单汇总需求变更	8 months ago
xiangwei.zhang	a2731249a4	新增导入信息	8 months ago
gsz	0d4b6fc6d8	42816 报工调整报表需求变更	8 months ago
jun	6341bf7842	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
jun	fe608faa75	装配件绑定记录表同步脚本提示信息修改	8 months ago
王杰	bb2773685e	配置文件	8 months ago
gsz	307b8d3176	42777 报工调整报表新增物料查询	8 months ago
jun	3c22ae0461	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
jun	bbc3a0362f	42796 【上线】工单需求变更	8 months ago
gsz	83edbadab6	41695 工位端增加停机记录功能	8 months ago
gsz	bef4eeb3b8	42777 报工调整报表新增 批量报工 + 报工调整	8 months ago
gsz	70ae73d026	42777 报工调整报表开发	8 months ago
gsz	92a0136482	生产工单日志	9 months ago
jun	933bc2fab0	写入目标表失败，更新同步标识特殊处理(未配置失败code报错)	9 months ago
gsz	8e1461d066	42692 MES:可疑品汇总逻辑更新	9 months ago
jun	19eea2b97e	生产版本和工作中心绑定关系取消	9 months ago
jun	3e7c2c75c5	写入目标表失败，更新同步标识特殊处理(未配置失败code报错)	9 months ago
jun	ad72e55de7	MES2PISCES-发运单回传汇总逻辑问题修复	9 months ago
jun	114ca961fe	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	2f37ea1865	接口映射分组名称用枚举	9 months ago
xiangwei.zhang	26e9ba93dd	新增导入信息	9 months ago
xiangwei.zhang	85bed73d4e	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	3267d04197	接口映射，自定义脚本页面开发	9 months ago
gsz	3006fc0d13	42692 MES:可疑品汇总逻辑更新	9 months ago
jun	d4a3b131df	42660 SAP生计划完成率更新	9 months ago
jun	2935bd40f7	汇总工单信息发送给SAP	9 months ago
jun	95759dd876	42582 线边库存报表	9 months ago
gsz	dac6a8f9ec	42102 点检单页面增加打印功能	9 months ago
jun	2b70084c7c	42602 发运后，客退品返工，生成并打印新条码 ... 42582 线边库存报表	9 months ago
jun	8bf1738bcf	产线零件关系软删	9 months ago
王杰	6cf1811cfc	少了物料查询条件	9 months ago
王杰	9f04956492	少了物料查询条件	9 months ago
王杰	923c2570b9	查询条件写错	9 months ago
jun	5a8e76d8c5	零件条码状态，排序加工规则导出问题修复	9 months ago
jun	4758a89f4c	汇总发送工单时间提前10分钟	9 months ago
jun	78bb487025	工单汇总发送SAP逻辑调整，零件条码状态，加工记录导出功能	9 months ago
jun	440a9eaa3c	42580 PC-产线与零件关系维护-导入后，产线代码为空	9 months ago
gsz	effc71dd95	产量统计报表report_type=10 的过滤掉	9 months ago
gsz	0962527d5f	汇总工单给SAP不统计 试制单order_flag !='P'	9 months ago
gsz	d2c1c4c591	汇总工单给SAP 时间分组方式，关闭状态数量逻辑变更	9 months ago
gsz	458b24957d	汇总工单给SAP 时间分组方式，关闭状态数量逻辑变更	9 months ago
jun	73a11a618a	零件条码状态，产品加工记录报表开发	9 months ago
logic.fang	abcbb98767	产线看板-工单完成情况-当班一次合格率汇总逻辑变更	9 months ago
jun	2939ac3b69	发运单明细页面显示备注字段	9 months ago
gsz	fbda3b66cc	42563 工单汇总SAP，只是汇总非排序工单，（排序和BTO工单都不需要回传SAP）	9 months ago
gsz	b722a36e55	根据物料工位分组分页查询设备加工记录返回分页pager	9 months ago
gsz	32b76ad88d	根据物料工位分组分页查询设备加工记录	9 months ago
gsz	26834c591c	42102 点检单页面增加打印功能	9 months ago
王杰	5953ef5722	设备日志报表 查询条件	9 months ago
王杰	637bac157b	设备点位 查询 设备代码不能模糊查询	9 months ago
jun	5a5bce2767	打印模板增加打印时间字段	9 months ago
臧学普	22157ae0eb	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
臧学普	91de11ab78	在零件生产组没有可以生成的零件时，更新窗口时间	9 months ago
王杰	188fa73561	修改同步字段赋1的问题 已经跟罗 双 2人确认	9 months ago
王杰	f4f581d237	设备日志报表 查询条件	9 months ago
jun	38d65f2050	报工调整增加原因录入功能	9 months ago
jun	8f341689c9	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
臧学普	9c7a954f2b	日志打印零件生产组生成工单时的时间	9 months ago
jun	ee50030890	产线与零件关系导入（产线名称改为产线代码）	9 months ago
臧学普	fad2cb5c66	修改bto生产工单的窗口提示信息	9 months ago
臧学普	8d48119572	查询客户排序信息时查询未解析过的数据	9 months ago
logic.fang	1e77a3a7f5	产线看板-优化	9 months ago
jun	2d94c2c66d	问题清单修复	9 months ago
jun	f8d371a3e2	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	c4d113ce05	问题清单修复	9 months ago
王杰	b08727bb82	系统配置查询方法	9 months ago
臧学普	d81c9d9cc3	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
臧学普	ba4c03b843	更新bto按时圆整生成工单逻辑	9 months ago
jun	096835bd11	问题清单修复	9 months ago
王杰	0da6e7f2f6	mes报表验证分表配置	9 months ago
王杰	7e50e2cf37	mes报表验证分表配置	9 months ago
微笑着面对明天	1390979630	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
微笑着面对明天	736ae7ebff	新增设备数据变量	9 months ago
gsz	587502b2d8	代码回退，逻辑有变待确认	9 months ago
gsz	786385b2e0	MES可疑品汇总修改 返工数/不合格数/检验数量逻辑	9 months ago
jun	c0e3d72b51	问题清单修复	10 months ago
gsz	0994b7ffaa	MES可疑品汇总job修改汇总逻辑	10 months ago
王杰	8d20f2ff9d	日志分表 查询 bug	10 months ago
gsz	7698c12158	MES可疑品汇总 增加qms同步标志qmsSync	10 months ago
gsz	065b4241d9	42221 单件条码返工后报废	10 months ago
jun	b5a0c0d81a	问题清单修复	10 months ago
jun	56ded2a6bc	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	0989f3aeee	问题清单修复	10 months ago
王杰	2f65a4a093	设备日志报表 增加分表查询字段	10 months ago
王杰	3a6248a1ea	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java	10 months ago
gsz	fa51917ab3	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	10 months ago
gsz	bfafa4206c	ccsc汇总job 规则随机逻辑修改	10 months ago
jun	763ad4546c	问题清单修复	10 months ago
jun	a6c1d5a485	CCSC检测，重新打开	10 months ago
gsz	86c9ec3ecf	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	10 months ago
gsz	05bd490501	42189 零件扩展属性 条码模板与零件条码规则匹配开发	10 months ago
jun	7de9fef630	问题清单修复	10 months ago
jun	b55cbb30bc	问题清单修复	10 months ago
jun	68bc7bc96a	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	a5873a9388	问题清单修复	10 months ago
logic.fang	684d5ea5d9	产线看板-"单位小时完工率"与"产线一次下线合格率"部分的时间段排序优化	10 months ago
logic.fang	4d68d813e3	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	1de19ae114	问题清单修复	10 months ago
王杰	452e538823	设备LOg变更字段	10 months ago
jun	ee3a6879cd	数据同步脚本	10 months ago
王杰	15debc5dfb	mesmove 增加 erp生产线值	10 months ago
王杰	f3c87a4e87	导入模版	10 months ago