wuyouming666
2024-07-17 fdd8b5a108ce6adef15d88a9c4c520205ed84c94
原片仓储配置
4个文件已修改
1个文件已添加
87 ■■■■■ 已修改文件
UI-Project/src/views/GlassStorage/MaterialRackManagement.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/gateway/src/main/resources/application.yml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
@@ -64,8 +64,17 @@
            <!-- <el-button type="success" size="mini" @click="addglass()">添加原片</el-button> -->
          </template>
        </el-table-column>
      </el-table>
      </el-table>
      <el-pagination
        v-if="totalItems > 0"
        background
        layout="prev, pager, next"
        :total="totalItems"
        :page-size="pageSize"
        @current-change="handleCurrentChange"
      ></el-pagination>
      
  </el-dialog>
@@ -257,6 +266,17 @@
    const Hidden = ref(false)
    const totalItems = ref(0);
    totalItems.value = 10;
    const pageSize = 10;
    let currentPage = ref(1);
    const handleCurrentChange = (val) => {
      currentPage.value = val;
    };
   const getTagType2 =(status) => {
      switch (status) {
        case 'completed':
hangzhoumesParent/gateway/src/main/resources/application.yml
@@ -47,6 +47,14 @@
          filters:
            - StripPrefix=2
        - id: glassStorage
          uri: lb://glassStorage
          predicates:
            - Path=/api/glassStorage/**
          filters:
            - StripPrefix=2
#        - id: unLoadGlass
#          uri: lb://unLoadGlass
#          predicates:
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -17,7 +17,7 @@
  cloud:
    nacos:
      discovery:
        server-addr: 127.0.0.1:8848
        server-addr: 10.153.19.150:8848
  redis:
    database: 0
    host: 127.0.0.1
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
New file
@@ -0,0 +1,54 @@
package mes;
import com.mes.GlassStorageApplication;
import com.mes.storagetask.entity.StorageTask;
import com.mes.storagetask.service.StorageTaskService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.Arrays;
/**
 * @Author : zhoush
 * @Date: 2024/3/27 16:37
 * @Description:
 */
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest(classes = GlassStorageApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class GlassStorageModuleApplicationTest {
    @Autowired
    private StorageTaskService storageTaskService;
    @Test
    public void testFindPath() {
        log.info("完整路径:{}", Arrays.asList("123"));
    }
    @Test
    public void testCacheGlass() {
     // storageTaskService.getBaseMapper().selectById(1);
        StorageTask storageTask=new StorageTask();
//        storageTask.setId(Long.valueOf("1"));
//        storageTask.setTaskState("1");
//      storageTaskService.updateById(storageTask);
//        storageTaskService.getBaseMapper().deleteById(1);
        storageTaskService.findList(storageTask);
    }
}
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -92,6 +92,7 @@
        String currentSlot = plcParameterObject.getPlcParameter("currentCell").getValue();
        log.info("1、获取到的请求字为:{},获取到的扫描ID为:{},获取到的确认字为:{},获取到的出片状态分别为:g06:{}、g08:{}、g11:{}、g13:{},当前格子号为:{}",
                requestWord, glassIdeValue, confirmationWrodValue, out06Glassstate, out08Glassstate, out11Glassstate, out13Glassstate, currentSlot);