fix

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -989,9 +989,10 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             // NDC agv指令不当场取消指令,需要等agv上报
             if (!StrUtil.isEmpty(entity.getAgv_jobno())) {
                 ndcAgvService.deleteAgvInstToNDC(new Instruction(entity));
-            } else {
-                flag = true;
             }
+//            } else {
+                flag = true;
+//            }
 //        } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")
 //                && !StrUtil.equals(entity.getSend_status(), "2")) {
 //            XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/CzDto.java

@@ -19,5 +19,6 @@ public class CzDto {
     private String mother_type;
     private String sub_type;
     private String error;
+    private String fbc;
 
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java

@@ -3,12 +3,15 @@ package org.nl.wms.board.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.RedisUtils;
 import org.nl.wms.board.service.BoardService;
 import org.nl.wms.board.service.dao.dto.*;
 import org.nl.wms.board.service.dao.mapper.BoardMapper;
 import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +24,8 @@ public class BoardServiceImpl implements BoardService {
     private BoardMapper boardMapper;
     @Autowired
     private RedisUtils redisUtils;
+    @Autowired
+    private ISchBasePointService pointService;
 
     public JSONObject cz() {
         CzDto czDto = boardMapper.cz(String.valueOf(redisUtils.get("sub_tray")));
@@ -34,6 +39,9 @@ public class BoardServiceImpl implements BoardService {
         czDto.setMother_type(String.valueOf(redisUtils.get("mother_type")));
         czDto.setSub_type(String.valueOf(redisUtils.get("sub_type")));
         czDto.setError(String.valueOf(redisUtils.get("error")));
+        SchBasePoint schBasePoint= pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
+                .eq(SchBasePoint::getPoint_code, "FBC01"));
+        czDto.setFbc(schBasePoint!=null&&schBasePoint.getVehicle_qty()==0?"无货":"有货");
         return JSONObject.parseObject(JSON.toJSONString(czDto, SerializerFeature.WriteNullStringAsEmpty));
     }
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml

@@ -20,6 +20,9 @@
         <if test="query.productDescription  != null">
             and m.productDescription like  CONCAT('%', #{query.productDescription}, '%')
         </if>
+        <if test="query.point_code  != null">
+            and p.point_code like  CONCAT('%', #{query.point_code}, '%')
+        </if>
         ORDER BY point_code ASC
     </select>
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java

@@ -20,4 +20,6 @@ public class ReportQuery implements Serializable {
     private String supplierName;
     //绑定状态
     private String group_bind_material_status;
+    //点位编码
+    private String point_code;
 }

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

@@ -10,6 +10,23 @@
           label-width="90px"
           label-suffix=":"
         >
+        <el-form-item label="点位编码">
+            <el-select
+              v-model="query.point_code"
+              clearable
+              size="mini"
+              placeholder="点位编码"
+              class="filter-item"
+              filterable  
+              @remote-method="getPointList"
+            >
+              <el-option
+                v-for="item in pointList"
+                :label="item.point_code"
+                :value="item.point_code"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="供应商名称">
             <el-select
               v-model="query.supplierName"
@@ -17,6 +34,8 @@
               size="mini"
               placeholder="供应商名称"
               class="filter-item"
+              filterable  
+              @remote-method="getSupplierNameList"
             >
               <el-option
                 v-for="item in supplierNameList"
@@ -32,6 +51,8 @@
               size="mini"
               placeholder="物料名称"
               class="filter-item"
+              filterable  
+              @remote-method="getProductDescriptionList"
             >
               <el-option
                 v-for="item in productDescriptionList"