#

1

7 小时以前 bd3f1b6d3b0dd7429b6f3974f88e0890a401d968

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -402,6 +402,7 @@
            return R.error("单据编号[order_id]以 "+sign_arm_sku+" 与 "+sign_arm_order+" 作为拆分标记拆分失败！！！");
        }
        if (param.getArm_no()>4){
            openService.taskArmOrderResult(param);
            return R.ok();
        }


 src/main/java/com/zy/asrs/service/OpenService.java

@@ -57,5 +57,6 @@
    boolean agvApplicationPassedTheGrating(ArmAgvGratingParam param);
    boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param);
    boolean agvBindAndBin(String taskNo);
    boolean taskArmOrderResult(OrderArmEndParam param);

}

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

@@ -802,6 +802,22 @@

    @Override
    @Transactional
    public boolean taskArmOrderResult(OrderArmEndParam param){
        if(param.getDone_num() == 0){
            if(basArmMastService.delete(new EntityWrapper<BasArmMast>().eq("arm_no",param.getArm_no())
                    .eq("status",1))){
                return true;
            }
        }
        if(param.getDone_num() == 1){
            return true;
        }
        log.error("未找到对应任务"+ param);
        return false;
    }

    @Override
    @Transactional
    public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
        BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
                new EntityWrapper<BasArmMastSign>()