#和得服务器

1

7 天以前 f0adc332d570cde0084bce7372ae7b9653b8c93b

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -619,18 +619,6 @@
        );
        if (Cools.isEmpty(basArmMastOld)){
            basArmMastService.insert(basArmMast);
            try{
                BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
                        new EntityWrapper<BasArmMastSign>()
                                .eq("matnr", param.getSku())
                                .eq("order_no", param.getOrderNo())
                );
                if (Cools.isEmpty(basArmMastSign)){
                    basArmMastSign.setStatus(1);
                    basArmMastSignService.updateById(basArmMastSign);
                }
            } catch (Exception e){
            }
        } else {
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
        }
@@ -646,6 +634,19 @@
        );
        if (Cools.isEmpty(basArm)){
            throw new CoolException("机械臂配置异常，查询不到机械臂数据！！！"+ JSON.toJSONString(param));
        }

        try{
            BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
                    new EntityWrapper<BasArmMastSign>()
                            .eq("matnr", param.getSku())
                            .eq("order_no", param.getOrderNo())
            );
            if (!Cools.isEmpty(basArmMastSign)){
                basArmMastSign.setStatus(1);
                basArmMastSignService.updateById(basArmMastSign);
            }
        } catch (Exception e){
        }

        BasArmMast basArmMastListError = basArmMastService.selectOne(
@@ -740,7 +741,6 @@
        }
        BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
                new EntityWrapper<BasArmMastSign>()
                        .eq("matnr", param.getSku())
                        .eq("order_no", param.getOrderNo())
                        .eq("create_time", basArmMastSign.getCreateTime())
                        .eq("status", 0)