From 044c32c15ee9ccac6f3b60eb6745025e2f4480f2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 十二月 2024 16:59:54 +0800
Subject: [PATCH] 报工回传+库位显示

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java |   63 +++++++++++++++----------------
 1 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
index bbffdb6..b3e5ebe 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
@@ -4,10 +4,7 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.mes.md.entity.*;
-import com.mes.md.mapper.AccountMapper;
-import com.mes.md.mapper.KBBTJPDrawingBPMapper;
-import com.mes.md.mapper.MachineMapper;
-import com.mes.md.mapper.PrimitiveTaskMapper;
+import com.mes.md.mapper.*;
 import com.mes.md.service.AccountService;
 import com.mes.md.service.PrimitiveTaskService;
 import com.mes.md.service.ProjectService;
@@ -29,10 +26,7 @@
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 
 /**
  * @Author : yanzhixin
@@ -69,36 +63,41 @@
     @Autowired
     MachineMapper machineMapper;
 
+    @Autowired
+    TaskingMapper taskingMapper;
+
+    @Autowired
+    KBBTLensSortingMapper kBBTLensSortingMapper;
+
+    /**
+     * 娴嬭瘯 鎵爜鍚庡簱浣�
+     */
     @Test
     public void testStr() {
-        String str=new String("4銆佸彂閫佷换鍔�  浠诲姟鏁版嵁锛歿}, ".getBytes(),StandardCharsets.UTF_8);
-        int a=1;
-        log.info(str,1);
+
+        //鍒涘缓Calendar瀹炰緥
+        Calendar cal = Calendar.getInstance();
+        //璁剧疆褰撳墠鏃堕棿
+        cal.setTime(new Date());
+        cal.add(Calendar.DATE, -3);
+        int deleteCount=taskingMapper.deleteJoin(new MPJLambdaWrapper<Tasking>()
+                .selectAll(Tasking.class)
+                .le(Tasking::getOperationRecordTime,cal.getTime()));
+
+        log.info("{},鍒犻櫎鏁版嵁:{}",cal.getTime(),deleteCount);
     }
 
     @Test
     public void testSaoMa3() {
-        try {
-// 鍒涘缓TCP瀹㈡埛绔苟杩炴帴鍒版湇鍔″櫒
-            String serverAddress = "192.168.1.8";
-            int serverPort = 2001;
-            Socket clientSocket = new Socket(serverAddress, serverPort);
-            // 鍒涘缓杈撳叆娴佸拰杈撳嚭娴�
-            InputStream inputStream = clientSocket.getInputStream();
-            OutputStream outputStream = clientSocket.getOutputStream();
-            // 鍙戦�佹暟鎹粰鏈嶅姟鍣�
-            String message = "start";
-            outputStream.write(message.getBytes());
-            // 璇诲彇鏈嶅姟鍣ㄥ搷搴旂殑鏁版嵁
-            byte[] buffer = new byte[1024];
-            int bytesRead = inputStream.read(buffer);
-            String receivedMessage = new String(buffer, 0, bytesRead);
-            System.out.println("鏀跺埌鏈嶅姟鍣ㄥ搷搴旓細" + receivedMessage);
-            // 鍏抽棴杩炴帴
-            clientSocket.close();
-        }catch (Exception e){
-            log.info("鎵爜寮傚父");
-        }
+        int deleteCount=taskingMapper.deleteJoin(new MPJLambdaWrapper<Tasking>()
+                .selectAll(Tasking.class)
+                .innerJoin(LineConfiguration.class,LineConfiguration::getId,Tasking::getLineConfigurationId)
+                .innerJoin(Machine.class,Machine::getId,LineConfiguration::getMachineId)
+                .eq(LineConfiguration::getMachineId,24L)
+                .eq(Tasking::getGlassState,"姝e父")
+                .eq(Tasking::getState,"绾夸笂")
+                .ne(Tasking::getWorkState,"瀹屽伐"));
+        log.info("{}",deleteCount);
     }
 
     @Test

--
Gitblit v1.8.0