#

1

19 小时以前 a00400cf9f975a7dbccf3436cf3b57c1fb476597

#

 src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java

@@ -63,7 +63,7 @@

    public ArmOrderAssignmentParam() {}
    public ArmOrderAssignmentParam(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
        order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+(basArmMast.getSortingLine()+1)%2;
        order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getBindingTags()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+(basArmMast.getSortingLine()+1)%2;
        List<OrderItem> orderItemArrayList= new ArrayList<>();
        OrderItem orderItem = new OrderItem(basArmMast,orderDetlValueResultUtil);
        orderItemArrayList.add(orderItem);

 src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java

@@ -14,4 +14,5 @@
    boolean updateArmMastStatus(@Param("armNo")int armNo, @Param("sortingLine")int sortingLine, @Param("status")int status, @Param("endStatus")int endStatus);
    Double selectOrderDetlAndSku(@Param("orderNo")String orderNo, @Param("sku")String sku);
    OrderDetlValueResultUtil selectOrderDetlValue(@Param("orderNo")String orderNo, @Param("sku")String sku);
    Double selectBasArmMastSignValue(@Param("orderNo")String orderNo, @Param("sku")String sku, @Param("bindingTags")Long bindingTags);
}

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

@@ -9,5 +9,6 @@
    boolean updateArmMastStatus(int armNo,int sortingLine,int status,int endStatus);
    Double selectOrderDetlAndSku(String order,String sku);
    OrderDetlValueResultUtil selectOrderDetlValue(String order, String sku);
    Double selectBasArmMastSignValue(String order, String sku,Long bindingTags);

}

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

@@ -24,4 +24,9 @@
    public OrderDetlValueResultUtil selectOrderDetlValue(String order, String sku){
        return this.baseMapper.selectOrderDetlValue(order,sku);
    }

    @Override
    public Double selectBasArmMastSignValue(String order, String sku,Long bindingTags){
        return this.baseMapper.selectBasArmMastSignValue(order,sku,bindingTags);
    }
}

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

@@ -4254,7 +4254,7 @@
                            continue;
                        }
                        if (basArmMastList.size()>1){
                            armTaskAssignmentCallApiLogSave(staProtocol, "任务待执行数量大于1", "arm编号："+basArm.getArmNo()+"====》拆码垛任务异常禁止下发！！！任务待执行数量大于1！！！", false);
                            armTaskAssignmentCallApiLogSave(staProtocol, "任务待执行数量大于1,无法分辨待执行任务", "arm编号："+basArm.getArmNo()+"====》拆码垛任务异常禁止下发！！！任务待执行数量大于1！！！", false);

//                            log.error("arm编号："+basArm.getArmNo()+"====》拆码垛任务异常禁止下发！！！任务待执行数量大于1！！！");
                            continue;
@@ -4266,6 +4266,7 @@
                                        .eq("sorting_line", basArm.getSortingLineSou())
                                        .eq("sku", basArmMast.getSku())
                                        .eq("order_no", basArmMast.getOrderNo())
                                        .eq("binding_tags", basArmMast.getBindingTags())
                        );
                        if (basArmMastListOrder.size()==1){
                            OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getSku());
@@ -4273,6 +4274,8 @@
                            if (Cools.isEmpty(orderDetlValueResultUtil)){
                                continue;
                            }
                            Double anfmeSign = basArmMastService.selectBasArmMastSignValue(basArmMast.getOrderNo(), basArmMast.getSku(),basArmMast.getBindingTags());
                            orderDetlValueResultUtil.setAnfme(anfmeSign);
                            //订单下发
                            try{
                                ArmOrderAssignmentParam armOrderAssignmentParam = new ArmOrderAssignmentParam(basArmMast,orderDetlValueResultUtil);

 src/main/resources/mapper/BasArmMastMapper.xml

@@ -54,7 +54,7 @@
    </select>

    <select id="selectOrderDetlValue" resultMap="BaseResultMapOrderDetlValue">
        select
        select top 1
            d.man_length,d.width,d.height,d.weight,d.anfme
        from man_order_detl d
        where 1=1
@@ -62,4 +62,16 @@
          and d.matnr = #{sku}
    </select>



    <select id="selectBasArmMastSignValue" resultType="java.lang.Double">
        select top 1
        d.anfme
        from asr_bas_arm_mast_sign d
        where 1=1
        and d.order_no = #{orderNo}
        and d.sku = #{sku}
        and d.create_time = #{bindingTags}
    </select>

</mapper>