Explorar el Código

fix:按照托码修改品相信息修复

yingjian.wu hace 2 meses
padre
commit
727807b4fa

+ 8 - 7
src/main/java/com/qlm/controller/jinzai/ProdBatchController.java

@@ -380,9 +380,6 @@ public class ProdBatchController extends CommonController {
                     .map(code -> "'" + code + "'")
                     .collect(Collectors.joining(","));
             List<Record> masterRecords = Db.find("select * from jinzai_upload_master where id in(" + codeList + ")");
-            if(masterRecords.size() != referenceCodes.size()){
-                return ApiResponse.error("有箱码不存在");
-            }
             masterRecords.forEach(record -> {
                 referenceCodeAndSku.put(record.getStr("id"),record.getStr("sku"));
                 referenceCodeAndDeviceNo.put(record.getStr("id"),record.getStr("device_no"));
@@ -391,9 +388,13 @@ public class ProdBatchController extends CommonController {
             String codeList = referenceCodes.stream()
                     .map(code -> "'" + code + "'")
                     .collect(Collectors.joining(","));
-            List<Record> duoRecords = Db.find("select * from jinzai_upload_master where duo_code in(" + codeList + ")");
-            if(duoRecords.size() != referenceCodes.size()){
-                return ApiResponse.error("有托码不存在");
+            List<Record> duoRecords = Db.find("select * from jinzai_upload_master1 where duo_code in(" + codeList + ")");
+            Map<String,List<Record>> duoMap = duoRecords.parallelStream()
+                    .collect(Collectors.groupingBy(r->r.getStr("duo_code")));
+            for(String duoCode:referenceCodes){
+                if(!duoMap.containsKey(duoCode)){
+                    return ApiResponse.error("有托码不存在");
+                }
             }
             duoRecords.forEach(record -> {
                 referenceCodeAndSku.put(record.getStr("duo_code"),record.getStr("sku"));
@@ -477,7 +478,7 @@ public class ProdBatchController extends CommonController {
                 } else if (modifyType.compareTo(2) == 0) {
                     Db.update("update jinzai_upload_master set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where id in(" + addReferenceCode + ")", itemName, itemKouWei,sku);
                 } else if (modifyType.compareTo(3) == 0) {
-                    Db.update("update jinzai_upload_master set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where duo_code in(" + addReferenceCode + ")", itemName, itemKouWei,sku);
+                    Db.update("update jinzai_upload_master1 set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where duo_code in(" + addReferenceCode + ")", itemName, itemKouWei,sku);
                 }
                 return true;
             } catch (Exception e) {