#

lsh

19 小时以前 5ae3b6c3d604f16c2ecc5057d720d5d79c8c091b

#

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

@@ -44,7 +44,7 @@
            public SKUInfo() {};

            public SKUInfo(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil){
                id = basArmMast.getSku();
                id = basArmMast.getMatnr();
                length = orderDetlValueResultUtil.getLength();
                width = orderDetlValueResultUtil.getWidth();
                weight = orderDetlValueResultUtil.getWeight();
@@ -63,7 +63,7 @@

    public ArmOrderAssignmentParam() {}
    public ArmOrderAssignmentParam(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
        order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getBindingTags()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+(basArmMast.getSortingLine()+1)%2;
        order_id = basArmMast.getMatnr()+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/entity/param/CombParam.java

@@ -51,7 +51,7 @@

        // 规格
        private String specs = "";
        private String supp = "";
//        private String supp = "";

        // sku
        private String sku = "";
@@ -63,12 +63,13 @@
        }
        public CombMat(BasArmMast basArmMast) {
            this.orderNo = basArmMast.getOrderNo();
            this.matnr = basArmMast.getSku();
            this.matnr = basArmMast.getMatnr();
//            this.batch = basArmMast.getCreateTime().toString();
            this.anfme = basArmMast.getCtns().doubleValue();
            this.standby1 = basArmMast.getPo();
            this.standby2 = basArmMast.getUpc();
            this.supp = basArmMast.getSupplier();
            this.standby3 = basArmMast.getSku();
//            this.supp = basArmMast.getSupplier();
        }
    }


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

@@ -12,7 +12,7 @@
public interface BasArmMastMapper extends BaseMapper<BasArmMast> {

    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);
    Double selectOrderDetlAndSku(@Param("orderNo")String orderNo, @Param("matnr")String matnr);
    OrderDetlValueResultUtil selectOrderDetlValue(@Param("orderNo")String orderNo, @Param("matnr")String matnr);
    Double selectBasArmMastSignValue(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("bindingTags")Long bindingTags);
}

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

@@ -7,8 +7,8 @@
public interface BasArmMastService extends IService<BasArmMast> {

    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);
    Double selectOrderDetlAndSku(String order,String matnr);
    OrderDetlValueResultUtil selectOrderDetlValue(String order, String matnr);
    Double selectBasArmMastSignValue(String order, String matnr,Long bindingTags);

}

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

@@ -16,17 +16,17 @@
    }

    @Override
    public Double selectOrderDetlAndSku(String order,String sku){
        return this.baseMapper.selectOrderDetlAndSku(order,sku);
    public Double selectOrderDetlAndSku(String order,String matnr){
        return this.baseMapper.selectOrderDetlAndSku(order,matnr);
    }

    @Override
    public OrderDetlValueResultUtil selectOrderDetlValue(String order, String sku){
        return this.baseMapper.selectOrderDetlValue(order,sku);
    public OrderDetlValueResultUtil selectOrderDetlValue(String order, String matnr){
        return this.baseMapper.selectOrderDetlValue(order,matnr);
    }

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

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

@@ -4379,7 +4379,7 @@
                            //arm任务完成自动组托
                            ReturnT<String> result = new PostMesDataUtils().postMesData("arm任务完成自动组托",wmsUrl, wmsComb, combParam);
                            if (result.getCode()==200){
                                basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLineSou(),3,4);
                                basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLineSou(),3,5);
                            } else {
                                armTaskAssignmentCallApiLogSave(staProtocol, "自动组托失败", staProtocol.getSiteId()+"码垛位置，===》自动组托失败，等待重试", false);
//                                log.error("机械臂抓取任务完成："+JSON.toJSON(basArmMastList)+"===》自动组托失败，等待重试");
@@ -4548,7 +4548,7 @@
                                new EntityWrapper<BasArmMast>()
                                        .eq("arm_no", basArm.getArmNo())
                                        .eq("sorting_line", basArm.getSortingLineSou())
                                        .eq("sku", basArmMast.getSku())
                                        .eq("matnr", basArmMast.getMatnr())
                                        .eq("order_no", basArmMast.getOrderNo())
                                        .eq("binding_tags", basArmMast.getBindingTags())
                        );
@@ -4573,7 +4573,7 @@
                                                    .eq("status", 2)
                                                    .eq("binding_tags", basArmMast.getBindingTags())
                                    );
                                    Double anfmeSignOne = basArmMastService.selectBasArmMastSignValue(basArmMastOne.getOrderNo(), basArmMastOne.getSku(),basArmMastOne.getBindingTags());
                                    Double anfmeSignOne = basArmMastService.selectBasArmMastSignValue(basArmMastOne.getOrderNo(), basArmMastOne.getMatnr(),basArmMastOne.getBindingTags());

                                    if (anfmeSignOne>1D){
                                        armTaskAssignmentCallApiLogSave(staProtocol, "条码数据已存在！！！", staProtocol.getSiteId()+"码垛位置，条码数据正在自动组托===>>" + barcode, false);
@@ -4582,12 +4582,12 @@

                                }
                            }
                            OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getSku());
                            OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getMatnr());

                            if (Cools.isEmpty(orderDetlValueResultUtil)){
                                continue;
                            }
                            Double anfmeSign = basArmMastService.selectBasArmMastSignValue(basArmMast.getOrderNo(), basArmMast.getSku(),basArmMast.getBindingTags());
                            Double anfmeSign = basArmMastService.selectBasArmMastSignValue(basArmMast.getOrderNo(), basArmMast.getMatnr(),basArmMast.getBindingTags());
                            orderDetlValueResultUtil.setAnfme(anfmeSign);
                            //订单下发
                            try{

 src/main/java/com/zy/core/MainProcess.java

@@ -141,8 +141,8 @@
                }

                //arm任务完成
                mainService.armMissionAccomplished();//4==>5
                mainService.armMissionAccomplishedScanToCheckIn();//3===》4
                mainService.armMissionAccomplished();//3==>4   ====>   3===》5
//                mainService.armMissionAccomplishedScanToCheckIn();//4===》5

                //arm任务下发
                mainService.armTaskAssignment();//0===》1

 src/main/resources/mapper/BasArmMastMapper.xml

@@ -50,7 +50,7 @@
        from man_order_detl
        where 1=1
          and order_no = #{orderNo}
          and matnr = #{sku}
          and matnr = #{matnr}
    </select>

    <select id="selectOrderDetlValue" resultMap="BaseResultMapOrderDetlValue">
@@ -59,7 +59,7 @@
        from man_order_detl d
        where 1=1
          and d.order_no = #{orderNo}
          and d.matnr = #{sku}
          and d.matnr = #{matnr}
    </select>


@@ -70,7 +70,7 @@
        from asr_bas_arm_mast_sign d
        where 1=1
        and d.order_no = #{orderNo}
        and d.sku = #{sku}
        and d.matnr = #{matnr}
        and d.create_time = #{bindingTags}
    </select>