fix

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java

@@ -68,11 +68,18 @@ public class PdaController {
         return new ResponseEntity<>(pdaService.coatedWireIntoStorageTaskShow(), HttpStatus.OK);
     }
 
+    @PostMapping("/getPointList")
+    @Log("涂板线入库-获取涂板线列表")
+    @ApiOperation("涂板线入库-获取涂板线列表")
+    public ResponseEntity<Object> getPointList(){
+        return new ResponseEntity<>(pdaService.getPointList(), HttpStatus.OK);
+    }
+
     @PostMapping("/getInventoryMaterialInfo")
     @Log("获取暂存区库存信息")
     @ApiOperation("获取暂存区库存信息")
-    public ResponseEntity<List<MaterialInventoryVo>> getInventoryMaterialInfo(@RequestParam String material_code){
+    public ResponseEntity<List<MaterialInventoryVo>> getInventoryMaterialInfo(@RequestBody SendMaterialDto sendMaterialDto){
-        return new ResponseEntity<>(pdaService.getInventoryMaterialInfo(material_code), HttpStatus.OK);
+        return new ResponseEntity<>(pdaService.getInventoryMaterialInfo(sendMaterialDto.getMaterial_code()), HttpStatus.OK);
     }
     @PostMapping("/materialList")
     @Log("设备状态下拉框数据")

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java

@@ -3,6 +3,7 @@ package org.nl.wms.pda.service;
 import org.nl.wms.pda.service.dao.dto.ManualSortingDto;
 import org.nl.wms.pda.service.dao.dto.SendMaterialDto;
 import org.nl.wms.pda.service.dao.vo.*;
+import org.nl.wms.sch.point.service.dto.SchBasePointDto;
 
 import java.util.List;
 
@@ -44,6 +45,9 @@ public interface PdaService {
      */
     List<TaskShowVo> coatedWireIntoStorageTaskShow();
 
+
+    List<SchBasePointDto> getPointList();
+
     /**
      * 根据物料编码获取物料库存信息
      * @param materialCode /

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

@@ -17,4 +17,6 @@ public class SendMaterialDto {
      * 物料数量
      */
     private Integer qty;
+
+    private String material_code;
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java

@@ -4,6 +4,7 @@ import org.nl.wms.pda.service.dao.vo.DropdownListVo;
 import org.nl.wms.pda.service.dao.vo.ManualWorkOrderVo;
 import org.nl.wms.pda.service.dao.vo.MaterialInventoryVo;
 import org.nl.wms.pda.service.dao.vo.TaskShowVo;
+import org.nl.wms.sch.point.service.dto.SchBasePointDto;
 
 import java.util.List;
 
@@ -40,4 +41,7 @@ public interface PdaMapper {
      * @return /
      */
     List<DropdownListVo> getmaterialList();
+
+
+    List<SchBasePointDto> getPointList();
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml

@@ -77,4 +77,14 @@
         FROM
             `md_base_material`
     </select>
+
+
+    <select id="getPointList" resultType="org.nl.wms.sch.point.service.dto.SchBasePointDto">
+        SELECT
+            p.*
+        FROM
+            `sch_base_point` p
+                LEFT JOIN sch_base_point p1 ON p1.point_code = p.parent_point_code AND p1.point_type = '1' AND p1.region_code = 'TBX'
+        WHERE p.point_type = 2 AND p.region_code = 'TBX' AND p.can_vehicle_type = '1'
+    </select>
 </mapper>

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

@@ -14,6 +14,7 @@ import org.nl.wms.pda.service.dao.mapper.PdaMapper;
 import org.nl.wms.pda.service.dao.vo.*;
 import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
 import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
+import org.nl.wms.sch.point.service.dto.SchBasePointDto;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task_manage.AbstractTask;
 import org.nl.wms.sch.task_manage.GeneralDefinition;
@@ -116,6 +117,10 @@ public class PdaServiceImpl implements PdaService {
         return PdaResponseVo.pdaResultOk("涂板线入库请求成功");
     }
 
+    public List<SchBasePointDto> getPointList(){
+        return pdaMapper.getPointList();
+    }
+
     @Override
     public List<TaskShowVo> coatedWireIntoStorageTaskShow() {
         return pdaMapper.getRunningTaskByConfigAndCreateMode("TBXMLTask", GeneralDefinition.PDA_CREATION);