代码更新

lms/nladmin-system/src/main/java/org/nl/wms/sch/PointFindUtil.java

@@ -1,93 +0,0 @@
-package org.nl.wms.sch;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-
-import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.wql.WQL;
-import org.nl.modules.wql.core.bean.WQLObject;
-
-
-public class PointFindUtil {
-    public static JSONObject getInStruct(JSONObject jsonObject) {
-        String material_id = jsonObject.getString("material_id");
-        String area_type = jsonObject.getString("area_type");
-        String vehicle_code = jsonObject.getString("vehicle_code");
-        if (StrUtil.isEmpty(vehicle_code)) {
-            throw new BadRequestException("托盘不能为空！");
-        }
-        //根据托盘找托盘类型，
-        JSONObject vehicleObj = WQLObject.getWQLObject("md_pb_vehicle").query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(vehicleObj)) {
-            throw new BadRequestException("未找到托盘号为'" + vehicle_code + "' 托盘信息！");
-        }
-        if (StrUtil.isEmpty(material_id)) {
-            throw new BadRequestException("物料不能为空！");
-        }
-        if (StrUtil.isEmpty(area_type)) {
-            throw new BadRequestException("区域不能为空！");
-        }
-        String vehice_type = vehicleObj.getString("vehicle_type");
-        JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "2")
-                .addParam("material_id", material_id).addParam("area_type", area_type).addParam("vehice_type", vehice_type).process().uniqueResult(0);
-        return result;
-    }
-
-    public static JSONObject getOutStruct(JSONObject jsonObject) {
-        String material_id = jsonObject.getString("material_id");
-        String area_type = jsonObject.getString("area_type");
-        String is_full = jsonObject.getString("is_full");
-        String workprocedure_id = jsonObject.getString("workprocedure_id");
-
-        if (StrUtil.isEmpty(material_id)) {
-            throw new BadRequestException("物料不能为空！");
-        }
-        if (StrUtil.isEmpty(area_type)) {
-            throw new BadRequestException("区域不能为空！");
-        }
-        if (StrUtil.isEmpty(is_full)) {
-            throw new BadRequestException("是否满托不能为空！");
-        }
-        if (StrUtil.isEmpty(workprocedure_id)) {
-            throw new BadRequestException("工序不能为空！");
-        }
-        JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "3")
-                .addParam("material_id", material_id).addParam("area_type", area_type)
-                .addParam("is_full", is_full).addParam("workprocedure_id", workprocedure_id)
-                .process().uniqueResult(0);
-        return result;
-    }
-
-    public static JSONObject getEmptyVehicleInStruct(JSONObject jsonObject) {
-        String area_type = jsonObject.getString("area_type");
-        String vehicle_code = jsonObject.getString("vehicle_code");
-        if (StrUtil.isEmpty(vehicle_code)) {
-            throw new BadRequestException("托盘不能为空！");
-        }
-        //根据托盘找托盘类型，
-        JSONObject vehicleObj = WQLObject.getWQLObject("md_pb_vehicle").query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(vehicleObj)) {
-            throw new BadRequestException("未找到托盘号为'" + vehicle_code + "' 托盘信息！");
-        }
-        if (StrUtil.isEmpty(area_type)) {
-            throw new BadRequestException("区域不能为空！");
-        }
-        String vehice_type = vehicleObj.getString("vehicle_type");
-        JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "4")
-                .addParam("area_type", area_type).addParam("vehice_type", vehice_type).process().uniqueResult(0);
-        return result;
-    }
-
-    public static JSONObject getEmptyVehicleOutStruct(JSONObject jsonObject) {
-        String area_type = jsonObject.getString("area_type");
-        String vehicle_type = jsonObject.getString("vehicle_type");
-        if (StrUtil.isEmpty(area_type)) {
-            throw new BadRequestException("区域不能为空！");
-        }
-        JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5")
-                .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0);
-        return result;
-    }
-
-}

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

@@ -295,7 +295,7 @@
         </el-table-column>
         <el-table-column prop="vehicle_code" label="载具编码" />
         <el-table-column prop="vehicle_qty" label="载具数量" />
-        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="is_used" label="是否启用">
           <template slot-scope="scope">
             {{ scope.row.is_used=='1' ? '是' : '否' }}

lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue

@@ -50,23 +50,6 @@
               @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.vehicle_type"
@@ -145,22 +128,6 @@
           <el-form-item label="点位编码" prop="standing_time">
             <el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
           </el-form-item>
-          <el-form-item label="点位状态">
-            <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-select
               v-model="form.vehicle_type"
@@ -207,7 +174,6 @@
         <el-table-column prop="pcsn" label="批次" />
         <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
         <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="point_status_name" label="点位状态" />
         <el-table-column prop="vehicle_type" label="托盘类型" min-width="100"/>
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="is_used" label="是否启用" >

lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue

@@ -50,23 +50,6 @@
               @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.vehicle_type"
@@ -133,22 +116,6 @@
           <el-form-item label="点位编码" prop="standing_time">
             <el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
           </el-form-item>
-          <el-form-item label="点位状态">
-            <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-select
               v-model="form.vehicle_type"
@@ -196,9 +163,8 @@
         <el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
         <el-table-column prop="region_name" label="区域名称" min-width="120" 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="入库时间" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="point_status_name" label="点位状态" />
         <el-table-column prop="lock_type" label="锁定类型">
           <template slot-scope="scope">
             {{ dict.label.d_lock_type[scope.row.lock_type] }}