#

1

3 天以前 7854ae23200087e362bbe3eb08cda0f96a73e177

#

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

@@ -774,7 +774,7 @@
        if (Cools.isEmpty(basArmMast)){
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
        }
        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
//        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
    }


 src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java

@@ -35,7 +35,7 @@
    @Autowired
    private BasArmMastSignService basArmMastSignService;

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/3 * * * * ? ")
    private void orderToSortLine() {
        //获取未下发单据
        List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -236,9 +236,9 @@
                                    // 更新字段
                                    if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
                                    if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
                                    if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length);
                                    if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height);
                                    if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width);
                                    if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length1);
                                    if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height1);
                                    if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width1);
                                    if (mat.getCreateTime().compareTo(sdf1.parse(createTime)) != 0)
                                        mat.setCreateTime(sdf1.parse(createTime));
                                    mat.setUpdateTime(modifyTime);