修改卸船从万州港卸

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

@@ -57,7 +57,13 @@ public class TmsshipUnloadShipResultController extends BaseRESTfulController {
     })
     @PostMapping("/addUnLoadShip")
     public RESTfulResult addUnLoadShip(@RequestBody(required = false) Map<String,Object> map) {
-        int code = tmsshipUnloadShipResultService.insertUnloadShip(map);
+        int code=0;
+        try {
+            code = tmsshipUnloadShipResultService.insertUnloadShip(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage());
+        }
         return success(code);
     }
 

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

@@ -36,6 +36,8 @@ public interface DilBatchMapper extends IBaseMapper<DilBatch, Short> {
     //根据portId查找portName
     String getPortName(BigDecimal portId);
 
+    BigDecimal getPortId(String portName);
+
     //根据外轮船名和物资名称查找批次主表id是否存在
     List<Map<String,Object>> selectBatchIdByForeign(Map<String,Object> map);
 

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

@@ -49,4 +49,6 @@ public interface IDilBatchService {
     List<Map<String, Object>> findBatchForBind(Map<String, Object> map);
 
     int bindBatch(Map<String, Object> map) throws Exception;
+
+    BigDecimal getPortId(String portName);
 }

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

@@ -25,7 +25,7 @@ public interface ITmsshipUnloadShipResultService {
     BigDecimal selectMaxId();
 
     // 新增卸船作业
-    int insertUnloadShip(Map<String,Object> map);
+    int insertUnloadShip(Map<String,Object> map) throws Exception;
 
     // 根据主键删除
     int deleteUnloadShip(BigDecimal resultId);

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

@@ -150,4 +150,9 @@ public class DilBatchServiceImpl  implements IDilBatchService {
         wmshboundFeign.updateWmshGridMaterial(map);
         return i;
     }
+
+    @Override
+    public BigDecimal getPortId(String portName) {
+        return dilBatchMapper.getPortId(portName);
+    }
 }

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

@@ -50,7 +50,8 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
     TmsshipTotalResultMapper tmsshipTotalResultMapper;
     @Autowired
     OmsshipInstructionsCapacityMapper omsshipInstructionsCapacityMapper;
-
+    @Autowired
+    DilBatchServiceImpl dilBatchService;
 
     /**
      * 得到最大id
@@ -68,11 +69,14 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
      */
     @Override
     @Transactional
-    public int insertUnloadShip(Map<String, Object> map) {
+    public int insertUnloadShip(Map<String, Object> map) throws Exception {
         Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
         Map<String,Object> unloadMap = (Map<String, Object>) map.get("unloadMap");
-        BigDecimal downSwimPortId= DataChange.dataToBigDecimal(unloadMap.get("downSwimPortId"));
-        BigDecimal portId= DataChange.dataToBigDecimal(unloadMap.get("portId"));
+        //查询万州港港口id
+        BigDecimal portId=dilBatchService.getPortId("万州港");
+        if(portId==null){
+            throw new Exception("万州港不存在！");
+        }
         TmsshipUnloadShipResult tmsshipUnloadShipResult = new TmsshipUnloadShipResult();
         BigDecimal resultId = selectMaxId();
         BigDecimal orderId = new BigDecimal((Integer) unloadMap.get("orderId"));

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

@@ -469,5 +469,10 @@
         </if>
     </where>
   </select>
+  <select id="getPortId" resultType="java.math.BigDecimal">
+    select PORT_ID from RMS_PORT
+    where PORT_NAME=#{portName} AND DELETED=0
+    FETCH NEXT 1 ROWS ONLY
+  </select>
 
 </mapper>