代码更新

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java

@@ -64,4 +64,11 @@ public class HotPointIvtController {
         hotpointivtService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @GetMapping("/taskDtlQuery")
+    @Log("查询烘烤任务明细")
+    @ApiOperation("查询烘烤任务明细")
+    public ResponseEntity<Object> taskDtlQuery(@RequestParam Map whereJson, Pageable page){
+        return new ResponseEntity<>(hotpointivtService.taskDtlQuery(whereJson,page),HttpStatus.OK);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java

@@ -61,4 +61,13 @@ public interface HotPointIvtService {
     * @param ids /
     */
     void deleteAll(Long[] ids);
+
+    /**
+     * 任务明细分页查询
+     * @param whereJson 条件
+     * @param page 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> taskDtlQuery(Map whereJson, Pageable page);
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java

@@ -3,6 +3,7 @@ package org.nl.wms.pdm.ivt.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -137,4 +138,26 @@ public class HotPointIvtServiceImpl implements HotPointIvtService {
         }
     }
 
+    @Override
+    public Map<String, Object> taskDtlQuery(Map whereJson, Pageable page) {
+
+        String task_code = MapUtil.getStr(whereJson, "task_code");
+        String start_point_code = MapUtil.getStr(whereJson, "start_point_code");
+        String next_point_code = MapUtil.getStr(whereJson, "next_point_code");
+
+        JSONObject map = new JSONObject();
+        map.put("flag","2");
+        map.put("bill_code", MapUtil.getStr(whereJson,"bill_code"));
+        map.put("dtl_status", MapUtil.getStr(whereJson,"dtl_status"));
+        map.put("begin_time", whereJson.get("begin_time"));
+        map.put("end_time", whereJson.get("end_time"));
+        if (ObjectUtil.isNotEmpty(task_code)) map.put("task_code","%"+task_code+"%");
+        if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code","%"+start_point_code+"%");
+        if (ObjectUtil.isNotEmpty(next_point_code)) map.put("next_point_code","%"+next_point_code+"%");
+
+        JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
+
+        return json;
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java

@@ -156,7 +156,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService {
         WQLObject tab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder");
 
         JSONObject json = tab.query("workorder_id = '" + workorder_id + "'").uniqueResult(0);
-        json.put("status", "2");
+        json.put("status", "09");
         json.put("finish_type", "02");
         json.put("realend_time", DateUtil.now());
         json.put("update_optid", currentUserId);

lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql

@@ -17,9 +17,14 @@
 	输入.point_code           			    TYPEAS s_string
 	输入.point_status			            TYPEAS s_string
 	输入.product_area			            TYPEAS s_string
-	输入.is_used			                TYPEAS s_string
+	输入.is_used			                    TYPEAS s_string
 	输入.begin_time			                TYPEAS s_string
 	输入.end_time			                TYPEAS s_string
+	输入.bill_code			                TYPEAS s_string
+	输入.dtl_status			                TYPEAS s_string
+	输入.task_code			                TYPEAS s_string
+	输入.start_point_code			        TYPEAS s_string
+	输入.next_point_code			            TYPEAS s_string
 
 
 [临时表]
@@ -72,3 +77,71 @@
             ENDSELECT
         ENDPAGEQUERY
     ENDIF
+
+	IF 输入.flag = "2"
+        PAGEQUERY
+            SELECT
+                mst.bill_code,
+                dtl.start_point_code,
+                dtl.next_point_code,
+                dtl.temperature,
+                dtl.oven_time,
+                dtl.create_name,
+                dtl.create_time,
+                dtl.confirm_optname,
+                dtl.confirm_time,
+                (
+                    CASE
+                        dtl.dtl_status
+                        WHEN '10' THEN '生成'
+                        WHEN '40' THEN '执行中'
+                        WHEN '50' THEN '确认'
+                    END
+                ) AS dtl_status,
+                (
+                    CASE
+                        dtl.task_type
+                        WHEN '0' THEN 'AGV任务'
+                        WHEN '1' THEN '桁架任务'
+                    END
+                ) AS task_type,
+                task.task_code
+            FROM
+                ST_IVT_HotRegionIODtl dtl
+                LEFT JOIN ST_IVT_HotRegionIOMst mst ON mst.iostorinv_id = dtl.iostorinv_id
+                LEFT JOIN sch_base_task task ON task.task_id = dtl.task_id
+
+            WHERE
+                mst.is_delete = '0'
+
+                OPTION 输入.bill_code <> ""
+                    mst.bill_code = 输入.bill_code
+                ENDOPTION
+
+                OPTION 输入.dtl_status <> ""
+                    dtl.dtl_status = 输入.dtl_status
+                ENDOPTION
+
+                OPTION 输入.task_code <> ""
+                    task.task_code like 输入.task_code
+                ENDOPTION
+
+                OPTION 输入.start_point_code <> ""
+                    dtl.start_point_code like 输入.start_point_code
+                ENDOPTION
+
+                OPTION 输入.next_point_code <> ""
+                    dtl.next_point_code like 输入.next_point_code
+                ENDOPTION
+
+                OPTION 输入.begin_time <> ""
+                    dtl.create_time >= 输入.begin_time
+                ENDOPTION
+
+                OPTION 输入.end_time <> ""
+                    dtl.create_time <= 输入.end_time
+                ENDOPTION
+
+            ENDSELECT
+        ENDPAGEQUERY
+    ENDIF

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

@@ -72,8 +72,9 @@ public class TaskServiceImpl implements TaskService {
             map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%");
         }
         if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) {
-            ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type"));
+            ClassstandardDto dto = classstandardService.findById(whereJson.getString("task_type"));
-            map.put("task_type", task_type.getClass_code());
+            String task_type = classstandardService.getChildIdStr(dto.getClass_id().toString());
+            map.put("task_type", task_type);
         }
         if (StrUtil.isNotEmpty(whereJson.getString("finishTypeList"))) {
             map.put("finishTypeList", whereJson.getString("finishTypeList"));

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql

@@ -16,9 +16,9 @@
 	输入.flag					                 TYPEAS s_string
 	输入.task_status					             TYPEAS s_string
 	输入.finished_type					         TYPEAS s_string
-	输入.task_type					             TYPEAS s_string
+	输入.task_type					             TYPEAS f_string
-	输入.point_code1					     TYPEAS s_string
+	输入.point_code1					             TYPEAS s_string
-	输入.point_code2					         TYPEAS s_string
+	输入.point_code2					             TYPEAS s_string
 	输入.task_code					             TYPEAS s_string
 	输入.vehicle_code					         TYPEAS s_string
 	输入.begin_time					             TYPEAS s_string
@@ -60,7 +60,7 @@
                 WHERE
                     task.is_delete = '0'
                     OPTION 输入.task_type <> ""
-                            task.task_type = 输入.task_type
+                            md.class_id in 输入.task_type
                     ENDOPTION
                     OPTION 输入.finished_type <> ""
                             task.finished_type = 输入.finished_type
@@ -83,7 +83,7 @@
                     OPTION 输入.task_code <> ""
                          (task.task_code like 输入.task_code)
                     ENDOPTION
-                    OPTION 输入.point_code <> ""
+                    OPTION 输入.point_code1 <> ""
                          (task.point_code1 like 输入.point_code1)
                     ENDOPTION
                     OPTION 输入.begin_time <> ""

lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue

@@ -5,10 +5,10 @@
         <span slot="label"><i class="el-icon-date"></i> 库存查询</span>
         <Inventory/>
       </el-tab-pane>
-      <el-tab-pane label="生箔下料">
+  <!--    <el-tab-pane label="生箔下料">
         <CoolRegionIO/>
-      </el-tab-pane>
+      </el-tab-pane>-->
-      <el-tab-pane label="出烘箱">出烘箱</el-tab-pane>
+<!--      <el-tab-pane label="出烘箱">出烘箱</el-tab-pane>-->
     </el-tabs>
   </div>
 </template>

lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue

@@ -279,7 +279,7 @@ export default {
       crudMethod: { ...crudStIvtCoolpointivt },
       optShow: {
         add: false,
-        edit: true,
+        edit: false,
         del: false,
         download: false,
         reset: true

lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue

@@ -216,7 +216,7 @@ export default {
       crudMethod: { ...crudCutpointivt },
       optShow: {
         add: false,
-        edit: true,
+        edit: false,
         del: false,
         download: false,
         reset: true

lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue

@@ -210,7 +210,7 @@ export default {
       crudMethod: { ...crudDeliverypointivt },
       optShow: {
         add: false,
-        edit: true,
+        edit: false,
         del: false,
         download: false,
         reset: true

lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue

@@ -1,226 +1,23 @@
 <template>
   <div class="app-container">
-    <!--工具栏-->
+    <el-tabs type="border-card">
-    <div class="head-container">
+      <el-tab-pane>
-      <div v-if="crud.props.searchToggle">
+        <span slot="label"><i class="el-icon-date"></i> 库存查询</span>
-        <!-- 搜索 -->
+        <PointIvt/>
-        <el-form
+      </el-tab-pane>
-          :inline="true"
+      <el-tab-pane label="烘箱任务">
-          class="demo-form-inline"
+        <TaskDtl/>
-          label-position="right"
+      </el-tab-pane>
-          label-width="90px"
+    </el-tabs>
-          label-suffix=":"
-        >
-          <el-form-item label="点位编码">
-            <el-input
-              v-model="query.point_code"
-              clearable
-              placeholder="输入点位编码"
-              style="width: 185px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="点位状态">
-            <el-select
-              v-model="query.point_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.sch_point_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="生产区域">
-            <el-select
-              v-model="query.product_area"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.product_area"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否启用">
-            <el-switch
-              @change="hand"
-              v-model="query.is_used"
-              active-value="0"
-              inactive-value="1"
-              active-color="#C0CCDA"
-              inactive-color="#409EFF"/>
-          </el-form-item>
-          <el-form-item label="入箱时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
-          <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="点位状态" prop="point_status">
-            <el-select
-              v-model="form.point_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in dict.sch_point_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="母卷号">
-            <el-input v-model="form.container_name" style="width: 370px;" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 370px;" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="温度">
-            <el-input v-model="form.temperature" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="是否启用" prop="is_used">
-            <el-switch v-model="form.is_used" active-value="1" inactive-value="0"/>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" />
-        <el-table-column prop="point_status" label="点位状态" >
-          <template slot-scope="scope">
-            {{ dict.label.sch_point_status[scope.row.point_status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="is_used" label="是否启用" >
-          <template slot-scope="scope">
-            {{ dict.label.is_used[scope.row.is_used] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="container_name" label="母卷号" />
-        <el-table-column prop="full_vehicle_code" label="母卷轴编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
-        <el-table-column prop="instorage_time" label="入箱时间" />
-        <el-table-column prop="product_area" label="生产区域" >
-          <template slot-scope="scope">
-            {{ dict.label.product_area[scope.row.product_area] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="temperature" label="温度" />
-        <el-table-column prop="group_name" label="组别" />
-        <el-table-column prop="point_location" label="位置" >
-          <template slot-scope="scope">
-            {{ dict.label.point_location[scope.row.point_location] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :is-visiable-del="false"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
   </div>
 </template>
 
 <script>
-import crudHotpointivt from './hotpointivt'
+import PointIvt from '@/views/wms/pdm/ivt/hotpointivt/pointIvt'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import TaskDtl from '@/views/wms/pdm/ivt/hotpointivt/taskDtl'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = { ivt_id: null, point_code: null, point_status: null, container_name: null, workorder_id: null, full_vehicle_code: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, temperature: null, group_name: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
 export default {
-  name: 'HotPointIvt',
+  name: 'StIvtHotpointivt',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { PointIvt, TaskDtl }
-  dicts: ['sch_point_status', 'product_area', 'is_used', 'point_location'],
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '烘烤区点位库存',
-      url: 'api/hotpointivt',
-      idField: 'ivt_id',
-      sort: 'ivt_id,desc',
-      crudMethod: { ...crudHotpointivt },
-      optShow: {
-        add: false,
-        edit: true,
-        del: false,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        point_code: [
-          { required: true, message: '点位编码不能为空', trigger: 'blur' }
-        ],
-        point_status: [
-          { required: true, message: '点位状态不能为空', trigger: 'blur' }
-        ]
-      }}
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    hand(value) {
-      this.crud.toQuery()
-    }
-  }
 }
 </script>
 

lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue

@@ -0,0 +1,229 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="点位编码">
+            <el-input
+              v-model="query.point_code"
+              clearable
+              placeholder="输入点位编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="点位状态">
+            <el-select
+              v-model="query.point_status"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.sch_hot_point_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="生产区域">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否启用">
+            <el-switch
+              @change="hand"
+              v-model="query.is_used"
+              active-value="0"
+              inactive-value="1"
+              active-color="#C0CCDA"
+              inactive-color="#409EFF"/>
+          </el-form-item>
+          <el-form-item label="入箱时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation :crud="crud" />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
+          <el-form-item label="点位编码" prop="point_code">
+            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
+          </el-form-item>
+          <el-form-item label="点位状态" prop="point_status">
+            <el-select
+              v-model="form.point_status"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in dict.sch_hot_point_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="母卷号">
+            <el-input v-model="form.container_name" style="width: 370px;" :disabled="true"/>
+          </el-form-item>
+          <el-form-item label="批次">
+            <el-input v-model="form.pcsn" style="width: 370px;" :disabled="true"/>
+          </el-form-item>
+          <el-form-item label="温度">
+            <el-input v-model="form.temperature" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="是否启用" prop="is_used">
+            <el-switch v-model="form.is_used" active-value="1" inactive-value="0"/>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="point_code" label="点位编码" />
+        <el-table-column prop="point_status" label="点位状态" >
+          <template slot-scope="scope">
+            {{ dict.label.sch_hot_point_status[scope.row.point_status] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_used" label="是否启用" >
+          <template slot-scope="scope">
+            {{ dict.label.is_used[scope.row.is_used] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="container_name" label="母卷号" />
+        <el-table-column prop="full_vehicle_code" label="母卷轴编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="pcsn" label="批次" />
+        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
+        <el-table-column prop="instorage_time" label="入箱时间" />
+        <el-table-column prop="product_area" label="生产区域" >
+          <template slot-scope="scope">
+            {{ dict.label.product_area[scope.row.product_area] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="temperature" label="温度" />
+        <el-table-column prop="group_name" label="组别" />
+        <el-table-column prop="point_location" label="位置" >
+          <template slot-scope="scope">
+            {{ dict.label.point_location[scope.row.point_location] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :is-visiable-del="false"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudHotpointivt from './hotpointivt'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = { ivt_id: null, point_code: null, point_status: null, container_name: null, workorder_id: null, full_vehicle_code: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, temperature: null, group_name: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+export default {
+  name: 'HotPointIvt',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  dicts: [ 'product_area', 'is_used', 'point_location', 'sch_hot_point_status'],
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '烘烤区点位库存',
+      url: 'api/hotpointivt',
+      idField: 'ivt_id',
+      sort: 'ivt_id,desc',
+      crudMethod: { ...crudHotpointivt },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+        point_code: [
+          { required: true, message: '点位编码不能为空', trigger: 'blur' }
+        ],
+        point_status: [
+          { required: true, message: '点位状态不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    hand(value) {
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue

@@ -0,0 +1,164 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="单据编码">
+            <el-input
+              v-model="query.bill_code"
+              clearable
+              placeholder="单据编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="任务编码">
+            <el-input
+              v-model="query.task_code"
+              clearable
+              placeholder="任务编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="起点编码">
+            <el-input
+              v-model="query.start_point_code"
+              clearable
+              placeholder="起点编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="终点编码">
+            <el-input
+              v-model="query.next_point_code"
+              clearable
+              placeholder="终点编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="明细状态">
+            <el-select
+              v-model="query.dtl_status"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in statusDtlList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation :crud="crud" />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column prop="bill_code" label="单据编码" :min-width="flexWidth('bill_code',crud.data,'单据编码')" />
+        <el-table-column prop="dtl_status" label="明细状态" :min-width="flexWidth('dtl_status',crud.data,'明细状态')" />
+        <el-table-column prop="start_point_code" label="起始点位" :min-width="flexWidth('start_point_code',crud.data,'起始点位')" />
+        <el-table-column prop="next_point_code" label="终点点位" :min-width="flexWidth('next_point_code',crud.data,'终点点位')" />
+        <el-table-column prop="temperature" label="烤箱温度" :min-width="flexWidth('temperature',crud.data,'烤箱温度')" />
+        <el-table-column prop="oven_time" label="烘烤时间" :min-width="flexWidth('oven_time',crud.data,'烘烤时间')" />
+        <el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型')" />
+        <el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="confirm_optname" label="确认人" :min-width="flexWidth('confirm_optname',crud.data,'确认人')" />
+        <el-table-column prop="confirm_time" label="确认时间" :min-width="flexWidth('confirm_time',crud.data,'确认时间')" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudHotpointivt from './hotpointivt'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = { }
+export default {
+  name: 'HotPointIvtTask',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  dicts: [],
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '烘烤区任务明细',
+      url: 'api/hotpointivt/taskDtlQuery',
+      idField: 'ivt_id',
+      sort: 'ivt_id,desc',
+      crudMethod: { ...crudHotpointivt },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      statusDtlList: [
+        { 'label': '生成', 'value': '10' },
+        { 'label': '执行中', 'value': '40' },
+        { 'label': '确认', 'value': '50' }
+      ],
+      permission: {
+      },
+      rules: {
+      }}
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    hand(value) {
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue

@@ -167,7 +167,7 @@ export default {
       crudMethod: { ...crudSbpointivt },
       optShow: {
         add: false,
-        edit: true,
+        edit: false,
         del: false,
         download: false,
         reset: true

lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue

@@ -162,6 +162,8 @@
             <udOperation
               :data="scope.row"
               :permission="permission"
+              :disabled-dle="scope.row.status !== '01'"
+              :disabled-edit="scope.row.status !== '01'"
             />
           </template>
         </el-table-column>
@@ -254,8 +256,8 @@ export default {
     compelEnd() {
       const _selectData = this.$refs.table.selection
       const data = _selectData[0]
-      if (data.status !== '01') {
+      if (data.status === '09') {
-        return this.crud.notify('只能对开始状态的工单结束', CRUD.NOTIFICATION_TYPE.INFO)
+        return this.crud.notify('不能对完成状态的工单强制结束', CRUD.NOTIFICATION_TYPE.INFO)
       }
       crudRawfoilworkorder.compelEnd(data).then(res => {
         this.crud.toQuery()

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

@@ -69,7 +69,7 @@
               />
             </el-select>
           </el-form-item>
-         <!-- <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
+          <!-- <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
             <el-input
               v-model="query.block_num"
               clearable
@@ -194,8 +194,8 @@
           size="mini"
           type="primary"
           icon="el-icon-refresh"
-          @click="sync"
           :loading="sync_flag"
+          @click="sync"
         >
           仓位同步
         </el-button>
@@ -307,7 +307,7 @@
         <el-table-column prop="point_type_name" label="点位类型" />
         <el-table-column prop="point_status_name" label="点位状态" />
         <el-table-column prop="lock_type_name" label="锁定类型" />
-   <!--     <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
+        <!--     <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
           <template slot-scope="scope">
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>

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

@@ -26,13 +26,13 @@
               v-model="query.vehicle_code"
               clearable
               style="width: 180px"
-              placeholder="载具号"
+              placeholder="载具号1"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
           <el-form-item label="点位编码">
             <el-input
-              v-model="query.point_code"
+              v-model="query.point_code1"
               clearable
               style="width: 180px"
               placeholder="起点"
@@ -48,24 +48,6 @@
               placeholder="请选择"
             />
           </el-form-item>
-          <el-form-item label="完成方式">
-            <el-select
-              v-model="query.finished_type"
-              style="width: 180px"
-              placeholder="完成方式"
-              class="filter-item"
-              clearable
-              @change="hand"
-            >
-              <el-option
-                v-for="item in finishTypeList"
-                :key="item.code"
-                clearable
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
 
           <el-form-item label="创建时间">
             <el-date-picker
@@ -112,37 +94,19 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="50" />
-        <!-- <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
-        <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />-->
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="task_type" label="任务类型" />
+        <el-table-column prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
-        <!--<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.acs_task_type[scope.row.acs_task_type] }}
-          </template>
-        </el-table-column>-->
-        <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
-        <!--<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
+        <el-table-column prop="point_code1" label="点位1" width="100" show-overflow-tooltip />
-          <template slot-scope="scope">
+        <el-table-column prop="point_code2" label="点位2" width="100" show-overflow-tooltip />
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+        <el-table-column prop="point_code3" label="点位3" width="100" show-overflow-tooltip />
-          </template>
+        <el-table-column prop="point_code4" label="点位4" width="100" show-overflow-tooltip />
-        </el-table-column>
+        <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
-        <el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />-->
+        <el-table-column prop="vehicle_code" label="载具编码1" width="100" show-overflow-tooltip />
-        <el-table-column prop="point_code1" label="点位1" width="100" />
+        <el-table-column prop="vehicle_code2" label="载具编码2" width="100" show-overflow-tooltip />
-        <el-table-column prop="point1_region_name" label="区域1" width="100" />
+        <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="create_time" label="创建时间" width="135" show-overflow-tooltip />
-        <el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="update_time" label="修改时间" width="135" show-overflow-tooltip />
-        <!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
-        <!--<el-table-column prop="point_code3" label="点位3" width="85" />
-        <el-table-column prop="point_code4" label="点位4" width="85" />-->
-        <el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="right"