fanxw пре 1 година
родитељ
комит
21a02cbda0

+ 7 - 7
src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -581,7 +581,6 @@ public class StorageQualitycheckController {
581
     public PageInfo<StorageQualitycheck> getListByhouseId(Integer pageNum, Integer pageSize,
581
     public PageInfo<StorageQualitycheck> getListByhouseId(Integer pageNum, Integer pageSize,
582
             Integer[] houseIds, Integer[] warehouseIds , String checktype) {
582
             Integer[] houseIds, Integer[] warehouseIds , String checktype) {
583
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
583
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
584
-    	List<List<StorageQualitycheck>> list = new ArrayList<List<StorageQualitycheck>>();
585
         //根据后台传来的参数进行查找相应类型的类别0:初检 1:验收 2:质量普查 3:出库
584
         //根据后台传来的参数进行查找相应类型的类别0:初检 1:验收 2:质量普查 3:出库
586
     	if (StringUtils.isNotBlank(checktype)){
585
     	if (StringUtils.isNotBlank(checktype)){
587
             String[] idArray = checktype.split(",");
586
             String[] idArray = checktype.split(",");
@@ -675,16 +674,17 @@ public class StorageQualitycheckController {
675
     }
674
     }
676
 
675
 
677
     //质检信息主表同步
676
     //质检信息主表同步
678
-    @RequestMapping("/qualityMainSynchronization")
677
+    @SuppressWarnings("all")
678
+	@RequestMapping("/qualityMainSynchronization")
679
     public void qualityMainSynchronization() {
679
     public void qualityMainSynchronization() {
680
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
680
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
681
-        List list = DataSynchronization.queryQualityMain();
681
+        List<Map<String,Object>> list = DataSynchronization.queryQualityMain();
682
         Map<String,Object> paramMap = new HashMap<String, Object>();
682
         Map<String,Object> paramMap = new HashMap<String, Object>();
683
         List<Map<String,Object>> qualitycheckList = storageQualitycheckService.getAllQualityMain(paramMap);
683
         List<Map<String,Object>> qualitycheckList = storageQualitycheckService.getAllQualityMain(paramMap);
684
-        for(Map qualitycheckMap:qualitycheckList) {
684
+        for(Map<String,Object> qualitycheckMap:qualitycheckList) {
685
             int num = 0;
685
             int num = 0;
686
             for(int i=0;i<list.size();i++) {
686
             for(int i=0;i<list.size();i++) {
687
-                Map<String,Object> map = (Map<String,Object>)list.get(i);
687
+                Map<String,Object> map = list.get(i);
688
                 String zjid = ObjectUtils.toString(map.get("zjid"),"");//库点编码
688
                 String zjid = ObjectUtils.toString(map.get("zjid"),"");//库点编码
689
                 String refreshTime = ObjectUtils.toString(map.get("refreshTime"),"");
689
                 String refreshTime = ObjectUtils.toString(map.get("refreshTime"),"");
690
                 if(zjid.equals(ObjectUtils.toString(qualitycheckMap.get("zjid"),""))) {
690
                 if(zjid.equals(ObjectUtils.toString(qualitycheckMap.get("zjid"),""))) {
@@ -705,10 +705,10 @@ public class StorageQualitycheckController {
705
     @RequestMapping("/qualityInfoSynchronization")
705
     @RequestMapping("/qualityInfoSynchronization")
706
     public void qualityInfoSynchronization() {
706
     public void qualityInfoSynchronization() {
707
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
707
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
708
-        List list = DataSynchronization.queryQualityMain();
708
+        List<Map<String,Object>> list = DataSynchronization.queryQualityMain();
709
         Map<String,Object> paramMap = new HashMap<String, Object>();
709
         Map<String,Object> paramMap = new HashMap<String, Object>();
710
         List<Map<String,Object>> qualitycheckList = storageQualitycheckService.getAllQualityInfo(paramMap);
710
         List<Map<String,Object>> qualitycheckList = storageQualitycheckService.getAllQualityInfo(paramMap);
711
-        for(Map qualitycheckMap:qualitycheckList) {
711
+        for(Map<String,Object> qualitycheckMap:qualitycheckList) {
712
             int num = 0;
712
             int num = 0;
713
             for(int i=0;i<list.size();i++) {
713
             for(int i=0;i<list.size();i++) {
714
                 Map<String,Object> map = (Map<String,Object>)list.get(i);
714
                 Map<String,Object> map = (Map<String,Object>)list.get(i);