Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderMaterialServiceImpl.java

@@ -9,15 +9,13 @@ import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
 import com.steerinfo.dil.util.DataChange;
+import com.sun.corba.se.spi.ior.ObjectKey;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * OmstruckOrderMaterial服务实现：
@@ -294,12 +292,16 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
     @Transactional
     public int updateMaterialMes(Map<String, Object> map){
         OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
-        omstruckOrderMaterial.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-        omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map.get("materialNum")));
-        omstruckOrderMaterial.setUpdateTime(new Date());
-        omstruckOrderMaterialMapper.updateMaterialMes(omstruckOrderMaterial);
-        omstruckOrderMaterialMapper.updateOutBoundResult(omstruckOrderMaterial);
+        List<Map<String,Object>>mapList = (List<Map<String, Object>>) map.get("mapList");
+        for (Map<String, Object>map1:mapList
+             ) {
+            omstruckOrderMaterial.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+            omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map1.get("materialId")));
+            omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map1.get("materialNum")));
+            omstruckOrderMaterial.setUpdateTime(new Date());
+            omstruckOrderMaterialMapper.updateMaterialMes(omstruckOrderMaterial);
+            omstruckOrderMaterialMapper.updateOutBoundResult(omstruckOrderMaterial);
+        }
         return 1;
     }
 }

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.xml

@@ -492,7 +492,7 @@
              OO.ORDER_ID        "orderId"
       from OMSTRUCK_ORDER OO
       where OO.CAPACITY_ID = (select CAPACITY_ID from RMS_CAPACITY where CAPACITY_ID = #{capacityId})
-        and OO.ORDER_STATUS in (4, 5)
+        and OO.ORDER_STATUS = 5
         and OO.ORDER_TYPE = 1
     </select>