修改

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

@@ -158,7 +158,7 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
         List<Map<String,Object>> wmshGridMaterials = wmshGridMaterialMapper.getGridId(map);
         WmshGridMaterial wmshGridMaterial=new WmshGridMaterial();
         if(wmshGridMaterials!=null && wmshGridMaterials.size()>0){
-            //已经存在则加库存，不改港存库批次或者删除
+            //已经存在则加库存，将原本的港存库库存弄成0,免得同一录入批次二次使用时多加库存
             Map<String,Object> now = wmshGridMaterials.get(0);
             BigDecimal nowGmsTonnage = DataChange.dataToBigDecimal(now.get("gmTonnage"));
             //查询旧的批次
@@ -171,6 +171,11 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
             wmshGridMaterial.setGmId(DataChange.dataToBigDecimal(now.get("gmId")));
             wmshGridMaterial.setGmTonnage(nowGmsTonnage.add(oldGmsTonnage));
             wmshGridMaterial.setUpdateUsername(userId.toString());
+            //将旧的港存库置为0
+            WmshGridMaterial oldGrid=new WmshGridMaterial();
+            oldGrid.setGmId(DataChange.dataToBigDecimal(old.get("gmId")));
+            oldGrid.setGmTonnage(new BigDecimal(0));
+            wmshGridMaterialMapper.updateByPrimaryKeySelective(oldGrid);
         }else{
             //不存在修改批次
             wmshGridMaterial.setGmId(gmId);

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

@@ -466,7 +466,9 @@
         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}
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID=WGM.BATCH_IDD
+        WHERE RP.PORT_ID=#{portId} and WGM.BATCH_ID=#{batchId} and DB.INSERT_UPDATE_REMARK!='人工录入'
     </select>
     <select id="getLoadPortStockByMaterialName" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT