修改测试

src/main/java/com/steerinfo/dil/controller/AmsshipCargoTransferResultController.java

@@ -3,12 +3,16 @@ package com.steerinfo.dil.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.MapSerializer;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.mapper.AmsshipCargoTransferResultMapper;
+import com.steerinfo.dil.mapper.DilBatchMapper;
 import com.steerinfo.dil.model.AmsshipCargoTransferResult;
 import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
+import com.steerinfo.dil.model.DilBatch;
 import com.steerinfo.dil.model.OmsshipShipmentInstructions;
 import com.steerinfo.dil.service.IAmsshipCargoTransferResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -48,6 +52,10 @@ public class AmsshipCargoTransferResultController extends BaseRESTfulController
     @Autowired
     ColumnDataUtil columnDataUtil;
     @Autowired
+    DilBatchMapper dilBatchMapper;
+    @Autowired
+    AmsshipCargoTransferResultMapper amsshipCargoTransferResultMapper;
+    @Autowired
     ESFeign esFeign;
 
     @ApiOperation(value = "展示货权转移表", notes = "分页查询")
@@ -114,7 +122,12 @@ public class AmsshipCargoTransferResultController extends BaseRESTfulController
         BigDecimal deleted = new BigDecimal(1);
         amsshipCargoTransferResult.setDeleted(deleted);
         amsshipCargoTransferResultService.updateByPrimaryKeySelective(amsshipCargoTransferResult);
-        return success();
+        //删除批次
+        //根据货权转移id查找批次id
+        Map<String, Object> map = amsshipCargoTransferResultMapper.getBatchIdByCargoTransferResultId(DataChange.dataToBigDecimal(cargoTransferResultId));
+        BigDecimal batchId =DataChange.dataToBigDecimal(map.get("batchId"));
+        int i = dilBatchMapper.deleteByPrimaryKey(batchId.shortValue());
+        return success(i);
     }
 
     //得到收货人id

src/main/java/com/steerinfo/dil/controller/TmsshipLoadShipResultController.java

@@ -58,10 +58,11 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
     })
     @PostMapping("/addLoadShip")
     public RESTfulResult addLoadShip(@RequestBody Map<String,Object> map) throws Exception {
-        Object o = tmsshipLoadShipResultService.insertLoadShip(map);
-//        if (o.equals("出库数量大于港存库实时库存")){
-//            return failed(o);
-//        }
+        int o = tmsshipLoadShipResultService.insertLoadShip(map);
+        if (o==-2){
+            System.out.println("没有该港存库实时库存");
+            return failed("没有该港存库实时库存");
+        }
         return success(o);
     }
 

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

@@ -59,6 +59,9 @@ public interface AmsshipCargoTransferResultMapper extends IBaseMapper<AmsshipCar
     //根据userId寻找用户名
     String getUserNameByUserId(String userId);
 
+    //根据货权转移id获取批次id
+    Map<String,Object> getBatchIdByCargoTransferResultId(BigDecimal cargoTransferResultId);
+
 
 
 }

src/main/java/com/steerinfo/dil/service/ITmsshipLoadShipResultService.java

@@ -26,7 +26,7 @@ public interface ITmsshipLoadShipResultService {
      * @param map
      * @return
      */
-    Object insertLoadShip(Map<String,Object> map) throws Exception;
+    int insertLoadShip(Map<String,Object> map) throws Exception;
 
     /**
      * 根据主键删除

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

@@ -63,7 +63,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
      */
     @Override
     @Transactional
-    public Object insertLoadShip(Map<String,Object> map) throws Exception {
+    public int insertLoadShip(Map<String,Object> map) throws Exception {
         int i=0;
         Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
         Map<String,Object> rowMap = (Map<String, Object>) map.get("rowMap");
@@ -130,9 +130,14 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         Map<String,Object> idMap=new HashMap<>();
         idMap.put("batchId",batchId);
         idMap.put("downSwimPortId",startPortId);
+        //查询实时库存
         Map<String,Object> gmMap = tmsshipLoadShipResultMapper.selectGmIdByPortId(idMap);
-        BigDecimal gmId=DataChange.dataToBigDecimal(gmMap.get("gmId"));
-        tmsshipLoadShipResult.setRwarehouseMaterialId(gmId);
+        if (gmMap==null) {
+           return -2;
+        }else {
+            BigDecimal gmId = DataChange.dataToBigDecimal(gmMap.get("gmId"));
+            tmsshipLoadShipResult.setRwarehouseMaterialId(gmId);
+        }
         //获得实装数量
         BigDecimal resultActualInstallations = new BigDecimal((String) mapVal.get("resultActualInstallations"));
         //装船时间

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

@@ -778,6 +778,11 @@
         from RMS_PERSONNEL RP
         WHERE  RP.PERSONNEL_SSO_ID=#{userId}
     </select>
+    <select id="getBatchIdByCargoTransferResultId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        select ACTR.BATCH_ID "batchId"
+        from AMSSHIP_CARGO_TRANSFER_RESULT ACTR
+        WHERE ACTR.CARGO_TRANSFER_RESULT_ID=#{cargoTransferResultId}
+    </select>
 
 
 </mapper>

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

@@ -309,6 +309,7 @@
     on ACTR.BATCH_ID = DB.BATCH_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID=DB.MATERIAL_ID
+    where ACTR.DELETED=0
     order by  DB.INSERT_TIME desc
 </select>
 <!--  根据用户输入模糊查询江船船名-->