代码更新

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

@@ -179,7 +179,7 @@ public class PointServiceImpl implements PointService {
             dto.setMaterial_id(null);
             dto.setInstorage_time(now);
             dto.setStanding_time(BigDecimal.valueOf(0));
-        } else { // 有料
+        } else if (pointStatus.equals("3")) { // 有料
             if (ObjectUtil.isEmpty(dto.getMaterial_id())) throw new BadRequestException("物料不能为空");
             if (ObjectUtil.isEmpty(dto.getIvt_qty())) throw new BadRequestException("库存数不能为空");
             JSONObject materialObj = materialBaseTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0);

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java

@@ -363,14 +363,24 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void forceFinish(String task_id) {
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"2");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
     @Override
     public void cancel(String task_id) {
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"0");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
     @Override

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java

@@ -371,15 +371,25 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void forceFinish(String task_id) {
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"2");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
 
     @Override
     public void cancel(String task_id) {
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"0");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
     @Override

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java

@@ -238,14 +238,24 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
         /*
          * 强制完成
          */
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"2");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
     @Override
     public void cancel(String task_id) {
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"0");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java

@@ -190,14 +190,25 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
         /*
          * 强制完成
          */
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"2");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
 
     @Override
     public void cancel(String task_id) {
-
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"0");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java

@@ -247,6 +247,12 @@ public class HkxSendMaterialTask extends AbstractAcsTask {
 
     @Override
     public void cancel(String task_id) {
-
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"0");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java

@@ -186,14 +186,24 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
 
     @Override
     public void forceFinish(String task_id) {
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"2");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
     @Override
     public void cancel(String task_id) {
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj))
+            this.updateTaskStatus(taskObj,"0");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成!");
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="生产任务选择"
+    title="物料选择"
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close

lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue

@@ -8,6 +8,11 @@
     @close="close"
   >
     <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold;font-size: 15px;">点位信息:</span>
+        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
+      </div>
+
       <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
         <el-form-item label="区域编码">
           <el-input v-model="form.region_code" style="width: 200px;"/>
@@ -44,7 +49,12 @@
       </el-form>
     </el-card>
 
-    <el-card class="box-card" shadow="never">
+    <el-card class="box-card" shadow="always">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold;font-size: 15px;">库存信息:</span>
+        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
+      </div>
+
       <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
         <el-form-item label="物料编码">
           <el-input v-model="form.region_code" style="width: 200px;"/>
@@ -74,15 +84,82 @@
       </el-form>
     </el-card>
 
-    <div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
+    <el-card class="box-card" shadow="always">
-      <span class="role-span">更新记录</span>
+      <div slot="header" class="clearfix">
-      <span class="crud-opts-right2">
+        <span style="font-weight: bold;font-size: 15px;">库存信息:</span>
-        <!--左侧插槽-->
+        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
-        <slot name="left" />
-      </span>
-
       </div>
+
+      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
+        <el-form-item label="物料编码">
+          <el-input v-model="form.region_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="物料名称">
+          <el-input v-model="form.region_name" style="width: 200px;"/>
+        </el-form-item>
+
+        <el-form-item label="物料规格">
+          <el-input v-model="form.point_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="物料批次">
+          <el-input v-model="form.point_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="库存量">
+          <el-input v-model="form.point_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="计量单位">
+          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="入库时间">
+          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="静置时间(分)">
+          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="always">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold;font-size: 15px;">库存信息:</span>
+        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
+      </div>
+
+      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
+        <el-form-item label="物料编码">
+          <el-input v-model="form.region_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="物料名称">
+          <el-input v-model="form.region_name" style="width: 200px;"/>
+        </el-form-item>
+
+        <el-form-item label="物料规格">
+          <el-input v-model="form.point_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="物料批次">
+          <el-input v-model="form.point_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="库存量">
+          <el-input v-model="form.point_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="计量单位">
+          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="入库时间">
+          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="静置时间(分)">
+          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
     <!--表格渲染-->
+    <el-card class="box-card" shadow="always">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold;font-size: 15px;">更新记录:</span>
+        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
+      </div>
       <el-table
         ref="table"
         :data="tableData"
@@ -102,6 +179,7 @@
         <el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
         <el-table-column prop="nick_name" label="操作人" align="center"/>
       </el-table>
+    </el-card>
     <!--<span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button type="primary" @click="dialogVisible = false">确定</el-button>
@@ -191,20 +269,12 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
-.crud-opts2 {
+::v-deep .el-card__header {
-  padding: 0 0;
+  padding: 5px 0 5px 10px;
-  display: -webkit-flex;
+  background-color: #f8f8f9;
-  display: flex;
-  align-items: center;
 }
-
+::v-deep .el-card__body {
-.crud-opts2 .crud-opts-right2 {
+  padding: 10px 0 10px 0;
-  margin-left: auto;
-  padding: 4px 4px;
-}
-
-.input-with-select {
-  background-color: #fff;
 }
 </style>

lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="生产任务选择"
+    title="工单选择"
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close

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

@@ -225,7 +225,7 @@
           <el-form-item label="点位名称" prop="point_name">
             <el-input v-model="form.point_name" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="点位状态" prop="point_status" v-show="pointStatusDialogList.length > 0">
+          <el-form-item v-show="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
             <el-select
               v-model="form.point_status"
               size="mini"
@@ -256,7 +256,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="点位类型" prop="device_point_type" v-show="pointTypesDialogList.length > 0">
+          <el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
             <el-select
               v-model="form.point_type"
               size="mini"
@@ -271,22 +271,22 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="载具编码" prop="vehicle_code" v-if="form.point_status !== '1'">
+          <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="库存数" prop="ivt_qty" v-if="form.point_status === '3'">
+          <el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">
-            <el-input-number v-model="form.ivt_qty" :min="1" :precision="3" :max="999" label="库存数" size="mini"/>
+            <el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />
           </el-form-item>
-          <el-form-item label="物料来源" v-if="form.point_status === '3'">
+          <el-form-item v-if="form.point_status === '3'" label="物料来源">
             <el-radio-group v-model="choose" size="mini">
-              <el-radio-button label="物料"></el-radio-button>
+              <el-radio-button label="物料" />
-              <el-radio-button label="工单"></el-radio-button>
+              <el-radio-button label="工单" />
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="物料名称" prop="vehicle_code" v-if="false">
+          <el-form-item v-if="false" label="物料名称" prop="vehicle_code">
-            <el-input v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial"/>
+            <el-input suffix-icon="el-icon-date" v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial" />
           </el-form-item>
-          <el-form-item label="物料名称" prop="vehicle_code" v-if="form.point_status === '3'">
+          <el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code">
             <el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" />
           </el-form-item>
           <el-form-item label="备注">
@@ -313,7 +313,7 @@
             <el-link type="warning" @click="toView(scope.row)">{{ scope.row.point_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip />
+        <el-table-column prop="point_name" label="点位名称" width="150" sortable show-overflow-tooltip />
         <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point_type_name" label="点位类型" />
         <el-table-column prop="point_status_name" label="点位状态" />