*

L

2025-09-23 ce19d5fdb8de09137f858a7cce3318bbc50d1c6f

*

 src/main/java/com/zy/asrs/entity/BasArm.java

@@ -45,6 +45,20 @@
    @TableField("sorting_line")
    private Integer sortingLine;

    /**
     * 拆垛位
     */
    @ApiModelProperty(value= "拆垛位")
    @TableField("sorting_line_sou")
    private Integer sortingLineSou;

    /**
     * 码垛位
     */
    @ApiModelProperty(value= "码垛位")
    @TableField("sta_no_sou")
    private Integer staNoSou;

    @ApiModelProperty(value= "")
    private Integer status;


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

@@ -55,15 +55,15 @@
        public OrderItem() {};
        public OrderItem(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
            target_num = orderDetlValueResultUtil.getAnfme().intValue();
            from = basArmMast.getSortingLine().toString();
            to = basArmMast.getStaNo().toString();
            from = String.valueOf((basArmMast.getSortingLine()+1)%2);
            to = String.valueOf((basArmMast.getSortingLine()+1)%2+2);
            sku_info = new SKUInfo(basArmMast,orderDetlValueResultUtil);
        };
    }

    public ArmOrderAssignmentParam() {}
    public ArmOrderAssignmentParam(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
        order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+String.valueOf(basArmMast.getSortingLine());
        order_id = basArmMast.getSku()+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

@@ -62,11 +62,12 @@
        }
        public CombMat(BasArmMast basArmMast) {
            this.orderNo = basArmMast.getOrderNo();
            this.matnr = basArmMast.getMatnr();
            this.matnr = basArmMast.getSku();
//            this.batch = basArmMast.getCreateTime().toString();
            this.anfme = basArmMast.getCtns().doubleValue();
            this.specs = basArmMast.getOrderNo();
            this.sku = basArmMast.getSku();
            this.specs = basArmMast.getPo();
            this.brand = basArmMast.getUpc();
            this.standby1 = basArmMast.getSupplier();
        }
    }


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

@@ -4352,7 +4352,7 @@
                            List<BasArmMast> basArmMastList = basArmMastService.selectList(
                                    new EntityWrapper<BasArmMast>()
                                            .eq("arm_no", basArm.getArmNo())
                                            .eq("sorting_line", basArm.getSortingLine())
                                            .eq("sorting_line", basArm.getSortingLineSou())
                                            .eq("status", 3)
                            );
                            if (basArmMastList.isEmpty()){
@@ -4360,10 +4360,10 @@
                            }
                            CombParam combParam = new CombParam(basArmMastList);
                            combParam.setBarcode(barcode);
                            //设置工作空间就绪
                            //arm任务完成自动组托
                            ReturnT<String> result = new PostMesDataUtils().postMesData("arm任务完成自动组托",wmsUrl, wmsComb, combParam);
                            if (result.getCode()==200){
                                basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLine(),3,4);
                                basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLineSou(),3,4);
                            } else {
                                log.error("机械臂抓取任务完成："+JSON.toJSON(basArmMastList)+"===》自动组托失败，等待重试");
                            }
@@ -4437,20 +4437,20 @@
                    List<BasArmMast> basArmMastListRuning = basArmMastService.selectList(
                            new EntityWrapper<BasArmMast>()
                                    .eq("arm_no", basArm.getArmNo())
                                    .eq("sorting_line", basArm.getSortingLine())
                                    .eq("sorting_line", basArm.getSortingLineSou())
                                    .eq("status", 1)
                    );
                    List<BasArmMast> basArmMastListRuning3 = basArmMastService.selectList(
                            new EntityWrapper<BasArmMast>()
                                    .eq("arm_no", basArm.getArmNo())
                                    .eq("sorting_line", basArm.getSortingLine())
                                    .eq("sorting_line", basArm.getSortingLineSou())
                                    .eq("status", 3)
                    );
                    if (basArmMastListRuning.isEmpty() && basArmMastListRuning3.isEmpty()){
                        List<BasArmMast> basArmMastList = basArmMastService.selectList(
                                new EntityWrapper<BasArmMast>()
                                        .eq("arm_no", basArm.getArmNo())
                                        .eq("sorting_line", basArm.getSortingLine())
                                        .eq("sorting_line", basArm.getSortingLineSou())
                                        .eq("status", 0)
                        );
                        if (basArmMastList.isEmpty()){
@@ -4464,7 +4464,7 @@
                        List<BasArmMast> basArmMastListOrder = basArmMastService.selectList(
                                new EntityWrapper<BasArmMast>()
                                        .eq("arm_no", basArm.getArmNo())
                                        .eq("sorting_line", basArm.getSortingLine())
                                        .eq("sorting_line", basArm.getSortingLineSou())
                                        .eq("sku", basArmMast.getSku())
                                        .eq("order_no", basArmMast.getOrderNo())
                        );
@@ -4490,7 +4490,7 @@
                                continue;
                            }
                        }
                        ArmTaskAssignmentParam armTaskAssignmentParam = new ArmTaskAssignmentParam(basArmMast.getSortingLine());
                        ArmTaskAssignmentParam armTaskAssignmentParam = new ArmTaskAssignmentParam(basArm.getSortingLineSou());
                        //设置工作空间就绪
                        ReturnT<String> result = new PostMesDataUtils().postMesData("机械臂抓取任务下发：通知工作空间已就绪",ArmConstant.getArmUrl(basArmMast.getArmNo()), ArmConstant.ARM_WORKSPACE, armTaskAssignmentParam);
                        if (result.getCode()==200){

 src/main/resources/application.yml

@@ -8,8 +8,8 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=jshdasrs
#    url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs
#    url: jdbc:sqlserver://localhost:1433;databasename=jshdasrs
    url: jdbc:sqlserver://10.10.10.198:1433;databasename=jshdasrs
    username: sa
    password: sa@123
#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs

 src/main/resources/mapper/BasArmMapper.xml

@@ -8,6 +8,8 @@
        <result column="arm_no" property="armNo" />
        <result column="sta_no" property="staNo" />
        <result column="sorting_line" property="sortingLine" />
        <result column="sta_no_sou" property="staNoSou" />
        <result column="sorting_line_sou" property="sortingLineSou" />
        <result column="status" property="status" />

    </resultMap>