调整根据库位重量分配库位逻辑

易文鹏
1 parent f9171f77
Showing 5 changed files with 20 additions and 16 deletions
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
src/main/java/com/huaheng/common/constant/QuantityConstant.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/task/agvTask/domain/AgvTask.java
src/main/java/com/huaheng/pc/task/agvTask/service/AgvTaskServiceImpl.java
@@ -210,8 +210,12 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
             BigDecimal total_weight_bigdecimal=new BigDecimal(total_weight_config);
             BigDecimal total_weight= total_weight_bigdecimal.subtract(new BigDecimal(weight));
             locationLambda.eq(Location::getZoneCode,QuantityConstant.ZONE_AGV);
-            locationLambda.inSql(Location::getIColumn, "select a.iColumn from (SELECT iColumn,ifnull(sum(weight),0) sum FROM `location` where zoneCode='B' group by iColumn) a where a.sum<="+total_weight);
-            locationLambda.orderByAsc(Location::getIRow,Location::getILayer);
+            locationLambda.last("and (iRow,iColumn) IN (select a.irow,a.iColumn\n" +
+                    " FROM (SELECT irow,iColumn,ifnull(sum(weight),0) sum\n" +
+                    " FROM `location`\n" +
+                    " WHERE zoneCode='B' group by irow,iColumn) a\n" +
+                    " WHERE a.sum<="+total_weight+")");
+            //locationLambda.orderByAsc(Location::getIRow,Location::getILayer);
         }
  
         List<Location> locationList = locationService.list(locationLambda);
@@ -537,11 +537,11 @@ public class QuantityConstant {
     public static final int AGV_TASK_SEND_TYPE_CREATE = 1;
     public static final int AGV_TASK_SEND_TYPE_CANCEL = 2;
  
-    //WCS任务下发
+    //AGV任务下发
     public static final String ADDRESS_AGV_TASK_ASSIGN = "AGV_TASK_ASSIGN";
-    //WCS任务取消
+    //AGV任务取消
     public static final String ADDRESS_AGV_TASK_CANCEL = "AGV_TASK_CANCEL";
-    //WCS任务更新
+    //AGV任务更新
     public static final String ADDRESS_AGV_TASK_UPDATE = "AGV_TASK_UPDATE";
  
  
@@ -703,10 +703,10 @@ public class RyTask extends BaseController {
         }
     }
  
-    /*
-     ** 向AGV下发任务
-     *  更新wms库agv任务状态下发状态
-     * 三楼立库AGv任务
+    /**
+     * 向AGV下发任务
+     * 更新wms库agv任务状态下发状态
+     * 三楼立库AGV任务
      */
     public void autoSendAgvTask(String params) {
         AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
@@ -729,10 +729,10 @@ public class RyTask extends BaseController {
  
     }
  
-    /*
-     ** 向AGV发送取消任务指令
-     *  更新wms库agv任务状态下发状态
-     * 三楼立库AGv任务
+    /**
+     * 向AGV发送取消任务指令
+     * 更新wms库agv任务状态下发状态
+     * 三楼立库AGV任务
      */
     public void autoCancelAgvTask(String params) {
         AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
@@ -18,7 +18,6 @@ public class AgvTask {
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value="内部号")
     private Integer id;
-
     /**
      * 仓库编码
      */
@@ -29,12 +28,13 @@ public class AgvTask {
     @TableField(value = "zoneCode")
     @ApiModelProperty(value="库区编码")
     private String zoneCode;
+
     //100 搬运任务，200行走任务，300 取货任务，400放货任务；
     @TableField(value = "taskType")
     @ApiModelProperty(value="任务类型")
     private Integer taskType;
  
-    //agv任务状态 1生成 10下发 20执行 100 完成  0错误
+    //agv任务状态 1生成 10下发 20执行 100完成  0错误
     @TableField(value = "status")
     @ApiModelProperty(value="任务状态")
     private Integer status;
@@ -55,7 +55,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
         }
         //下发任务给ACS
         AjaxResult ajaxResult = acsService.createAGVTask(agvTask);
-        if (ajaxResult!=null&&!ajaxResult.hasErr()) {
+        if (ajaxResult != null && !ajaxResult.hasErr()) {
             agvTask.setStatus(QuantityConstant.AGV_TASK_STATUS_RELEASE);
             agvTask.setLastUpdated(new Date());
             agvTask.setLastUpdatedBy("Rytask");