“卸船锁定船只”

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

@@ -1,8 +1,10 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.WmshboundFeign;
+import com.steerinfo.dil.mapper.OmsshipInstructionsCapacityMapper;
 import com.steerinfo.dil.mapper.TmsshipLoadShipResultMapper;
 import com.steerinfo.dil.mapper.TmsshipTotalResultMapper;
+import com.steerinfo.dil.model.OmsshipInstructionsCapacity;
 import com.steerinfo.dil.model.TmsshipLoadShipResult;
 import com.steerinfo.dil.model.TmsshipTotalResult;
 import com.steerinfo.dil.model.TmsshipUnloadShipResult;
@@ -46,6 +48,8 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
     WmshboundFeign wmshboundFeign;
     @Autowired
     TmsshipTotalResultMapper tmsshipTotalResultMapper;
+    @Autowired
+    OmsshipInstructionsCapacityMapper omsshipInstructionsCapacityMapper;
 
 
     /**
@@ -101,7 +105,12 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
         tmsshipUnloadShipResult.setInsertUsername("admin");
         tmsshipUnloadShipResult.setUpdateUsername("admin");
         tmsshipUnloadShipResult.setInsertUpdateRemark("无");
-        tmsshipUnloadShipResult.setDeleted(new BigDecimal(0));
+        //锁定船只
+        OmsshipInstructionsCapacity omsshipInstructionsCapacity=new OmsshipInstructionsCapacity();
+        omsshipInstructionsCapacity.setInstructionsCapacityId(DataChange.dataToBigDecimal(unloadMap.get("instructionsCapacityId")));
+        //锁定
+        omsshipInstructionsCapacity.setDeleted(new BigDecimal(3));
+        omsshipInstructionsCapacityMapper.updateByPrimaryKeySelective(omsshipInstructionsCapacity);
         // 新增出库实绩
         Map<String,Object> totalId = new HashMap<>();
         totalId.put("totalResultId",totalResultId);

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

@@ -557,7 +557,8 @@
         ada.PORT_ID AS "portId",
         rp2.PORT_NAME AS "portName2",
         oic.INSTRUCTIONS_SHIP_POSITION "instructionsShipPosition",
-        RP3.PORT_NAME "startPortName"
+        RP3.PORT_NAME "startPortName",
+        oic.INSTRUCTIONS_CAPACITY_ID "instructionsCapacityId"
         FROM
         OMSSHIP_INSTRUCTIONS_CAPACITY oic
         LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
@@ -573,6 +574,7 @@
         WHERE OSI.DELETED = 0
         AND OIC.DELETED = 0
         AND ADA.DELETED = 0
+        AND OIC.DELETED != 3
         AND OSI.INSTRUCTION_ISSUE_STATUS='已下发'
         <if test="con!=null">
             AND (DB.RESULT_FOREIGN_SHIP_NAME like concat('%', concat(#{con},'%'))