修改

src/main/java/com/steerinfo/dil/mapper/WmshGridMaterialMapper.java

@@ -43,5 +43,5 @@ public interface WmshGridMaterialMapper extends IBaseMapper<WmshGridMaterial, Bi
     @Select("select seq_wmsh_grid_material.nextval from dual")
     BigDecimal selectMaxId();
 
-    List<WmshGridMaterial> selectByParameters(Map<String, Object> selectMap);
+   List<Map<String,Object>> getGridId(Map<String,Object> map);
 }

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

@@ -71,7 +71,7 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
         selectMap.put("portId",portId);
         selectMap.put("batchId",batchId);
         //查找是否有港存库实时库存
-        List<WmshGridMaterial> wmshGridMaterials = wmshGridMaterialMapper.selectByParameters(selectMap);
+        List<Map<String,Object>> wmshGridMaterials = wmshGridMaterialMapper.getGridId(map);
         if (wmshGridMaterials.size() == 0) {
             WmshGridMaterial wmshGridMaterial = new WmshGridMaterial();
             BigDecimal gmId = wmshGridMaterialMapper.selectMaxId();
@@ -82,8 +82,12 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
             wmshGridMaterial.setDeleted(new BigDecimal(0));
             return wmshGridMaterialMapper.insertSelective(wmshGridMaterial);
         }
-        WmshGridMaterial wmshGridMaterial = wmshGridMaterials.get(0);
-        BigDecimal oldGmsTonnage = wmshGridMaterial.getGmTonnage();
+        Map<String,Object> map1 = wmshGridMaterials.get(0);
+        BigDecimal oldGmsTonnage = DataChange.dataToBigDecimal(map1.get("gmTonnage"));
+        BigDecimal gmId =DataChange.dataToBigDecimal(map1.get("gmId"));
+
+        WmshGridMaterial wmshGridMaterial=new WmshGridMaterial();
+        wmshGridMaterial.setGmId(gmId);
         BigDecimal gmsTonnage;
         if (status.intValue() == 0) {
             gmsTonnage = new BigDecimal(oldGmsTonnage.doubleValue() - tonnage.doubleValue());

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

@@ -437,7 +437,13 @@
         </where>
     </select>
 
-    <select id="selectWmsGridMaterial" parameterType="java.util.Map" resultType="com.steerinfo.dil.model.WmshGridMaterial">
-        SELECT
+
+    <select id="getGridId" resultType="java.util.Map" parameterType="java.util.Map">
+        select WGM.GM_ID "gmId",
+               WGM.GM_TONNAGE "gmTonnage"
+        from WMSH_GRID_MATERIAL WGM
+        LEFT JOIN RMS_PORT RP
+        ON RP.PORT_ID=WGM.PORT_ID
+        WHERE RP.PORT_ID=#{portId} and WGM.BATCH_ID=#{batchId}
     </select>
 </mapper>