From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index 7283d26..4c38ae0 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -1,6 +1,7 @@
package mes;
import com.mes.UnLoadGlassApplication;
+import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downglassinfo.service.impl.DownGlassInfoServiceImpl;
@@ -12,9 +13,11 @@
import com.mes.downstorage.service.impl.DownStorageCageDetailsServiceImpl;
import com.mes.downstorage.service.impl.DownStorageCageServiceImpl;
+import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl;
import com.mes.glassinfo.service.impl.GlassInfoServiceImpl;
+import com.mes.job.DownLoadCacheGlassTask;
import com.mes.utils.Result;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -97,14 +100,14 @@
@Test
public void testupdateFlowCardIdAndCount() {
log.info("缁戝畾娴佺▼鍗″彿鍜屾暟閲�");
- downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1);
+ downWorkstationServiceImpl.updateFlowCardIdAndCount("NG24060401A020", 1, 2);
}
@Test
public void testplc() {
log.info("娴嬭瘯");
- glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01");
+ glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01",1);
}
@@ -190,15 +193,47 @@
}
@Test
+ public void updateDownWorkstationstate() {
+
+ DownWorkstation downWorkstation= new DownWorkstation();
+
+ downWorkstation.setId(1);
+ downWorkstation.setEnableState(0);
+ downWorkstationServiceImpl.updateDownWorkstationstate(downWorkstation);
+ }
+
+
+ @Test
+ public void updateDownstate() {
+
+ DownStorageCage downStorageCage= new DownStorageCage();
+
+ downStorageCage.setId(1);
+ downStorageCage.setEnableState(0);
+ downStorageCageServiceImpl.updateDownStorageCage(downStorageCage);
+ }
+
+
+ /* @Test
public void updateDownStorageCage() {
DownStorageCage downStorageCage= new DownStorageCage();
- downStorageCage.setEnableState("0");
+ downStorageCage.setEnableState(0);
downStorageCage.setId(1);
downStorageCageService.updateDownStorageCage(downStorageCage);
+ }*/
+
+ @Test
+ public void downGlassPrint() {
+ DownGlassInfo downGlassInfo=new DownGlassInfo();
+ downGlassInfo.setFlowCardId("NG24070506A001");
+ downGlassInfo.setLayer(1);
+ downGlassInfoService.downGlassPrint(downGlassInfo);
}
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0