Commit Graph

1633 Commits (96f0278f472de0112d2fd24b55e9c8c9413a5a1d)

Author SHA1 Message Date
xiangwei.zhang 53bd4ea26f Merge remote-tracking branch 'origin/dev' into dev 5 months ago
xiangwei.zhang 692a6f59e4 修复抛异常,但报工数量依然增加 5 months ago
王杰 edd8f83bc0 44296 查询bom信息考虑失效时间 5 months ago
xiangwei.zhang 872c8d629e 修复抛异常,但报工数量依然增加 5 months ago
王杰 c737d7bd54 代码 回退到 11日的版本 5 months ago
王杰 47cc8d6261 44263 PCN装箱防错:满箱关箱后,提示“当前箱条码已完成装箱。请扫描下一个箱条码” 5 months ago
jun f0a3faa7da fix bug #44263 PCN装箱防错:满箱关箱后,提示“当前箱条码已完成装箱。请扫描下一个箱条码” 5 months ago
王杰 1dedd5646a 44290 开关班管理,选完产线后自动退出到登录页面 5 months ago
jun 11824a69b7 查询bom信息考虑失效时间 5 months ago
jun e8ba2050da 44263 PCN装箱防错:满箱关箱后,提示“当前箱条码已完成装箱。请扫描下一个箱条码” 5 months ago
王杰 01ec9b90c7 44153 产品下线后,再次扫描,报错需要提醒该条码已完成下线 5 months ago
jun fe8083d9ce 非排序汇报job问题修复(报工数量成倍增加) 5 months ago
王杰 29c2d60e1c 生产过程控制 监控日志信息 修复 工单号条码物料字段未赋值的问题 5 months ago
王杰 ba90fa9666 非排序 显示装配件工步: 判断工单数量完成的提示信息优化 5 months ago
王杰 d2f2a5818c 非排序 工单完成 状态没有修改已完成问题修复 5 months ago
xiangwei.zhang bebe3d38f1 报工sql优化 5 months ago
jun 82a40b2087 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
jun 4ef8c28cd2 汇报job,按照产线类型区分排序条件 5 months ago
王杰 b775ab0fa1 修复一: 非排序第一个工位选了工单 order01,扫了主条码 sn001,产成是P1,不汇报;第二个工位不选工单, 扫描了上一个工位的主条码sn001,产成是P2,汇报, ---> 会导致 直接汇报到 order01上; 修复二:非排序选了工单显示装配件列表工单号一列没有值 5 months ago
王杰 4b1ef6b91c 修改 读主条码工步 提示信息 5 months ago
jun 1379930bf1 fix #bug44179 PCN电子化检验:期望创建状态的条码也可以做电子化检验 5 months ago
jun 61b9c9b7a8 等离子,包装解绑工步异常 5 months ago
xiangwei.zhang 10db05f522 发运加同步状态 5 months ago
xiangwei.zhang 43f551f8b8 发运加同步状态 5 months ago
xiangwei.zhang 0224908f94 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
jun f67056ef9b 返工完成空指针 5 months ago
xiangwei.zhang 592a6e0b39 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
xiangwei.zhang 95ec43db79 生产点检问题 5 months ago
jun 3d57953e27 芜湖发运,总成类型如果没有维护,同一个箱子里面不校验顺序 5 months ago
jun f82e72720f 武汉排序发运开启记忆问题修 5 months ago
jun 66d61a9d33 点检单生成,单号规则生成逻辑调整 5 months ago
jun f6ca8cdbce 装箱防错校验工艺 5 months ago
jun 9a2ff8cb0b 芜湖装箱防错增加校验零件号是否一致 5 months ago
jun 0850df7369 武汉cockpit发运防错按照散件方式写入 5 months ago
jun 642bb9a285 返工打印新条码,加工记录,装配件记录,返工单记录同步标识未更新 6 months ago
王杰 b7ec1aa8c1 非排序/排序 前道防错 工序最大执行次数 验证 问题修复 ; 工单修改工步 变更工单状态问题修复 6 months ago
jun c8ef2c8044 fix #bug 44007 排序发运增加客户订单号写入到mes_jis_shipping字段:按照广州工厂装车单字段写入。 6 months ago
jun 6fd0aad3b0 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/MesNoSortCustSnNumberRuleStrategyService.java
6 months ago
jun a4a0390c6b 非排序生成条码规则和排序产线保持一致,特殊符号转ASCII码 6 months ago
王杰 1e010f0b71 pcn 武汉 非排序 生产通用的单件条码 增加实现 生成后再转换 6 months ago
jun 280cb1fedb 非排序生成条码规则和排序产线保持一致,特殊符号转ASCII码 6 months ago
王杰 a3ec5cfcd8 JIS 6 months ago
xiangwei.zhang 9f302719b9 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun 06bfac538f 43890 工单加工记录报表-试制工单,汇报状态修改成"无需汇报" 6 months ago
jun 5776846493 fix #bug 43977 芜湖正式环境边缘端,质检单明细表,同步状态写入为1,且有写同步状态。 6 months ago
jun 944a5029cc 装箱防错一个条码只能存在一个箱子里面 6 months ago
王杰 7e0ac2e086 目视单打印 增加日志 6 months ago
王杰 8b2a2ab8df 拉动单打印 6 months ago
王杰 9134ed28aa 拉动单打印 增加 LOCK 6 months ago
jun 1653a62923 SPS拉动单打印顺序调整 6 months ago
jun 49bc4a3d46 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun 8d689bc828 产品首检,产品末检可以只扫描一个产品条码 6 months ago
王杰 7e15f04548 离线数据回传解析增加补偿逻辑 6 months ago
xiangwei.zhang 7ea2cdb482 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
xiangwei.zhang 4d9a028d82 前一天报工改成前20天 6 months ago
jun c7c39b4212 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun 1c7193c555 装箱防错记录用户上次操作是否记忆 6 months ago
王杰 0dd22c25b8 打印 目视单 6 months ago
王杰 65cc90bf1d 修改枚举 6 months ago
王杰 697b20035e 打印目视单 6 months ago
jun 7c979a9e53 43890 工单加工记录报表-试制工单,汇报状态修改成"无需汇报" 6 months ago
jun d459d86432 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun d5f7d1dd34 点检功能点优化 6 months ago
王杰 6a28eeccb9 jis拉动单明细列增加车型代码列 6 months ago
jun 8edddb1bc0 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun a2a750489f 43927 装箱防错逻辑更新及优化 6 months ago
臧学普 a136ddb882 离线客户条码打印 6 months ago
臧学普 648a4974b8 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
臧学普 3781965798 离线客户条码打印 6 months ago
王杰 d4e349fc4c jis拉动单明细 列表增加 车型代码 车型名称 属性列显示 6 months ago
王杰 8663a26356 Merge branch 'dev-wuhan-temp' into dev 6 months ago
王杰 abc094b35a jis拉动单明细 列表增加 车型代码 车型名称 属性列显示 6 months ago
王杰 b93e9c737c jis拉动单明细 列表增加 车型代码 车型名称 属性列显示 6 months ago
臧学普 6554e176f4 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 fe3c342dee 离线客户条码打印 6 months ago
王杰 7c2b9b4982 Merge branch 'dev' into dev-wuhan-temp 6 months ago
jun 1010785c42 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
王杰 6e2ce20b3b 展示组件 初始化 时禁用扫描框 ; 排序工单 及条码 的上线时间赋值 扫描工单的时间 6 months ago
jun 9eed422dd7 InternalBarcodeDP条码规则去掉零件号后四位拼接 6 months ago
王杰 84a8175ed7 工位按钮 6 months ago
jun 7dd491c468 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun 36422df8eb 装配目视单查询每次查询4条数据 6 months ago
王杰 16d03491d3 打印 增加零件条码参数属性;离线部分代码提交;选择工单按钮 开始结束查询条件默认值接口返回; 6 months ago
jun a3d92f9372 点检单id信息不存在报错 6 months ago
jun 7aab622f76 目视单打印空指针 6 months ago
臧学普 34f8cb319f Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 18fee22d4f 打印目视单-装配件有相同展示序号的零件需要合并 6 months ago
jun c201703e5c 点检单页面查询问题修复 6 months ago
jun f079ee5f03 生产过程控制查询工单增加时间查询条件 6 months ago
jun 50c46a27e4 43770 装箱防错需要增加工艺防错 6 months ago
jun d7587a5bb6 生产过程控制,查询工单增加班次范围查询条件 6 months ago
臧学普 a3c5a034fe Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 82afd7d558 打印目视单重复-增加redis锁,防止一个产线和零件生产组发送同时有多个请求,获取到相同的数据进行打印 6 months ago
jun 996af9cf85 设备点检功能变更开发 6 months ago
jun ac90d30220 设备点检最新方案调整 6 months ago
臧学普 d2e0a8649e 打印目视单-PTR转P 6 months ago
王杰 febca18a14 离线表 6 months ago
王杰 402de6f23b 离线 6 months ago
jun 649d66e90f Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun ce72090531 排序汇报逻辑调整 6 months ago
jun 0852177791 发运问题修复 6 months ago
臧学普 5df4a7dc80 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 25358f36df 打印目视单-description 6 months ago
jun c0c2b0f92b mes_jis_shipping表增加发运组字段 6 months ago
王杰 624fcce42b 可复用条码 bug 6 months ago
jun b1941ee5ac Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun 51567a7b7f 广州发运慢问题修复 6 months ago
王杰 490ca9a003 排序装配件 逻辑调整 6 months ago
jun 824ffb83b4 排序发运校验扫描确认零件方式是否维护 6 months ago
jun 8305c1b75a SPS拉动单顺序,增加客户单号 6 months ago
臧学普 f1b2f1ce53 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 a529a5fb77 打印目视单-description 6 months ago
王杰 1c3e2656d8 排序 跳过 6 months ago
臧学普 90438bf32a Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
王杰 bb78d98afc 注释代码 6 months ago
臧学普 9d14b66fcb 装配目视单打印时间 6 months ago
jun c31a240bbc SPS单据打印优化,增加每次查询条数 6 months ago
王杰 872f8e9413 去除离线生产配置 6 months ago
jun c3d079fa83 Merge branch 'dev' into dev-wuhan-temp
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
6 months ago
jun 21b501f5fd 合并冲突 6 months ago
jun a25c3993c5 SPS单据打印车型名称 6 months ago
xiangwei.zhang 3509bc88d2 MesJisShipping carNo 赋值问题 6 months ago
王杰 f95fbb750d 装配件前道防错 bug 6 months ago
xiangwei.zhang 63bf825875 点检校验设备id 6 months ago
jun 4051f5889f 生产控制选择工单时,查询零件条件无效 6 months ago
jun d8335872e4 非排序CBR汇报,bom_size值错误 6 months ago
jun 93dd002b40 JIS拉动报空指针异常 6 months ago
jun 4d80911aef 电子化检验问题修复 6 months ago
jun f297e1c4c5 客户条码打印问题修复 6 months ago
jun 4aed6c4887 SPS拉动单据打印优化 6 months ago
xiangwei.zhang 77c351c23d BTO工单报工,工作中心用生产版本的工作中心 6 months ago
xiangwei.zhang 1d1911a8ad 首检,打印条码也能首检 6 months ago
jun a2dc24de4c 发运增加扫描日志信息 6 months ago
jun 5d48b239ff Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun 07e0329195 打印模板问题修复 6 months ago
王杰 1041100674 自进自出 生成重复条码 问题修改 6 months ago
xiangwei.zhang a7e53047ab 工单报工问题 6 months ago
jun a0e5401b33 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun a92e9ab627 打印模板事务问题修复 6 months ago
王杰 bf013da537 防错 非排序 逻辑调整 6 months ago
王杰 4305ea53ab Merge branch 'dev-wuhan-temp' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan-temp 6 months ago
jun 6855811584 排序发运扫描提示信息 6 months ago
jun 2d58f43022 发运扫描提示信息 6 months ago
王杰 a237d0672e 可复用 逻辑重写 6 months ago
jun 5e3ada454c Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun 4a6eba09aa 43605 装箱防错:扫描已经发运的条码,未报错 6 months ago
王杰 42e0c41afd 装配件 6 months ago
王杰 79ed2e8c90 裁片 6 months ago
jun dccae499f3 43661 排序发运扫描条码时,同序号的零件也需要校验扫描顺序 6 months ago
xiangwei.zhang f3cc04669f Merge branch 'dev' into dev-wuhan-temp
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
6 months ago
臧学普 a319b05ce9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
王杰 cfd48f4b3e 包装定义 字段错误 6 months ago
王杰 1e146c8596 裁片工单工步 修改 6 months ago
臧学普 a0e27add57 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
王杰 dae94f2c07 装配件二次确认 排序线 6 months ago
jun 72b58c2130 43624 返工作业:打印新条码后,单据无法点击返工完成。 6 months ago
jun 0e2fb59a96 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 0742266b50 排序发运校验客户零件号 7 months ago
王杰 15f8d56864 离线同步JOB 7 months ago
jun 880efd60cd 报表问题修复 7 months ago
xiangwei.zhang 4a40b51e9a 设备停机合并 7 months ago
xiangwei.zhang d924f8a73d 关闭的单据也需要报工 7 months ago
臧学普 3d77e70d79 离线检查是否拉数据 7 months ago
jun e562fd8a48 PCN开关班次问题处理 7 months ago
jun 3b3e8014b5 武汉汇报job&装配目视单打印问题修复 7 months ago
jun 36560566f1 43590 开关班管理:接班时--90002 系统异常:对象为空 7 months ago
臧学普 f682deee4d Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 e689db4edb 重构sps代码 7 months ago
王杰 e4776fe0df 扫描产成零件编码 工步 7 months ago
jun c0ed1c8ce8 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 7ebec5bbe2 裁片原材料防错-扫描条码提示信息修改 7 months ago
王杰 b5459b68f8 扫描产成零件工步 7 months ago
jun 61c351f458 芜湖发运增加唯一性校验 7 months ago
jun 393461a03e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 1d12047d10 通用导出报表开发 7 months ago
xiangwei.zhang 26bc0bcab8 设备停机修改 7 months ago
王杰 d61b2aa000 Merge branch 'dev' into dev-wuhan-temp 7 months ago
王杰 d693da28c8 扫描产成零件工步 7 months ago
jun b5ccdf6521 芜湖客户条码打印 7 months ago
jun 70e8529c4f CBR负报工逻辑调整 7 months ago
jun bd3ee9e8f7 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 7d1cc9b556 SPS拉动单打印 7 months ago
臧学普 540612bf09 重构sps代码 7 months ago
臧学普 98589ffecb Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 4599f24b25 重构sps代码 7 months ago
jun be0b341aed 天桥数报表开发 7 months ago
王杰 0c7016e070 点位表 接口逻辑表 修改时间 没有值 导致程序报错 问题修复 7 months ago
王杰 96c55eaad5 排序装配件 保存 记录 bug 修复 7 months ago
jun 3f876fadc7 非排序CBR汇报 7 months ago
臧学普 99ab2c2d85 重构sps代码 7 months ago
臧学普 12ca42f386 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 42653ea0fd 重构sps代码 7 months ago
jun 84361a3027 查询条件没加工厂代码排查 7 months ago
臧学普 5c53be2c16 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java
7 months ago
臧学普 08b0b58982 重构sps代码 7 months ago
王杰 bc8533f0c8 装配件 唯一性 验证 增加 模内验证 7 months ago
jun 827ba97c7b 应急件库位管理演示问题修复 7 months ago
xiangwei.zhang bf5f6b5c99 设备停机修改 7 months ago
jun e2433f1a78 打印模板调整 7 months ago
王杰 f021479878 采集数据 trim 7 months ago