Commit 405df531 authored by dahai's avatar dahai

push

parent 0bca0294
......@@ -48,10 +48,10 @@ public class SelectApi {
if (selectSerialNumberService.selectCount(id)==0){
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
resultMap.put("workOrderDate", workOrderData);
resultMap.put("workOrderData", workOrderData);
}else {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
resultMap.put("workOrderDate", workOrderData);
resultMap.put("workOrderData", workOrderData);
}
List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment