Commit Graph

1215 Commits (master)

Author SHA1 Message Date
臧学普 5f75e8cfb1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 6 months ago
臧学普 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