*

L

14 小时以前 86c90f3262023af0ac4ce304f819608e73f54d92

*

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

@@ -625,9 +625,17 @@
    @Override
    @Transactional
    public void taskArmCycleResult(TaskArmCycleResultParam param) {
        BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
                .eq("arm_no", param.getArm_no())
                .eq("sta_no", Integer.parseInt(param.getStaNo()))
                .eq("status", 1)
        );
        if (Cools.isEmpty(basArm)){
            throw new CoolException("机械臂配置异常，查询不到机械臂数据！！！"+ JSON.toJSONString(param));
        }
        BasArmMast basArmMast = basArmMastService.selectOne(
                new EntityWrapper<BasArmMast>()
                        .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo())))
                        .eq("sorting_line", basArm.getSortingLineSou())
                        .eq("arm_no", param.getArm_no())
                        .eq("status", 1)
        );
@@ -642,9 +650,17 @@
    @Override
    @Transactional
    public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
        BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
                .eq("arm_no", param.getArm_no())
                .eq("sta_no", Integer.parseInt(param.getId()))
                .eq("status", 1)
        );
        if (Cools.isEmpty(basArm)){
            throw new CoolException("机械臂配置异常，查询不到机械臂数据！！！"+ JSON.toJSONString(param));
        }
        BasArmMast basArmMast = basArmMastService.selectOne(
                new EntityWrapper<BasArmMast>()
                        .eq("sta_no", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getId())))
                        .eq("sta_no", basArm.getStaNoSou())
                        .eq("arm_no", param.getArm_no())
                        .eq("status", 2)
        );
@@ -657,9 +673,17 @@
    @Override
    @Transactional
    public void taskArmWorkOrderStatus(OrderArmEndParam param) {
        BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
                .eq("arm_no", param.getArm_no())
                .eq("sta_no", Integer.parseInt(param.getStaNo()))
                .eq("status", 1)
        );
        if (Cools.isEmpty(basArm)){
            throw new CoolException("机械臂配置异常，查询不到机械臂数据！！！"+ JSON.toJSONString(param));
        }
        BasArmMast basArmMast = basArmMastService.selectOne(
                new EntityWrapper<BasArmMast>()
                        .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo())))
                        .eq("sorting_line",basArm.getSortingLineSou())
                        .eq("arm_no", param.getArm_no())
                        .eq("status", 5)
        );

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

@@ -73,9 +73,9 @@
                    // 组装物料信息
                    OrderToLine.MatList matMix = new OrderToLine.MatList(
                            orderDetl.getMatnr(),  // matnr -> sku
                            orderDetl.getSupp(),  //  supp -> po
                            orderDetl.getStandby1(),  //  supp -> po
                            orderDetl.getAnfme(),          //    余料 -> 剩余余料统一时间戳标记
                            orderDetl.getSku(),   //barcode -> upc 条码
                            orderDetl.getStandby2(),   //barcode -> upc 条码
                            1,
                            null,   //origin -> supplier 货源
                            bindingTag        //余料标记相同
@@ -88,9 +88,9 @@
                    // 组装物料信息
                    OrderToLine.MatList mat = new OrderToLine.MatList(
                            orderDetl.getMatnr(),  // matnr -> sku
                            orderDetl.getSupp(),  //  supp -> po
                            orderDetl.getStandby1(),  //  supp -> po
                            orderDetl.getAnfme(),   //整料
                            orderDetl.getSku(),   //barcode -> upc
                            orderDetl.getStandby2(),   //barcode -> upc
                            1,
                            null,   //origin -> supplier 货源
                            System.currentTimeMillis()