From 43893b2c41a4f3785b3619f20aa1945852b43d72 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Fri, 30 Sep 2022 11:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/ClientTestController.java   | 17 +++++++++++++----
 .../web/service/client/TMTransmission.java     | 18 ++++++++++++++++++
 web/src/main/resources/application-prod.yml    |  4 ++--
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/controller/ClientTestController.java b/web/src/main/java/com/zhehekeji/web/controller/ClientTestController.java
index 56a8a30..f6f68bf 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/ClientTestController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/ClientTestController.java
@@ -41,14 +41,23 @@ public class ClientTestController {
         return Result.success();
     }
 
-    @ApiOperation("盘点具体货位 第一步 【开始】")
+    @ApiOperation("盘点具体货位 第一步 【发起盘点】")
     @GetMapping("/stockCheck/start")
     public Result<Boolean> startStockCheck(@ApiParam("巷道标识") String SRMNumber,@ApiParam("盘点批次ID")  String taskId,
-                                           @ApiParam("货位号,如L0100010002 ,R/L表示左右,01是浅货位（02深）,0001是X,0002是Y") String goodsLocation,
+                                           @ApiParam("货位号,如L0100010002 ,R/L表示左右,01是浅货位（02深）,0001是X,0002是Y") String goodsLocation,@ApiParam("品规")String code,@ApiParam("数量")Integer count,
                                            @ApiParam("是否是虚拟检测 Y:是  N:不是")String V){
-        TMTransmission tmTransmission = new TMTransmission();
 
-        ClientChanel.write(ECTransmission.toEmptyCheckEndString(SRMNumber),SRMNumber);
+        TMTransmission tmTransmission = new TMTransmission(SRMNumber,taskId,goodsLocation,code,count,V);
+        ClientChanel.write(tmTransmission.toString(),SRMNumber);
+        return Result.success();
+    }
+
+    @ApiOperation("盘点具体货位 第二步 【取货到载货台完成】")
+    @GetMapping("/stockCheck/goodsMoveOver")
+    public Result<Boolean> goodsMoveOver(@ApiParam("巷道标识") String SRMNumber,@ApiParam("盘点批次ID")  String taskId){
+
+        TMTransmission tmTransmission = new TMTransmission(SRMNumber,taskId);
+        ClientChanel.write(tmTransmission.toSC02String(),SRMNumber);
         return Result.success();
     }
 
diff --git a/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java b/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java
index 20ccdb1..9624e9e 100644
--- a/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java
+++ b/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java
@@ -60,6 +60,10 @@ public class TMTransmission {
         return sb.toString();
     }
 
+    public String toSC02String(){
+        return header+Split+SRMNumber+Split+taskNo;
+    }
+
     public static String getHeader(){
         return header;
     }
@@ -86,4 +90,18 @@ public class TMTransmission {
 
         }
     }
+
+    public TMTransmission(String SRMNumber,String taskId,String goodsLocation,String code,Integer count,String visual){
+        this.SRMNumber = SRMNumber;
+        this.taskNo = taskId;
+        this.goodsLocation = goodsLocation;
+        this.code = code;
+        this.count = count;
+        this.visualTest = visual;
+    }
+
+    public TMTransmission(String SRMNumber,String taskId){
+        this.SRMNumber = SRMNumber;
+        this.taskNo = taskId;
+    }
 }
diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml
index 2387d7d..523f54b 100644
--- a/web/src/main/resources/application-prod.yml
+++ b/web/src/main/resources/application-prod.yml
@@ -72,14 +72,14 @@ videoStyleConfig:
 # -----------  num:总共多少个光源端口   index:需要控制的是哪个
 # ------------ 利珀视觉控制器id从1开始，光源控制器从0开始
 lightSource:
-  type: 2
+  type: 1
   num: 4
   index: 1
 # -----tray 托盘
 # -----goods 货物
 # 扫码模式  0:此处不盘点  1：球机扫码   2：sick扫码枪  3:南北达RFID
 scanCodeMode:
-  tray: 1
+  tray: 3
   goods: 0
   goodsCodeTypes:
     - 14