opt: 废箔搬运

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java

@@ -89,8 +89,8 @@ public class OtherPdaServiceImpl implements OtherPdaService {
         // 判断是否能够搬运
         String pointCode = param.getString("point_code");
         // 校验是否二次创建任务
-        List<SchBaseTask> schBaseTasks = taskService.checkHaveTask(pointCode);
+        SchBaseTask schBaseTasks = taskService.getTaskByPointCodeX(pointCode, null, null, null);
-        if (schBaseTasks.size() > 0) {
+        if (ObjectUtil.isNotEmpty(schBaseTasks)) {
             throw new BadRequestException("点位[" + pointCode + "]已经存在任务！");
         }
         // 查找执行中的任务
@@ -117,6 +117,7 @@ public class OtherPdaServiceImpl implements OtherPdaService {
             taskParam.put("config_code", "SendWasteFoilAGVTask");
             taskParam.put("create_mode", GeneralDefinition.PDA_CREATION);
             taskParam.put("remark", "废箔回去");
+            taskParam.put("up_task_code", task.getTask_code());
             taskParam.put("index_task", upTaskRequestObj.getInteger("index_task") + 1);
             taskParam.put("carNo", task.getCar_no());
             taskParam.put("task_status", TaskStatus.START_AND_POINT.getCode());

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java

@@ -37,7 +37,7 @@ public class AutoSendWasteFoilAGVTask {
             SchBaseTask task = waitTask.get(0);
             // 查找废箔起点
             List<SchBasePoint> fbPoints = pointService.getAllBusinessNotTaskPoint("A1", "A1-FB",
-                    "2", "2", null, null);
+                    "1", "2", null, null);
             if (CollectionUtil.isEmpty(fbPoints)) {
                 log.error("找不到废箔点位 - {}", task);
                 return;

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/service/impl/OtherOperationServiceImpl.java

@@ -146,7 +146,7 @@ public class OtherOperationServiceImpl implements OtherOperationService {
         String barcode = param.getString("barcode");
         SchBasePoint point = pointService.getById(deviceCode);
         if (!barcode.equals(point.getVehicle_code())) {
-            throw new BadRequestException("系统点位记录的载具号[" + point.getVehicle_code() + "]与实际载具号[" + barcode + "]不符合！");
+            throw new BadRequestException("系统点位记录的管芯规格[" + point.getVehicle_code() + "]与实际管芯规格[" + barcode + "]不符合！");
         }
         LambdaUpdateWrapper<SchBasePoint> lam = new UpdateWrapper<SchBasePoint>().lambda();
         lam.set(SchBasePoint::getLock_type, "1")

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/GxOutStorageTask.java

@@ -55,6 +55,7 @@ public class GxOutStorageTask extends AbstractTask {
         task.setRequest_param(JSONObject.toJSONString(form));
         task.setHandle_class(THIS_CLASS);
         task.setTask_status(TaskStatus.START_AND_POINT.getCode());
+        TaskUtils.setCreateByPda(task);
         taskService.save(task);
         return task.getTask_id();
     }

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/other/SendWasteFoilAGVTask.java

@@ -101,24 +101,24 @@ public class SendWasteFoilAGVTask extends AbstractTask {
     @Override
     public void updateStatus(JSONObject task, TaskStatus status) {
         String taskCode = task.getString("task_code");
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(taskCode);
         BigDecimal weight = task.getBigDecimal("weight");
         if (ObjectUtil.isNotEmpty(weight)) {
             // 调用更新重量
             otherOperationService.acsRequestWasteFoilWeight(task);
         }
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(taskCode);
         // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) {
+        if (TaskStatus.EXECUTING.equals(status) || ObjectUtil.isNotEmpty(task.getString("car_no"))) {
             taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
             taskObj.setCar_no(task.getString("car_no"));
             TaskUtils.setUpdateByAcs(taskObj);
             taskService.updateById(taskObj);
         }
-        if (status.equals(TaskStatus.FINISHED)) {
+        if (TaskStatus.FINISHED.equals(status)) {
             finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
         }
-        if (status.equals(TaskStatus.CANCELED)) {
+        if (TaskStatus.CANCELED.equals(status)) {
             cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
         }
     }

lms2/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -253,6 +253,21 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item :label="$t('Point.search.lock_type')" prop="device_point_type">
+            <el-select
+              v-model="form.lock_type"
+              size="mini"
+              :placeholder="$t('Point.search.lock_type')"
+              class="filter-item"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in dict.d_lock_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item :label="$t('Point.dialog.parent_point_code')" prop="vehicle_code">
             <el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />
           </el-form-item>