wzh преди 8 месеца
родител
ревизия
286d41b45a
променени са 1 файла, в които са добавени 7 реда и са изтрити 4 реда
  1. 7 4
      src/main/java/com/qlm/controller/jinzai/ProduceOrderController.java

+ 7 - 4
src/main/java/com/qlm/controller/jinzai/ProduceOrderController.java

@@ -46,13 +46,16 @@ public class ProduceOrderController extends CommonController{
 				list.add(masterInfo);
 			}
 		}else if("2".equals(type)){
-			Record masterInfo = Db.findFirst("select * from jinzai_upload_master where id = ?",code);
+			Record masterInfo = Db.findFirst("select * from jinzai_upload_master where id = ?",code.toLowerCase());
+			if(masterInfo == null){
+				masterInfo = Db.findFirst("select * from jinzai_upload_master where id = ?",code.toUpperCase());
+			}
 			if(masterCodes.length()>0){
 				masterCodes.append(",");
 			}
 			list.add(masterInfo);
-			masterCodes.append("'"+code+"'");
-			map.put(code, masterInfo);
+			masterCodes.append("'"+code.toUpperCase()+"'");
+			map.put(code.toLowerCase(), masterInfo);
 		}else if("3".equals(type)){
 			List<Record> find = Db.find("select * from jinzai_upload_master where duo_code = ?",code);
 			for (Record record : find) {
@@ -70,7 +73,7 @@ public class ProduceOrderController extends CommonController{
 			List<Record> find = Db.find("select * from deliveryorders where CaseCode in("+masterCodes+")");
 			
 			for (Record record : find) {
-				String CaseCode = record.getStr("CaseCode");
+				String CaseCode = record.getStr("CaseCode").toLowerCase();
 				Record masterInfO = map.get(CaseCode);
 				masterInfO.set("fahuoInfo", record);
 			}