From df7b9438e56b9d0481453b91e3f3b29759f6a36d Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Wed, 24 Jul 2024 09:33:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=B6=82=E7=BA=BF=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=97=B6=E6=89=8B=E6=8C=81=E4=B8=8B=E6=96=99=E4=B8=8A=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pda/controller/PdaController.java  | 15 +++++++++
 .../org/nl/wms/pda/service/PdaService.java    |  9 ++++++
 .../pda/service/dao/dto/SendMaterialDto.java  |  5 +++
 .../wms/pda/service/dao/mapper/PdaMapper.java |  3 ++
 .../wms/pda/service/dao/mapper/PdaMapper.xml  |  9 ++++++
 .../wms/pda/service/impl/PdaServiceImpl.java  | 31 +++++++++++++++++++
 .../task/tasks/auto/GHCMLTask.java            |  4 ++-
 7 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
index 3e34064..c79bb67 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
@@ -62,6 +62,21 @@ public class PdaController {
         return new ResponseEntity<>(pdaService.coatedWireIntoStorageTask(sendMaterialDto), HttpStatus.OK);
     }
 
+    @PostMapping("/manualSorting/ltxTask")
+    @Log("连涂线入库-动作")
+    @ApiOperation("连涂线入库-动作")
+    public ResponseEntity<PdaResponseVo> ltxTask(@Validated @RequestBody SendMaterialDto sendMaterialDto){
+        return new ResponseEntity<>(pdaService.ltxTask(sendMaterialDto), HttpStatus.OK);
+    }
+
+    @PostMapping("/getLtxPointList")
+    @Log("连涂线入库-获取涂板线列表")
+    @ApiOperation("连涂线入库-获取涂板线列表")
+    public ResponseEntity<Object> getLtxPointList(){
+        return new ResponseEntity<>(pdaService.getLtxPointList(), HttpStatus.OK);
+    }
+
+
     @PostMapping("/manualSorting/coatedWireIntoStorageTaskShow")
     @Log("涂板线入库-显示任务信息")
     @ApiOperation("涂板线入库-显示任务信息")
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
index 919d72a..99d2a24 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
@@ -40,6 +40,13 @@ public interface PdaService {
      */
     PdaResponseVo coatedWireIntoStorageTask(SendMaterialDto sendMaterialDto);
 
+    /**
+     * 涂板线送料
+     * @param sendMaterialDto 送料实体
+     * @return 手持统一VO
+     */
+    PdaResponseVo ltxTask(SendMaterialDto sendMaterialDto);
+
     /**
      * 获取任务数据
      * @return 任务数据
@@ -49,6 +56,8 @@ public interface PdaService {
 
     List<SchBasePointDto> getPointList();
 
+    List<SchBasePointDto> getLtxPointList();
+
     /**
      * 根据物料编码获取物料库存信息
      * @param materialCode /
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/SendMaterialDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/SendMaterialDto.java
index b2f5ac4..ddf7b9a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/SendMaterialDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/SendMaterialDto.java
@@ -18,5 +18,10 @@ public class SendMaterialDto {
      */
     private Integer qty;
 
+    /**
+     * 方向0-下料，1-上空拖
+     */
+    private Integer action;
+
     private String material_code;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java
index 8fc26d9..e8dadd9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java
@@ -42,6 +42,9 @@ public interface PdaMapper {
 
     List<SchBasePointDto> getPointList();
 
+    List<SchBasePointDto> getLtxPointList();
+
+
     List<GhsPointVo> getGhsPointList();
 
     void changePointQty(String group_id,int qty);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
index d682c9c..9674eea 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
@@ -89,6 +89,15 @@
         WHERE p.point_type = 2 AND p.region_code = 'TBX' AND p.can_vehicle_type = '1'
     </select>
 
+    <select id="getLtxPointList" 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 = '2'
+    </select>
+
     <select id="getGhsPointList" resultType="org.nl.wms.pda.service.dao.vo.GhsPointVo">
         SELECT
         p.point_code,
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
index ac1226d..0b4068b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -98,6 +98,33 @@ public class PdaServiceImpl implements PdaService {
         return PdaResponseVo.pdaResultOk("工单：[" + bdWorkorder.getWorkorder_code() + "]完工成功");
     }
 
+    @Override
+    public PdaResponseVo ltxTask(SendMaterialDto sendMaterialDto) {
+        // 获取工单
+        PdmBdWorkorder productionTask = workorderService.getDeviceDockingProductionTask(sendMaterialDto.getPoint_code());
+        if (ObjectUtil.isEmpty(productionTask)) {
+            throw new BadRequestException("点位：[" + sendMaterialDto.getPoint_code() + "]的工单不存在");
+        }
+        MdBaseMaterial material = materialService.getById(productionTask.getMaterial_id());
+        AbstractTask tbxmlTask = taskFactory.getTask("TBXMLTask");
+        AbstractTask tbxqkTask = taskFactory.getTask("TBXQKTask");
+        // 准备参数：设备编码
+        JSONObject param = new JSONObject();
+        param.put("device_code", sendMaterialDto.getPoint_code());
+        param.put("create_mode", GeneralDefinition.PDA_CREATION);
+        param.put("qty", ObjectUtil.isNotEmpty(sendMaterialDto.getQty()) ? sendMaterialDto.getQty() : material.getStandard_qty());
+        param.put("user_id", "1");
+        if(sendMaterialDto.getAction()==0) {
+            param.put("config_code", "TBXMLTask");
+            tbxmlTask.apply(param);
+        }else{
+            param.put("config_code", "TBXQKTask");
+            tbxqkTask.apply(param);
+        }
+
+        return PdaResponseVo.pdaResultOk("连涂线入库请求成功");
+    }
+
     @Override
     public PdaResponseVo coatedWireIntoStorageTask(SendMaterialDto sendMaterialDto) {
         // 获取工单
@@ -122,6 +149,10 @@ public class PdaServiceImpl implements PdaService {
         return pdaMapper.getPointList();
     }
 
+    public List<SchBasePointDto> getLtxPointList(){
+        return pdaMapper.getLtxPointList();
+    }
+
     @Override
     public List<GhsPointVo> getGhsPointList(){
         return pdaMapper.getGhsPointList();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
index bf15f8f..8d5fa8d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.dynamictp.common.util.StringUtil;
 import org.nl.common.exception.BadRequestException;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.system.service.param.ISysParamService;
@@ -157,7 +158,8 @@ public class GHCMLTask extends AbstractTask {
                 if(row_num==schBasePoint.getRow_num()){
                     continue;
                 }
-                if(PointStatusEnum.EMPTY_POINT.getCode().equals(schBasePoint.getPoint_status())){
+                if(PointStatusEnum.EMPTY_POINT.getCode().equals(schBasePoint.getPoint_status())
+                && StringUtil.isEmpty(schBasePoint.getIng_task_code())){
                     temp = schBasePoint;
                 }else{
                     row_num=schBasePoint.getRow_num();