Commit Graph

1364 Commits (0200f6a308b1977ec296a5d47a1b9559fd39fa5d)

Author SHA1 Message Date
臧学普 694ed06b59 客户零件号需要从零件生产组中获取 6 months ago
jun 0c2edd3b55 工单页面查询报错 6 months ago
jun 537e117303 自定义脚本同步 6 months ago
jun 05a1f10218 发运单查询时间条件不生效 6 months ago
臧学普 97118b9857 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 9a9799a1c6 看板调整产量计算公式 6 months ago
jun ca3b8b9fe2 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun eac136850f 武汉CBR负报工 6 months ago
臧学普 78dfc1657f 目视单PTR转P 6 months ago
jun 91ba35debe BTO工单新增报错 6 months ago
臧学普 e077cdb0e5 目视单增加车型备注 6 months ago
臧学普 66db54816c 目视单增加车型备注 6 months ago
臧学普 ab3151da6f 看板调整及目视单打印调整 6 months ago
臧学普 f95006915e 看板调整 6 months ago
臧学普 1a86c4d7b0 目视单打印 6 months ago
臧学普 e1e8106db7 PTR逻辑修改 6 months ago
臧学普 66dcc038b2 PTR逻辑修改 6 months ago
臧学普 901cb3e00c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 3a2fa64bbd PTR逻辑修改 6 months ago
王杰 d97e9be49d docker 6 months ago
臧学普 20bd304728 离线装配件表校验 cfgOfflineRao表中是否已经存在了客户零件号,如果存在则跳过 防止多个零件生产组生成相同的数据 6 months ago
臧学普 8922c24857 离线装配件表校验 cfgOfflineRao表中是否已经存在了客户零件号,如果存在则跳过
防止多个零件生产组生成相同的数据
6 months ago
臧学普 0e891ccb14 PTR逻辑及F单逻辑修改 6 months ago
jun 5d06663578 SPS单据打印优化,增加每次查询条数 6 months ago
jun d2cc32a6e7 Merge branch 'dev' into dev-wuhan 6 months ago
jun 9cd5fec986 SPS单据打印车型名称 6 months ago
jun 92587bd4f5 CBR负报工接口添加日志 6 months ago
jun 96dec1f462 CBR负报工接口添加日志 6 months ago
jun 57b20494ea Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun 862da84fd6 43683 发运单明细显示:需要显示物料名称,及正序排序客户排序信息 6 months ago
xiangwei.zhang 35ff11fb98 点检单,删除逻辑修改 6 months ago
臧学普 f72dbdeef4 bom不生效时,只生成工单不生产装配件及物料清单 6 months ago
臧学普 ae5acb76b1 bom不生效时,只生成工单不生产装配件及物料清单 6 months ago
臧学普 68908190ed 生产零件号是用来查找生产版本与bom 存在于零件生产组中 6 months ago
jun d6bddfff1a PC排序汇报问题修复 6 months ago
臧学普 3c92dbb3ff 离线打印字段确认 6 months ago
臧学普 6f975db843 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 487c683569 离线打印字段确认 6 months ago
jun 1e85f2c093 Merge remote-tracking branch 'origin/dev' into dev-wuhan 6 months ago
jun cfb57c094d 工单同步wms功能开发 6 months ago
xiangwei.zhang 079cbf07cb 设备点检导入 6 months ago
xiangwei.zhang f0c9b5b424 对账单信息 6 months ago
臧学普 81ca92c4e1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 185780a999 线末大屏颜色问题 6 months ago
xiangwei.zhang 7fd55a504f 导入也需要修改同步状态 6 months ago
jun 8bb57ecb56 SPS拉动单生成优化 6 months ago
jun 440753bdd7 发运增加扫描日志信息 6 months ago
臧学普 419fc65025 工单号顺序号调整 6 months ago
臧学普 974ad7bc7f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
xiangwei.zhang f3906aac6b 设备停机记录job修改 6 months ago
臧学普 fc9e36abcf 离线job生成装配件及拉动单模板 6 months ago
jun c7bbac33ab Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun 4677552dfd 试制件工单新增问题修改 6 months ago
臧学普 e3ab160447 mes-ptr完善逻辑 6 months ago
臧学普 748de5eeb9 修改线末大屏逻辑 6 months ago
臧学普 b16b0ed0bb Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 ac38ee8ec3 mes-ptr完善逻辑 6 months ago
jun 4eff9ea7c3 增加芜湖pisces数据源 6 months ago
jun 548113c995 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun 41830d2112 排序工单关闭,队列表也需要关闭 6 months ago
臧学普 43f6a0a227 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 c9b4a85176 修改产线后,解析异常 6 months ago
jun 5545a28001 43647 报表中心:可疑品条码信息-创建时间查询条件无效 6 months ago
jun 9367768764 43663 试制工单不自动关单(芜湖) 6 months ago
jun 7d0b958f40 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun d44b184760 43605 装箱防错:扫描已经发运的条码,未报错 6 months ago
臧学普 adb638b581 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 b99c86e0b9 增加vin号卡控,防止重复生成工单 6 months ago
jun fc00157cbd 装配目视单预览问题修复 6 months ago
jun d402c7b1bf 客户零件类型增加客户代码字段 6 months ago
jun 25d1111e5d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun 6ca8142abb 43661 排序发运扫描条码时,同序号的零件也需要校验扫描顺序 6 months ago
臧学普 9786aeef50 判断vin是否已经生成了S单,如果已经生成S单 则不再生成工单 6 months ago
臧学普 ebd39ef044 注释掉华为obs代码,不需要 6 months ago
臧学普 010663944e Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 a7bc2211d8 vin号已经生成s单则跳过,不在生成工单 6 months ago
jun d59c8cd91e Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java
6 months ago
jun 5e6a5c79ce 装配目视单预览 6 months ago
jun 4a152acc95 报表问题修复 6 months ago
jun d75f570c06 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
jun 0da05f6daf BOM反向查询报表,通用发运报表开发 6 months ago
臧学普 1b536353cd Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 e483cad96a 工单早晚班 6 months ago
jun 478aada794 排序工单下发逻辑调整 6 months ago
jun 96459e9c41 模糊查询--加工记录页面,零件条码状态 6 months ago
jun 94f70a14ec 43590 开关班管理:接班时--90002 系统异常:对象为空 6 months ago
xiangwei.zhang de3cc8bac3 BTO单生成bug修复 6 months ago
jun 03288a28c8 排序手工插单逻辑修改 6 months ago
臧学普 02ce42cec9 创建工单及线末大屏修改 6 months ago
jun 9343e621ee 43555 裁片配方原料配置主数据-不查询is_deleted=1的数据 6 months ago
jun 7b9c3a4faf 芜湖发运增加唯一性校验 6 months ago
jun f41431734b Merge branch 'dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
6 months ago
jun a4a0ac889e 通用导出报表开发 6 months ago
xiangwei.zhang cb196c132f BTO单生成bug修复 6 months ago
臧学普 3582cfca98 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun f8a3b4238c CBR负报工逻辑调整 7 months ago
xiangwei.zhang f295772692 生产工单问题处理 7 months ago
臧学普 67f6688136 装配件增加preCraftCode 7 months ago
臧学普 03914cff95 修改创建创建工单逻辑 7 months ago
jun 97d7e4e65d SPS拉动单打印 7 months ago
jun bc6b3dc5ad 天桥数报表开发 7 months ago
jun 1998911748 查询条件没加工厂代码排查 7 months ago
jun 7448707f54 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 1ada83322a 应急件库位管理演示问题修复 7 months ago
王杰 3c10e80081 排序产品加工规则 7 months ago
臧学普 c7145fa51b 线末大屏 7 months ago
臧学普 6a1779c6f0 线末大屏 7 months ago
jun c40e5c75ee CBR报工逻辑调整 7 months ago
jun effbe4561a 问题修复: 加工规则零件号不能模糊搜索 7 months ago
王杰 e9a9e7827a 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 7 months ago
王杰 99afee831f Merge branch 'dev' into dev-wuhan 7 months ago
王杰 b1c10ef5ab 生产工单 重复的 生产时间字段 临时均写值 后续统一改 7 months ago
xiangwei.zhang c69478ef7d 设备停机记录job修改 7 months ago
王杰 18efcb1c04 Merge branch 'dev' into dev-wuhan 7 months ago
xiangwei.zhang 5137d12b0e 设备停机记录job修改 7 months ago
xiangwei.zhang d96f360a0f 设备停机 7 months ago
jun bc7af54559 客户条码补打 7 months ago
jun e10513f065 流程包含解绑工步[工步参数]逻辑优化 7 months ago
jun 3582d69d72 CBR,排序报工逻辑调整 7 months ago
gsz 45aca5f531 发运单子零件明细修改 7 months ago
gsz df7c69878a 发运单子零件明细修改 7 months ago
gsz 7b56ed23f3 拉动单补打并且插入PrintedSnLog表 7 months ago
xiangwei.zhang 2c1936b5ea Bom导出问题修改 7 months ago
臧学普 370d30fa3e 装配件条码规则如果做了ptr则使用PTR中的零件规则校验 7 months ago
jun 94a22fa575 Merge branch 'dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
7 months ago
gsz ed59acd501 发运单子零件明细修改 7 months ago
xiangwei.zhang 6f23a3fbe0 设备点检明细导入 7 months ago
jun 598aa09f46 工单装配件排序条件 7 months ago
jun 1451cde327 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 4cf06dea83 通用V107Melos数据监控查询 7 months ago
臧学普 4e4a7c527f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
臧学普 fd88e32efb 对列表增加carModelCode 7 months ago
jun b2972119a9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 52ac7e42fd getById方法增加organizeCode条件 7 months ago
王杰 e245d903f0 代码bug 7 months ago
xiangwei.zhang ba81ac12b3 bom递归和报工调整修改 7 months ago
xiangwei.zhang 8830a062c1 bom递归和报工调整修改 7 months ago
xiangwei.zhang b8c938102d bom递归和报工调整修改 7 months ago
gsz 4171dd369b 发运单子零件明细修改 7 months ago
jun 7df7604ffa 客户车型信息新增修改唯一值修改,增加客户工厂代码 7 months ago
臧学普 f4ba3b5da0 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
gsz 98a6a8e5e8 如果拉动组产线跟工单产线不一致 不生成拉动单 7 months ago
jun 39b3edf01f 客户车型信息新增修改提示信息错误 7 months ago
gsz 2971b4d574 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev-wuhan 7 months ago
gsz 709b21c08b 发运单子零件明细 7 months ago
臧学普 9228827ff5 工单生产序号 7 months ago
jun 7519b80b7d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 7c8c9227f0 PC报工逻辑调整 7 months ago
gsz 731cdeeac1 发运零件子零件明细+发运单子零件明细 7 months ago
yxw 2a08888d52 裁片原材料防错 7 months ago
臧学普 82da2d4259 PTR替换数量 7 months ago
臧学普 1870358dc6 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
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 8 months ago
xiangwei.zhang 20690c2ae2 对账单信息 8 months ago
gsz a5ad0e628f 43251 武汉PCN-SPS物料拉动WebService接口修改 8 months ago
yxw b4e75fc493 装配目视单打印 8 months ago
yxw e6782d4b76 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 812a821843 装配目视单打印 8 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
yxw c01cbcb83c 裁片方案、工单增加属性 8 months ago
yxw 9bf51d1990 裁片工单类增加字段 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