Commit 0b9bbb19 LN

bug修改

1 个父辈 b60100ab
...@@ -218,6 +218,9 @@ public class SpBoxController { ...@@ -218,6 +218,9 @@ public class SpBoxController {
if (!Strings.isNullOrEmpty(storageId)) { if (!Strings.isNullOrEmpty(storageId)) {
c = c.and("storageId").is(storageId); c = c.and("storageId").is(storageId);
} }
if(!Strings.isNullOrEmpty(pn)){
c=c.and("barcode.partNumber").is(pn);
}
Query q = new Query(c); Query q = new Query(c);
q.limit(num); q.limit(num);
//优先使用二次入库的 //优先使用二次入库的
......
...@@ -2,6 +2,7 @@ package com.neotel.smfcore; ...@@ -2,6 +2,7 @@ package com.neotel.smfcore;
import cn.hutool.core.util.CharsetUtil;
import com.neotel.smfcore.common.exception.ApiException; import com.neotel.smfcore.common.exception.ApiException;
import com.neotel.smfcore.common.utils.FileUtil; import com.neotel.smfcore.common.utils.FileUtil;
import com.neotel.smfcore.common.utils.HttpHelper; import com.neotel.smfcore.common.utils.HttpHelper;
...@@ -44,9 +45,10 @@ public class ApplicationTests { ...@@ -44,9 +45,10 @@ public class ApplicationTests {
String filename = type+".json"; String filename = type+".json";
File projectJsonFile = new File(projectDir,"src/main/resources/"+filename); File projectJsonFile = new File(projectDir,"src/main/resources/"+filename);
System.out.println("生成翻译资源文件到" + projectJsonFile.getAbsolutePath()); System.out.println("生成翻译资源文件到" + projectJsonFile.getAbsolutePath());
try(FileWriter fw = new FileWriter(projectJsonFile)){ FileUtil.writeString(jsonTxt,projectJsonFile, CharsetUtil.CHARSET_UTF_8);
fw.write(jsonTxt); // try(FileWriter fw = new FileWriter(projectJsonFile)){
} // fw.write(jsonTxt);
// }
File targetJsonFile = new File(projectDir,"target/classes/"+filename); File targetJsonFile = new File(projectDir,"target/classes/"+filename);
if(targetJsonFile.exists()){ if(targetJsonFile.exists()){
targetJsonFile.delete(); targetJsonFile.delete();
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!