rev：1.前端页面优化 2.手持出入库增加点位校验

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java

@@ -10,6 +10,8 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.pda.ios_manage.service.PdaEmpVehicleService;
 import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.sch_manage.service.ISchBasePointService;
+import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.sch_manage.service.util.tasks.EmpVehicleInTask;
 import org.nl.wms.sch_manage.service.util.tasks.EmpVehicleOutTask;
 import org.nl.wms.warehouse_management.enums.IOSConstant;
@@ -55,6 +57,12 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService {
     @Autowired
     private EmpVehicleOutTask empVehicleOutTask;
 
+    /**
+     * 点位服务
+     */
+    @Autowired
+    private ISchBasePointService iSchBasePointService;
+
     @Override
     @Transactional
     public PdaResponse empVehicleIn(JSONObject whereJson) {
@@ -66,6 +74,11 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService {
         if (ObjectUtil.isEmpty(whereJson.getString("point_code"))) {
             throw new BadRequestException("起点不能为空！");
         }
+        // 判断点位编码是否存在
+        SchBasePoint point_code = iSchBasePointService.getById(whereJson.getString("point_code"));
+        if (ObjectUtil.isEmpty(point_code)) {
+            throw new BadRequestException("当前入库点位不存在【"+point_code+"】");
+        }
 
         // 根据托盘类型，尺寸大小找对应入库货位
         Structattr attrDao = queryInPoint(vehicleDao);
@@ -98,6 +111,11 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService {
         if (ObjectUtil.isEmpty(whereJson.getString("storagevehicle_type"))) {
             throw new BadRequestException("载具类型不能为空！");
         }
+        // 判断点位编码是否存在
+        SchBasePoint point_code = iSchBasePointService.getById(whereJson.getString("point_code"));
+        if (ObjectUtil.isEmpty(point_code)) {
+            throw new BadRequestException("当前出库点位不存在【"+point_code+"】");
+        }
         // 根据载具类型查找对应载具
         Structattr attrDao = queryOutPoint(whereJson);
         if (ObjectUtil.isEmpty(attrDao)) {

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java

@@ -17,6 +17,8 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
 import org.nl.wms.basedata_manage.service.dao.Sectattr;
 import org.nl.wms.pda.ios_manage.service.PdaIosInService;
 import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.sch_manage.service.ISchBasePointService;
+import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.warehouse_management.enums.IOSConstant;
 import org.nl.wms.warehouse_management.enums.IOSEnum;
 import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
@@ -92,6 +94,12 @@ public class PdaIosInServiceImpl implements PdaIosInService {
     @Autowired
     private IOStorInvDtlMapper ioStorInvDtlMapper;
 
+    /**
+     * 点位服务
+     */
+    @Autowired
+    private ISchBasePointService iSchBasePointService;
+
     @Override
     @Transactional
     public PdaResponse sweepCode(JSONObject whereJson) {
@@ -226,6 +234,12 @@ public class PdaIosInServiceImpl implements PdaIosInService {
     @Override
     @Transactional
     public PdaResponse confirmIn(JSONObject whereJson) {
+        // 判断点位编码是否存在
+        SchBasePoint point_code = iSchBasePointService.getById(whereJson.getString("point_code"));
+        if (ObjectUtil.isEmpty(point_code)) {
+            throw new BadRequestException("当前入库点位不存在【"+point_code+"】");
+        }
+
         // 组织新增数据
         Map<String, Object> jsonMst = organizeInsertData(whereJson);
         // 调用服务新增数据

wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue

@@ -237,13 +237,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
+          <el-row :gutter="24">
-            <el-col :span="24">
+            <el-col :span="8">
               <el-form-item label="是否临时" prop="is_tempstruct">
                 <el-radio v-model="form.is_tempstruct" label="1">是</el-radio>
                 <el-radio v-model="form.is_tempstruct" label="0">否</el-radio>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="是否空载具" prop="is_emptyvehicle">
+                <el-radio v-model="form.is_emptyvehicle" label="1">是</el-radio>
+                <el-radio v-model="form.is_emptyvehicle" label="0">否</el-radio>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">