堆叠位置修改

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -22,6 +22,7 @@ import org.nl.wms.database.service.dto.VehicleDto;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
 import org.nl.wms.sch.manage.AreaEnum;
 import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.nl.wms.sch.manage.VehicleTypeEnum;
 import org.nl.wms.sch.manage.buss.*;
 import org.nl.wms.sch.service.PointService;
 import org.nl.wms.sch.service.TaskService;
@@ -175,6 +176,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             case "4":
                 //叫空托盘
                 jsonObject.put("next_point_code", device_code);
+                //如果是叠盘位3 ，则去铁托盘缓存区取
+                if (!StrUtil.equals(device_code,"KTPHCW3")){
+                    //1 更新缓存位
+                    JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KTTHCQ.getCode()).addParam("flag", "4").process().getResultJSONArray(0);
+                    PointUpdateUtil.updatePoint(pointarr);
+                    jsonObject.put("vehicle_type", VehicleTypeEnum.GTP.getCode() );
+                }else{
                     produceInfoByCode = this.getProduceInfoByCode(device_code);
                     //假如是码垛位的上料位，则去看看有没有当前排产单生产的物料的半满托
                     if (StrUtil.equals(device_code, "FJJXSXLW201") ||
@@ -182,6 +190,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                             StrUtil.equals(device_code, "FJJXSXLW301") ||
                             StrUtil.equals(device_code, "FJJXSXLW302")
                     ) {
+
                         JSONObject joo = pointTable.query("point_code='" + device_code + "'").uniqueResult(0);
                         material_id = produceInfoByCode.getString("material_id");
                         String workprocedure_id = WorkProcedureEnum.FJGX.getId();
@@ -213,6 +222,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     //需要更新堆叠位的点位状态
                     JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("point_code", "KTPDDW5").addParam("flag", "4").process().getResultJSONArray(0);
                     PointUpdateUtil.updatePoint(pointarr);
+                }
+
                 callEmptyVehicleTask.createTask((JSONObject) JSON.toJSON(jsonObject));
                 break;
             //生产rgv搬运任务

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java

@@ -219,16 +219,16 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
                     start_area = AreaEnum.MTPQ.getCode();
                     is_auto_issue = "0";
                     break;
+                //叠托盘位置 请求去缓存位置
                 default:
                     vehicle_type = VehicleTypeEnum.GTP.getCode();
-                    start_area = AreaEnum.KTTDDQ.getCode();
+                    start_area = AreaEnum.KTTHCQ.getCode();
             }
             JSONObject param = new JSONObject();
             //如果托盘类型不是02，则需要加上托盘类型
             if (!StrUtil.equals(vehicle_type, "02")) {
                 param.put("vehicle_type", vehicle_type);
             }
-
             param.put("area_type", start_area);
             JSONObject outStructObj = StructFindUtil.getEmptyVehicleOutStruct(param);
             if (ObjectUtil.isEmpty(outStructObj)) {