fix 压制叫料 压制送料

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

@@ -427,7 +427,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         if (Region.FJ.value().equals(region_code)) {
             vd.put("is_fire", TrueOrFalse.TRUE.value());
         }
-        vd.put("is_in_kiln", TrueOrFalse.trueOrFalse(is_full) ? TrueOrFalse.TRUE.value() : TrueOrFalse.FALSE.value());
+        vd.put("is_in_kiln", is_full);
         if (Region.FJ.value().equals(region_code)) {
             vd.put("is_in_kiln", TrueOrFalse.FALSE.value());
         }

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java

@@ -20,6 +20,7 @@ import org.nl.wms.sch.service.PointService;
 import org.nl.wms.sch.service.RegionService;
 import org.nl.wms.sch.service.dto.PointDto;
 import org.nl.wms.sch.service.dto.RegionDto;
+import org.nl.wms.sch.task.util.TaskUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -140,6 +141,8 @@ public class PointServiceImpl implements PointService {
         if (entity == null) {
             throw new BadRequestException("被删除或无权限，操作失败!");
         }
+        String vehicle_code = TaskUtils.formatVehicleCode(dto.getVehicle_code());
+        dto.setVehicle_code(vehicle_code);
 
         WQLObject materialBaseTab = WQLObject.getWQLObject("MD_ME_MaterialBase");
         WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java

@@ -197,8 +197,6 @@ public class YZCallEmptyTask extends AbstractAcsTask {
             JSONObject point2 = new JSONObject();
             point2.put("lock_type", LockType.UNLOCKED.value());
             point2.put("task_code", "");
-            point2.put("vehicle_type", task.getString("vehicle_type"));
-            point2.put("vehicle_code", task.getString("vehicle_code"));
             point2.put("point_status", PointStatus.NOT_EMPTY.value());
             if (operation_type == OperationType.AUTO) {
                 TaskUtils.addACSUpdateColum(point2);

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java

@@ -49,8 +49,8 @@ public class YZSendMaterialTask extends AbstractAcsTask {
                 TaskStatus.SURE_START.value(),
                 point.getString("point_code"),
                 null,
-                work_order.getString("material_id"),
-                VehicleType.STEEL_TRAY.value(),
+                vd.getString("material_id"),
+                vd.getString("vehicle_type"),
                 vd.getString("vehicle_code"),
                 TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? "99" : "1",
                 YZSendMaterialTask.class.getName(),