Commit Graph

1115 Commits (0250db7d47f95bd27df438a1b40262bb6b252bab)

Author SHA1 Message Date
jun 97d7e4e65d SPS拉动单打印 8 months ago
jun bc6b3dc5ad 天桥数报表开发 8 months ago
jun 1998911748 查询条件没加工厂代码排查 8 months ago
jun 7448707f54 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 1ada83322a 应急件库位管理演示问题修复 8 months ago
王杰 3c10e80081 排序产品加工规则 8 months ago
臧学普 c7145fa51b 线末大屏 8 months ago
臧学普 6a1779c6f0 线末大屏 8 months ago
jun c40e5c75ee CBR报工逻辑调整 8 months ago
jun effbe4561a 问题修复: 加工规则零件号不能模糊搜索 8 months ago
王杰 e9a9e7827a 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 8 months ago
王杰 99afee831f Merge branch 'dev' into dev-wuhan 8 months ago
王杰 b1c10ef5ab 生产工单 重复的 生产时间字段 临时均写值 后续统一改 8 months ago
xiangwei.zhang c69478ef7d 设备停机记录job修改 9 months ago
王杰 18efcb1c04 Merge branch 'dev' into dev-wuhan 9 months ago
xiangwei.zhang 5137d12b0e 设备停机记录job修改 9 months ago
xiangwei.zhang d96f360a0f 设备停机 9 months ago
jun bc7af54559 客户条码补打 9 months ago
jun 3582d69d72 CBR,排序报工逻辑调整 9 months ago
gsz 45aca5f531 发运单子零件明细修改 9 months ago
gsz df7c69878a 发运单子零件明细修改 9 months ago
gsz 7b56ed23f3 拉动单补打并且插入PrintedSnLog表 9 months ago
xiangwei.zhang 2c1936b5ea Bom导出问题修改 9 months ago
臧学普 370d30fa3e 装配件条码规则如果做了ptr则使用PTR中的零件规则校验 9 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
9 months ago
gsz ed59acd501 发运单子零件明细修改 9 months ago
xiangwei.zhang 6f23a3fbe0 设备点检明细导入 9 months ago
jun 598aa09f46 工单装配件排序条件 9 months ago
jun 1451cde327 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 4cf06dea83 通用V107Melos数据监控查询 9 months ago
臧学普 4e4a7c527f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 fd88e32efb 对列表增加carModelCode 9 months ago
jun b2972119a9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 52ac7e42fd getById方法增加organizeCode条件 9 months ago
王杰 e245d903f0 代码bug 9 months ago
xiangwei.zhang ba81ac12b3 bom递归和报工调整修改 9 months ago
xiangwei.zhang 8830a062c1 bom递归和报工调整修改 9 months ago
xiangwei.zhang b8c938102d bom递归和报工调整修改 9 months ago
gsz 4171dd369b 发运单子零件明细修改 9 months ago
jun 7df7604ffa 客户车型信息新增修改唯一值修改,增加客户工厂代码 9 months ago
臧学普 f4ba3b5da0 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
gsz 98a6a8e5e8 如果拉动组产线跟工单产线不一致 不生成拉动单 9 months ago
jun 39b3edf01f 客户车型信息新增修改提示信息错误 9 months ago
gsz 2971b4d574 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev-wuhan 9 months ago
gsz 709b21c08b 发运单子零件明细 9 months ago
臧学普 9228827ff5 工单生产序号 9 months ago
jun 7519b80b7d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 7c8c9227f0 PC报工逻辑调整 9 months ago
gsz 731cdeeac1 发运零件子零件明细+发运单子零件明细 9 months ago
yxw 2a08888d52 裁片原材料防错 9 months ago
臧学普 82da2d4259 PTR替换数量 9 months ago
臧学普 1870358dc6 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
pzj 3f3241d235 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 8e204baadf 报工增加bom总行数字段 9 months ago
gsz f1c2f71e87 43326 电子化检验,发送给QMS的数据,按照零件号+责任人类型分组发送 9 months ago
臧学普 199565901d 装配件表修改字段 9 months ago
臧学普 ee1e45f425 增加缺少字段-装配件表 9 months ago
pzj 7163788a67 看板优化 9 months ago
pzj a5e1681537 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 f576b00669 按包装圆整异常日志打印 9 months ago
pzj c3269181c0 完善报表查询条件 9 months ago
xiangwei.zhang d6a9d33105 对账单信息 9 months ago
pzj 19fc69a084 完善站点和辊道基础数据 9 months ago
pzj 4437d06c96 装配件查询、发运明细报表、可疑品条码信息、检验产品数据子报表 9 months ago
臧学普 2aef1f2e7b 添加缺少字段 9 months ago
臧学普 4c6ee6446e 添加缺少字段 9 months ago
臧学普 fb62ba21db Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 a5eef7febd 添加缺少字段 9 months ago
yxw 943c15aeb6 PC端装配目视单打印策略类字段引用修改 9 months ago
gsz 2f36e42def 43285 JIS拉动问题优化 9 months ago
jun d4971b0cd7 零件拉动组明细更新排除自己 9 months ago
臧学普 c838de8675 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 76334222d0 武汉工单--增加包工的装配件 9 months ago
yxw 3e85d967ae 装配目视单补打逻辑优化 9 months ago
yxw 9878633805 1、MesProductionPartContext 增加cutQty(裁片工单数量)
2、裁片工单绑定问题修复
9 months ago
王杰 a80e653f08 Merge branch 'dev' into dev-wuhan 9 months ago
xiangwei.zhang 20690c2ae2 对账单信息 9 months ago
gsz a5ad0e628f 43251 武汉PCN-SPS物料拉动WebService接口修改 9 months ago
yxw b4e75fc493 装配目视单打印 9 months ago
yxw e6782d4b76 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 812a821843 装配目视单打印 9 months ago
gsz bcadbdb396 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev-wuhan 9 months ago
gsz 926dba8f22 SPS拉动演示问题修改 9 months ago
yxw 73d79d988c 排序工单发布新增装配目视单 9 months ago
yxw af45d9a655 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 ecf2f7d4e4 武汉工单--插入打印工单打印队列 9 months ago
yxw 6768e2802d 装配目视单预览 9 months ago
gsz 5190826722 拉动单规则修改-拉动组号+年月日+工单后5位 9 months ago
gsz fb9c1904ee 拉动单规则修改-拉动组号+年月日+工单后5位 9 months ago
gsz e295ce41a1 拉动单规则修改-拉动组号+年月日+工单后5位 9 months ago
臧学普 a7c909deb9 武汉工单工单号拼接位工厂代码+工单类型 +客户工厂代码+班次+流水号,numberRule只需要生成流水号 9 months ago
pzj 6e66dc7645 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
pzj e130754448 包装组零件规则基础数据主、明细 9 months ago
臧学普 99c177d7ab 武汉工单零件生产组名称 9 months ago
pzj 6d2a8087e9 裁片基础数据完善 9 months ago
臧学普 cc73d3286d 武汉工单生产时间字段 9 months ago
臧学普 e0fa41d549 武汉工单调整代码顺序 9 months ago
臧学普 df68ae5c09 武汉工单生成队列和序列号 9 months ago
xiangwei.zhang 2e525494c6 对账报表 9 months ago
臧学普 3ee557b0c0 武汉工单生成队列和序列号 9 months ago
臧学普 9c6147f706 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 7c82801377 装配目视单打印 9 months ago
pzj edb6dea585 完善站点信息基础数据校验 9 months ago
pzj 45395bd4d6 辊道设备配置基础数据 9 months ago
臧学普 68f09d4fcf 武汉工单生成队列和序列号 9 months ago
jun 6162899689 CBR报工逻辑调整 9 months ago
yxw 40f8093dd7 新增打印工单打印队列 9 months ago
yxw 3d44436371 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 29dd614d4b 新增打印工单打印队列 9 months ago
pzj 2dbe97741d 裁片设备维护基础数据完善 9 months ago
yxw 9cfe026727 排序产线工单发布新增装配目视单打印队列 9 months ago
pzj b50fdbe357 裁片方案基础数据问题完善 9 months ago
pzj 1ee988c030 站点信息基础数据 9 months ago
yxw 43ed15739c 裁片工单打印优化 9 months ago
gsz dd8464903f 43172 点检主数据主表导入和新增时,基于设备代码排序 9 months ago
gsz 286c1c9b59 JIS物料拉动 规则校验设置颜色 9 months ago
gsz 19acc121d2 设备实时值查询 问题 9 months ago
pzj d02f6ef9fb 裁片基础数据 长度修改类型校验 9 months ago
pzj 5641d27974 裁片基础数据 裁片长度修改类型、裁片配置、裁片原材料配置、裁片成品配置、裁片设备配置、裁片设备配置明细、裁片设备配置设备加工参数 9 months ago
pzj 182186077c 等离子基础数据 可回用包装类型、可回用包装、可回用包装零件 9 months ago
yxw fdc43ddb1a PCN裁片工单打印 9 months ago
yxw 5a12b1a7c5 裁片工单打印调整 9 months ago
gsz 737efb5fca 43155 MES-PC:拉动单明细页面问题 9 months ago
臧学普 eceb7d9b5e 修改生成工单 9 months ago
yxw 91f38ad6ae Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 54627db4b1 裁片工单标签打印 9 months ago
xiangwei.zhang 896f6d5aed 对账单信息 9 months ago
jun 0939fe5e6e Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun e0a911defd 工单装配件 工单零件报表开发 9 months ago
yxw 15c92222d6 裁片工单标签打印 9 months ago
jun 5fdc86f857 查询bom增加生效开始时间分组 9 months ago
jun b77d89ecbf 根据勾选的发运单同步WMS,根据发运单关联对应的装车单;
发运单、装车单增加备注的筛选条件,文本框,支持模糊输入;
9 months ago
yxw cf56f4b7d2 裁片功能优化 9 months ago
yxw 28401a36dd 裁片功能优化 9 months ago
yxw 320248e262 裁片工单标签打印接口开发 9 months ago
yxw ead750c4df Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
yxw 7f17a0edf1 裁片工单标签打印接口开发 9 months ago
臧学普 875883685d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
臧学普 3a7cb17dab 武汉客户条码生成 10 months ago
yxw 1d29f10f6f 包装定义增加显示客户名称、工单增加可允许多种工单状态查询 10 months ago
gsz dcff64a03d 43112 MES:PC拉动单页面问题 6.同一拉动组-根据工位代码&零件号做唯一校验 10 months ago
gsz b9ea5084fe 缺陷记录表增加查询条件 10 months ago
xiangwei.zhang 7a847d4a53 对账单信息 10 months ago
xiangwei.zhang 7b070c8bbd 新增导入信息 10 months ago
xiangwei.zhang b86fbdbd3d 对账单信息 10 months ago
xiangwei.zhang 111b90fcb3 对账单信息 10 months ago
xiangwei.zhang d8d0c0721a 对账单信息 10 months ago
yxw 50066b2ab5 裁片功能-》弹框展示成品列表Function 10 months ago
gsz 97a1df04d8 43100 设备点检设置明细导入完成后,期望序列号可以正排 10 months ago
gsz 9895965c75 43050 报废条码的查询与报表打印 10 months ago