烘烤区库存

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

@@ -12,7 +12,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.SecurityUtils;
-import org.nl.modules.wql.core.bean.ResultBean;
+import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.pdm.ivt.service.HotPointIvtService;
@@ -21,6 +21,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,9 +37,17 @@ public class HotPointIvtServiceImpl implements HotPointIvtService {
 
     @Override
     public Map<String,Object> queryAll(Map whereJson, Pageable page){
-        WQLObject wo = WQLObject.getWQLObject("st_ivt_hotpointivt");
+        HashMap map = new HashMap();
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
+        map.put("flag", "1");
-        final JSONObject json = rb.pageResult();
+        if (whereJson.get("point_code")!=null)
+            map.put("point_code",  "%" + whereJson.get("point_code") + "%");
+        map.put("point_status", whereJson.get("point_status"));
+        map.put("product_area", whereJson.get("product_area"));
+        map.put("is_used", whereJson.get("is_used"));
+        map.put("begin_time", whereJson.get("begin_time"));
+        map.put("end_time", whereJson.get("end_time"));
+
+        JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
         return json;
     }
 

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

@@ -76,9 +76,9 @@
                     is_used = 输入.is_used
                 ENDOPTION
                 OPTION 输入.begin_time <> ""
-                    instorage_time => 输入.begin_time
+                    instorage_time >= 输入.begin_time
                 ENDOPTION
-                OPTION 输入.end_tiem <> ""
+                OPTION 输入.end_time <> ""
                     instorage_time <= 输入.end_time
                 ENDOPTION
             ENDSELECT

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

@@ -0,0 +1,74 @@
+[交易说明]
+	交易名：	烘烤区点位库存
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					            TYPEAS s_string
+	输入.point_code           			    TYPEAS s_string
+	输入.point_status			            TYPEAS s_string
+	输入.product_area			            TYPEAS s_string
+	输入.is_used			                TYPEAS s_string
+	输入.begin_time			                TYPEAS s_string
+	输入.end_time			                TYPEAS s_string
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+	IF 输入.flag = "1"
+        PAGEQUERY
+            SELECT
+                hot.*
+            FROM
+                st_ivt_hotpointivt hot
+            WHERE
+                1=1
+                OPTION 输入.point_code <> ""
+                    point_code LIKE 输入.point_code
+                ENDOPTION
+                OPTION 输入.point_status <> ""
+                    point_status = 输入.point_status
+                ENDOPTION
+                OPTION 输入.product_area <> ""
+                    product_area = 输入.product_area
+                ENDOPTION
+                OPTION 输入.is_used <> ""
+                    is_used = 输入.is_used
+                ENDOPTION
+                OPTION 输入.begin_time <> ""
+                    instorage_time >= 输入.begin_time
+                ENDOPTION
+                OPTION 输入.end_time <> ""
+                    instorage_time <= 输入.end_time
+                ENDOPTION
+            ENDSELECT
+        ENDPAGEQUERY
+    ENDIF

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

@@ -2,52 +2,117 @@
   <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_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="500px">
+      <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="80px">
+        <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;" />
+            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
           </el-form-item>
           <el-form-item label="点位状态" prop="point_status">
-            <el-input v-model="form.point_status" style="width: 370px;" />
+            <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;" />
+            <el-input v-model="form.container_name" style="width: 370px;" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="母卷轴编码">
-            <el-input v-model="form.full_vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 370px;" />
+            <el-input v-model="form.pcsn" style="width: 370px;" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="库存数" prop="ivt_qty">
-            <el-input v-model="form.ivt_qty" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="入库时间">
-            <el-input v-model="form.instorage_time" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="生产区域">
-            <el-input v-model="form.product_area" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="温度">
             <el-input v-model="form.temperature" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="组别">
-            <el-input v-model="form.group_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="位置">
-            <el-input v-model="form.point_location" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="顺序号" prop="sort_seq">
-            <el-input v-model="form.sort_seq" style="width: 370px;" />
-          </el-form-item>
           <el-form-item label="是否启用" prop="is_used">
-            <el-input v-model="form.is_used" style="width: 370px;" />
+            <el-switch v-model="form.is_used" active-value="1" inactive-value="0"/>
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model="form.remark" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -59,17 +124,33 @@
       <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="点位状态" />
+        <el-table-column prop="point_status" label="点位状态" >
-        <el-table-column prop="is_used" 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="库存数" />
+        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
         <el-table-column prop="instorage_time" label="入箱时间" />
-        <el-table-column prop="product_area" 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="位置" />
+        <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">
@@ -77,6 +158,7 @@
             <udOperation
               :data="scope.row"
               :permission="permission"
+              :is-visiable-del="false"
             />
           </template>
         </el-table-column>
@@ -99,9 +181,23 @@ const defaultForm = { ivt_id: null, point_code: null, point_status: null, contai
 export default {
   name: 'HotPointIvt',
   components: { pagination, crudOperation, rrOperation, udOperation },
+  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 }})
+    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 {
@@ -113,15 +209,6 @@ export default {
         ],
         point_status: [
           { required: true, message: '点位状态不能为空', trigger: 'blur' }
-        ],
-        ivt_qty: [
-          { required: true, message: '库存数不能为空', trigger: 'blur' }
-        ],
-        sort_seq: [
-          { required: true, message: '顺序号不能为空', trigger: 'blur' }
-        ],
-        is_used: [
-          { required: true, message: '是否启用不能为空', trigger: 'blur' }
         ]
       }}
   },
@@ -129,6 +216,9 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    hand(value) {
+      this.crud.toQuery()
     }
   }
 }