修改

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

@@ -60,14 +60,14 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "map",value = "装船作业字段",required = true,paramType = "java.util.Map")
     })
     @PostMapping("/addLoadShip")
-    public RESTfulResult addLoadShip(@RequestBody Map<String,Object> map) throws Exception {
-        int o = tmsshipLoadShipResultService.insertLoadShip(map);
-        if (o==-2){
-            Map<String, Object> rowMap=(Map<String, Object>) map.get("rowMap");
-            System.out.println("没有该港存库实时库存,港口："+rowMap.get("startPortId")+",批次："+rowMap.get("batchInfactoryId"));
-            return failed("没有该港存库实时库存,港口："+rowMap.get("startPortId")+",批次："+rowMap.get("batchInfactoryId"));
+    public RESTfulResult addLoadShip(@RequestBody Map<String,Object> map){
+        try{
+            int o = tmsshipLoadShipResultService.insertLoadShip(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage());
         }
-        return success(o);
+        return success(0);
     }
 
 

src/main/java/com/steerinfo/dil/feign/WmshboundFeign.java

@@ -22,7 +22,7 @@ public interface WmshboundFeign {
     RESTfulResult addWarehousingResult(@RequestBody(required = false) Map<String,Object> wmshInboundResult);
 
     @PostMapping("api/v1/wmsh/wmshoutboundresults/addResult")
-    Map<String, Object> addResult(@RequestBody(required = false) Map<String,Object> map) throws  Exception;
+    RESTfulResult addResult(@RequestBody(required = false) Map<String,Object> map) throws  Exception;
 
     @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/clearWmshGridMaterial")
     RESTfulResult clearWmshGridMaterial(@RequestBody(required = false) Map<String, Object> wmshInboundResult);

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

@@ -61,7 +61,9 @@ public class ShipDynamicsServiceImpl implements IShipDynamicsService {
             +"" +(endDate.getMonth()+1)+"月"+endDate.getDate()+"日"+endDate.getHours()+"时";
             DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
             List<Map<String, Object>> list = shipDynamicsMapper.getLoadData(map);
-            list.get(0).put("time",time);
+            if(list !=null && list.size()>0){
+                list.get(0).put("time",time);
+            }
             return list;
         }
         return shipDynamicsMapper.getLoadData(map);

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

@@ -60,7 +60,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertLoadShip(Map<String,Object> map) throws Exception {
         int i=0;
         Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
@@ -122,7 +122,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         //查询实时库存
         Map<String,Object> gmMap = tmsshipLoadShipResultMapper.selectGmIdByPortId(idMap);
         if (gmMap==null) {
-            return -2;
+            throw new Exception("没有港存库实时库存，无法装船！");
         }else {
             BigDecimal gmId = DataChange.dataToBigDecimal(gmMap.get("gmId"));
             tmsshipLoadShipResult.setRwarehouseMaterialId(gmId);
@@ -143,7 +143,10 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
             outBoundMap.put("portId",rowMap.get("downSwimPortId"));
             outBoundMap.put("batchId",rowMap.get("batchId"));
             outBoundMap.put("resultMaterialNumber",resultActualInstallations);
-            wmshboundFeign.addResult(outBoundMap);
+            RESTfulResult resTfulResult=wmshboundFeign.addResult(outBoundMap);
+            if(!resTfulResult.getStatus().equals("succeed")){
+                throw new Exception("下游港口出库失败："+resTfulResult.getData());
+            }
         }
         String resultNumber = noUtil.setResultNo("ZC",resultEntryId);
         tmsshipLoadShipResult.setResultId(resultId);
@@ -224,6 +227,15 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
     public int deleteLoadShip(BigDecimal resultId) {
         TmsshipLoadShipResult tmsshipLoadShipResult = selectLoadShip(resultId);
         tmsshipLoadShipResult.setDeleted(new BigDecimal(1));
+        //返还装船库存
+        List<Map<String,Object>> list =tmsshipLoadShipResultMapper.selectLoadShip(resultId);
+        if(list!=null && list.size()>0){
+            Map<String,Object> mapValue=new HashMap<>();
+            mapValue.put("batchId",list.get(0).get("realBatchId"));
+            mapValue.put("portId",list.get(0).get("startPortId"));
+            mapValue.put("resultMaterialNumber",list.get(0).get("resultActualInstallations"));
+            wmshboundFeign.addWarehousingResult(mapValue);
+        }
         return tmsshipLoadShipResultMapper.updateByPrimaryKeySelective(tmsshipLoadShipResult);
     }
 

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

@@ -19,7 +19,6 @@
                           tlsr.RESULT_ARRIVAL_PORT_TIME "dgsj",
                           tsl.LOCATION_STATUS "locationStatus",
                           tsl.LOCATION_VALUE "locationValue",
-                          tsl.LOCATION_ROUTE_TIME,
                           NVL(ADN.RESULT_MEMO,'块矿') "materialTypeName",
                           RMT.MATERIAL_TYPE_ID "materialTypeId",
                           OSI.INSTRUCTIONS_STATUS "instructionStatus"
@@ -67,14 +66,13 @@
                           adn.RESULT_NUMBER_OF_LOANS "numberOfLoans",
                           rp.port_name "portName",
                           wgm.gm_tonnage "tonnage",
-                          null "capacity",
+                          ' ' "capacity",
                           0 "capacityNumber",
                           null "outPortTime",
                           null "dgsj",
-                          null "locationStatus",
-                          null "locationValue",
-                          null,
-                          null "materialTypeName",
+                          ' ' "locationStatus",
+                          ' ' "locationValue",
+                          NVL(ADN.RESULT_MEMO,'块矿') "materialTypeName",
                           null "materialTypeId",
                           null "instructionStatus"
 

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

@@ -816,7 +816,8 @@
             TWQR.RESULT_INSPECTION_FEES "resultInspectionFees",
             TWQR.RESULT_MOISTURE_CONTENT "resultMoistureContent",
             TWQR.RESULT_WATER_TONNAGE "moistureTonnage",
-            TWQR.IS_NEED_ASSEMBLE "isNeedAssemble"
+            TWQR.IS_NEED_ASSEMBLE "isNeedAssemble",
+            DB.BATCH_ID "realBatchId"
         FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
                  left join TMSSHIP_WATER_QUALITY_RESULT TWQR
                            ON TLSR.TOTAL_RESULT_ID=TWQR.TOTAL_RESULT_ID