Merge remote-tracking branch 'origin/master'

pom.xml

@@ -242,6 +242,12 @@
 			<artifactId>easyexcel</artifactId>
 			<artifactId>easyexcel</artifactId>
 			<version>3.1.1</version>
 			<version>3.1.1</version>
 		</dependency>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	</dependencies>
 
 
 
 

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -519,7 +519,8 @@ public class DeviceController {
             if(!Strings.isNullOrEmpty(hSerial)){
             if(!Strings.isNullOrEmpty(hSerial)){
                 for (DataLog queueTask : queueTasks) {
                 for (DataLog queueTask : queueTasks) {
                     if(queueTask.isCheckOutTask() && !queueTask.isFinished()){
                     if(queueTask.isCheckOutTask() && !queueTask.isFinished()){
-                        if(queueTask.getSourceName().equals(hSerial)){
+                        String sourceName = queueTask.getSourceName();
+                        if(sourceName != null && queueTask.getSourceName().equals(hSerial)){
                             //单号相同任务数量+1
                             //单号相同任务数量+1
                             outTaskCount = outTaskCount + 1;
                             outTaskCount = outTaskCount + 1;
                         }
                         }

src/main/java/com/neotel/smfcore/core/language/rest/LanguageMsgController.java

@@ -94,6 +94,21 @@ public class LanguageMsgController {
         return ResultBean.newOkResult(resultMsg);
         return ResultBean.newOkResult(resultMsg);
     }
     }
 
 
+    @RequestMapping(value = "/getLanguageMsgList")
+    @AnonymousAccess
+    public List<LanguageMsg> getMsgList(String type) throws Exception {
+        List<LanguageMsg> results = new ArrayList<>();
+        Criteria criteria = Criteria.where("type").is(type);
+        Query query = Query.query(criteria);
+        List<LanguageMsg> list = languageMsgManager.findByQuery(query);
+        for (LanguageMsg languageMsg : list) {
+            if(!languageMsg.getCreateDate().equals(languageMsg.getUpdateDate())){
+                languageMsg.setId(null);//不需要返回ID
+                results.add(languageMsg);
+            }
+        }
+        return results;
+    }
 
 
     @ApiOperation("导出资源文件")
     @ApiOperation("导出资源文件")
     @GetMapping(value = "/download")
     @GetMapping(value = "/download")

src/main/java/com/neotel/smfcore/core/language/service/po/LanguageMsg.java

@@ -18,7 +18,8 @@ import java.util.Map;
 
 
 @Data
 @Data
 @Document
 @Document
-public class LanguageMsg extends BasePo implements Serializable {
+public class
+LanguageMsg extends BasePo implements Serializable {
 
 
    public LanguageMsg(){
    public LanguageMsg(){
 
 

src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java

@@ -92,8 +92,8 @@ public class MessageUtils {
     private void initLanguageMsgList() {
     private void initLanguageMsgList() {
         msgMap = messageService.loadMsgMap();
         msgMap = messageService.loadMsgMap();
 
 
-        //自动导入CSV内容，只新增不修改
-        messageService.autoImportCsvFile();
+        //自动导入JSON内容
+        messageService.autoImportJsonFile();
         //只新增不修改
         //只新增不修改
         messageService.autoImportResources();
         messageService.autoImportResources();
         if (msgMap.size() > 0) {
         if (msgMap.size() > 0) {

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -410,9 +410,13 @@ public class LiteOrderCache {
                     if(!Strings.isNullOrEmpty(reelId)){
                     if(!Strings.isNullOrEmpty(reelId)){
                         //RI
                         //RI
                         pos=storagePosManager.getByBarcode(reelId);
                         pos=storagePosManager.getByBarcode(reelId);
-                        if(excludePosIds.contains(pos.getId())) {
-                            log.info("工单[" + orderNo + "]RI出库,任务数[" + taskReelCount + "]出库位置仓位【" + pos.getPosName() + "】RI=[" + pos.getBarcode().getBarcode() + "]已在操作队列中，跳过不处理");
-                            break;
+                        if(pos != null){
+                            if(excludePosIds.contains(pos.getId())) {
+                                log.info("工单[" + orderNo + "]RI出库,任务数[" + taskReelCount + "]出库位置仓位【" + pos.getPosName() + "】RI=[" + pos.getBarcode().getBarcode() + "]已在操作队列中，跳过不处理");
+                                break;
+                            }
+                        }else{
+                            log.info("工单[" + orderNo + "]RI出库时,库存中未找到料盘["+reelId+"]");
                         }
                         }
                     }else{
                     }else{
                         //PN
                         //PN

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -194,13 +194,14 @@ public class TaskService {
      * 获取所有任务
      * 获取所有任务
      */
      */
     public List<DataLog> getAllTasksByCid(String cid) {
     public List<DataLog> getAllTasksByCid(String cid) {
+        List<DataLog> resultTasks = new ArrayList<>();
         List<DataLog> allTasks = getAllTasks();
         List<DataLog> allTasks = getAllTasks();
         for (DataLog task : allTasks) {
         for (DataLog task : allTasks) {
             if(task.getCid().equals(cid)){
             if(task.getCid().equals(cid)){
-                allTasks.add(task);
+                resultTasks.add(task);
             }
             }
         }
         }
-        return allTasks;
+        return resultTasks;
     }
     }
 
 
     /**
     /**

src/main/java/com/neotel/smfcore/security/service/po/Menu.java

@@ -188,7 +188,7 @@ public class Menu extends BasePo implements Serializable {
         menu.setHidden(false);
         menu.setHidden(false);
         menu.setComponentName("");
         menu.setComponentName("");
         menu.setIcon(icon);
         menu.setIcon(icon);
-        menu.setTitleKey("");
+        menu.setTitleKey(path);
         menu.setParentMenu(parentMenu);
         menu.setParentMenu(parentMenu);
         return menu;
         return menu;
     }
     }

src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8800
   port: 8800
 
 
 api:
 api:
-  name: Neotel
+  name:
   inCheckUrl:
   inCheckUrl:
   outNotifyUrl:
   outNotifyUrl:
   inNotifyUrl:
   inNotifyUrl:

src/test/java/com/neotel/smfcore/ApplicationTests.java

+package com.neotel.smfcore;
+
+
+
+import com.neotel.smfcore.common.exception.ApiException;
+import com.neotel.smfcore.common.utils.FileUtil;
+import com.neotel.smfcore.common.utils.HttpHelper;
+import com.neotel.smfcore.common.utils.JsonUtil;
+import org.junit.jupiter.api.Test;
+import org.springframework.util.FileCopyUtils;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ApplicationTests {
+
+	@Test
+	void contextLoads() {
+		saveLanguageFile("smfcore");
+		saveLanguageFile("smf");
+	}
+
+	private void saveLanguageFile(String type){
+		try {
+			String url = "http://192.168.1.243/smf-core/api/translation/getLanguageMsgList";
+			Map<String,Object> params = new HashMap<>();
+			params.put("type",type);
+			System.out.println("开始获取最新["+type+"]翻译资源...");
+			String jsonTxt = HttpHelper.postParam(url,params);
+			Map<String, Object> resultMap = JsonUtil.toMap(jsonTxt);
+			if(resultMap.get("status") != null){
+				System.out.println(jsonTxt);
+				return;
+			}
+//			String jsonTxt = type + "+++++";
+			String testClassDirPath = this.getClass().getResource("/").getPath();
+			File testClassDir = new File(testClassDirPath);
+			File projectDir = testClassDir.getParentFile().getParentFile();
+			String filename = type+".json";
+			File projectJsonFile = new File(projectDir,"src/main/resources/"+filename);
+			System.out.println("生成翻译资源文件到" + projectJsonFile.getAbsolutePath());
+			try(FileWriter fw = new FileWriter(projectJsonFile)){
+				fw.write(jsonTxt);
+			}
+			File targetJsonFile = new File(projectDir,"target/classes/"+filename);
+			if(targetJsonFile.exists()){
+				targetJsonFile.delete();
+			}
+			System.out.println("复制翻译资源文件到" + targetJsonFile.getAbsolutePath());
+			FileCopyUtils.copy(projectJsonFile,targetJsonFile);
+		} catch (Exception e) {
+			System.out.println("获取["+type+"]翻译资源出错"+e.getMessage());
+		}
+	}
+}