From 31101f632c27c05d15f30ca3084e3ed3da2a29af Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 08 十二月 2023 11:42:08 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java index 0df6072..2a1c301 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java +++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java @@ -1,16 +1,10 @@ package com.example.springboot.service; - -import java.lang.reflect.Array; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.example.springboot.common.Result; import com.example.springboot.component.S7control; -import com.example.springboot.entity.Glass; import com.example.springboot.entity.StorageCage; import com.example.springboot.entity.north_glass_buffer1; import com.example.springboot.mapper.SpianMapper; @@ -95,6 +89,7 @@ spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害 spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString());// 鏂板浠诲姟 S7control.getinstance().WriteWord(adddresslist, datas); + System.out.println("姹囨姤鏃朵换鍔" + datas); }else{ // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠� @@ -103,6 +98,8 @@ spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害 spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString());// 鏂板浠诲姟 S7control.getinstance().WriteWord(adddresslist, datas); + System.out.println("姹囨姤鏃朵换鍔" + datas); + // S7control.getinstance().WriteByte("DB105.16",glassid); } -- Gitblit v1.8.0