Commit Graph

1479 Commits (master)
 

Author SHA1 Message Date
王杰 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
王杰 dac4971115 客户订单号防错工步 7 months ago
jun da7c2b31bd Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun b1f27d6e72 SPS 生成webservice从MES换到PCN 7 months ago
王杰 f1dc9cd261 武汉 非排序 增加打印策略 7 months ago
jun c6bc7781b2 SPS 生成webservice从MES换到PCN 7 months ago
王杰 4b087ed17b 代码优化 7 months ago
jun 62eecf9af4 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 9bfa68401e 排序发运逻辑调整 7 months ago
王杰 cddd64250b 装配件 匹配后 前端列表滚动条自动定位 7 months ago
王杰 7767805389 离线版本 7 months ago
jun 5830b0452b 非排序产线打印客户条码信息 7 months ago
jun 7008d4fea3 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 18b4d11e9b CBR报工逻辑调整 7 months ago
王杰 42241d7411 发送设备加工参数 固定值 不转大写 判断依据是否包含百分号 7 months ago
jun be81832476 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 2579987543 等离子工步写入数据耗时较长 7 months ago
王杰 bd72537b82 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 7 months ago
王杰 25cabf46bb 生产工单 重复的 生产时间字段 上下线时时间 临时写值 后续统一改 7 months ago