12.13测试

.idea/workspace.xml

@@ -24,6 +24,10 @@
   <component name="ChangeListManager">
     <list default="true" id="de9b1cef-bcce-4b24-a294-70008dd01a64" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/OmsshipInstructionsCapacityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/OmsshipInstructionsCapacityController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/OmsshipInstructionsCapacityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/OmsshipInstructionsCapacityController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -178,54 +182,54 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639362264773" />
-    <state width="1493" height="118" key="GridCell.Tab.0.bottom" timestamp="1639362311257">
+    <state width="1493" height="124" key="GridCell.Tab.0.bottom" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="118" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639362311257" />
-    <state width="1493" height="118" key="GridCell.Tab.0.center" timestamp="1639362311257">
+    <state width="1493" height="124" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.0.center" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="118" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639362311257" />
-    <state width="1493" height="118" key="GridCell.Tab.0.left" timestamp="1639362311257">
+    <state width="1493" height="124" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.0.left" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="118" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639362311257" />
-    <state width="1493" height="118" key="GridCell.Tab.0.right" timestamp="1639362311257">
+    <state width="1493" height="124" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.0.right" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="118" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639362311257" />
-    <state width="1493" height="110" key="GridCell.Tab.1.bottom" timestamp="1639304775775">
+    <state width="1493" height="124" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.1.bottom" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="110" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639304775775" />
-    <state width="1493" height="110" key="GridCell.Tab.1.center" timestamp="1639304775775">
+    <state width="1493" height="124" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.1.center" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="110" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639304775775" />
-    <state width="1493" height="110" key="GridCell.Tab.1.left" timestamp="1639304775775">
+    <state width="1493" height="124" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.1.left" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="110" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639304775775" />
-    <state width="1493" height="110" key="GridCell.Tab.1.right" timestamp="1639304775775">
+    <state width="1493" height="124" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.1.right" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="110" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639304775775" />
-    <state width="1493" height="110" key="GridCell.Tab.2.bottom" timestamp="1639304775775">
+    <state width="1493" height="124" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.2.bottom" timestamp="1639364745999">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="110" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639304775775" />
-    <state width="1493" height="110" key="GridCell.Tab.2.center" timestamp="1639304775775">
+    <state width="1493" height="124" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639364745999" />
+    <state width="1493" height="124" key="GridCell.Tab.2.center" timestamp="1639364745999">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="110" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639304775775" />
-    <state width="1493" height="110" key="GridCell.Tab.2.left" timestamp="1639304775775">
+    <state width="1493" height="124" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639364745999" />
+    <state width="1493" height="124" key="GridCell.Tab.2.left" timestamp="1639364745998">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="110" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639304775775" />
-    <state width="1493" height="110" key="GridCell.Tab.2.right" timestamp="1639304775775">
+    <state width="1493" height="124" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
+    <state width="1493" height="124" key="GridCell.Tab.2.right" timestamp="1639364745999">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="110" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639304775775" />
+    <state width="1493" height="124" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639364745999" />
     <state x="270" y="56" key="SettingsEditor" timestamp="1639362268876">
       <screen x="0" y="0" width="1536" height="824" />
     </state>

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

@@ -123,7 +123,6 @@ public class OmsshipInstructionsCapacityController extends BaseRESTfulController
         List<Map<String,Object>> map = omsshipInstructionsCapacityService.selectInstructionsCapacity(instructionsCapacityId);
         return success(map);
     }
-
     /**
      * 修改船运信息
      * @param omsshipInstructionsCapacity

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

@@ -60,24 +60,10 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
     @Transactional
     @Override
     public int insert(Map<String,Object> omsshipInstructionsCapacity) {
-        String capacityNumber = (String) omsshipInstructionsCapacity.get("capacityName");
-        Map<String,Object> map = new HashMap<>();
-        map.put("capacityNumber",capacityNumber);
-        List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(map);
+        //        插入装船指令
+        Integer capacityNumber = (Integer) omsshipInstructionsCapacity.get("capacityIds");
         OmsshipInstructionsCapacity realOmsshipInstructionsCapacity = new OmsshipInstructionsCapacity();
-        if (rmsCapacities.size() != 0 ) {
-            RmsCapacity rmsCapacity = rmsCapacities.get(0);
-            rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
-            realOmsshipInstructionsCapacity.setCapacityId(rmsCapacity.getCapacityId());
-        }
-        else {
-            RmsCapacity rmsCapacity = new RmsCapacity();
-            rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
-            rmsCapacity.setCapacityNumber(capacityNumber);
-            rmsCapacity.setCapacityTypeId(new BigDecimal(3));
-            rmsCapacityMapper.insertSelective(rmsCapacity);
-            realOmsshipInstructionsCapacity.setCapacityId(rmsCapacity.getCapacityId());
-        }
+        realOmsshipInstructionsCapacity.setCapacityId(new BigDecimal(capacityNumber));
         String instructionPlannedLoading = (String) omsshipInstructionsCapacity.get("instructionPlannedLoading");
         String instructionsShipPosition = (String) omsshipInstructionsCapacity.get("instructionsShipPosition");
         String instructionContactInf = (String) omsshipInstructionsCapacity.get("instructionContactInf");