Commit Graph

1049 Commits (7d0b958f4002aae0180567b8f12e7b637535fb00)

Author SHA1 Message Date
jun 7d0b958f40 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun d44b184760 43605 装箱防错:扫描已经发运的条码,未报错 9 months ago
臧学普 adb638b581 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 b99c86e0b9 增加vin号卡控,防止重复生成工单 9 months ago
jun fc00157cbd 装配目视单预览问题修复 9 months ago
jun d402c7b1bf 客户零件类型增加客户代码字段 9 months ago
jun 25d1111e5d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 6ca8142abb 43661 排序发运扫描条码时,同序号的零件也需要校验扫描顺序 9 months ago
臧学普 9786aeef50 判断vin是否已经生成了S单,如果已经生成S单 则不再生成工单 9 months ago
臧学普 ebd39ef044 注释掉华为obs代码,不需要 9 months ago
臧学普 010663944e Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 a7bc2211d8 vin号已经生成s单则跳过,不在生成工单 9 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
9 months ago
jun 5e6a5c79ce 装配目视单预览 9 months ago
jun 4a152acc95 报表问题修复 9 months ago
jun d75f570c06 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 0da05f6daf BOM反向查询报表,通用发运报表开发 9 months ago
臧学普 1b536353cd Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 e483cad96a 工单早晚班 9 months ago
jun 478aada794 排序工单下发逻辑调整 9 months ago
jun 96459e9c41 模糊查询--加工记录页面,零件条码状态 9 months ago
xiangwei.zhang de3cc8bac3 BTO单生成bug修复 9 months ago
jun 03288a28c8 排序手工插单逻辑修改 9 months ago
臧学普 02ce42cec9 创建工单及线末大屏修改 9 months ago
jun 9343e621ee 43555 裁片配方原料配置主数据-不查询is_deleted=1的数据 9 months ago
jun 7b9c3a4faf 芜湖发运增加唯一性校验 9 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
9 months ago
jun a4a0ac889e 通用导出报表开发 9 months ago
xiangwei.zhang cb196c132f BTO单生成bug修复 9 months ago
臧学普 3582cfca98 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun f8a3b4238c CBR负报工逻辑调整 9 months ago
xiangwei.zhang f295772692 生产工单问题处理 9 months ago
臧学普 67f6688136 装配件增加preCraftCode 9 months ago
臧学普 03914cff95 修改创建创建工单逻辑 9 months ago
jun 97d7e4e65d SPS拉动单打印 9 months ago
jun bc6b3dc5ad 天桥数报表开发 9 months ago
jun 1998911748 查询条件没加工厂代码排查 10 months ago
jun 7448707f54 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 1ada83322a 应急件库位管理演示问题修复 10 months ago
王杰 3c10e80081 排序产品加工规则 10 months ago
臧学普 c7145fa51b 线末大屏 10 months ago
臧学普 6a1779c6f0 线末大屏 10 months ago
jun c40e5c75ee CBR报工逻辑调整 10 months ago
jun effbe4561a 问题修复: 加工规则零件号不能模糊搜索 10 months ago
王杰 e9a9e7827a 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 10 months ago
王杰 99afee831f Merge branch 'dev' into dev-wuhan 10 months ago
王杰 b1c10ef5ab 生产工单 重复的 生产时间字段 临时均写值 后续统一改 10 months ago
xiangwei.zhang c69478ef7d 设备停机记录job修改 10 months ago
王杰 18efcb1c04 Merge branch 'dev' into dev-wuhan 10 months ago
xiangwei.zhang 5137d12b0e 设备停机记录job修改 10 months ago