Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -726,7 +726,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @PostMapping("/updateCapacityId")
     public RESTfulResult updateCapacityId(@RequestBody Map<String,Object> map) {
         int result = omstruckOrderService.updateCapacityId(map);
-        return success(result);
+        if (result == 1) {
+            return success(result);
+        }
+        else {
+            return failed(result);
+        }
     }
 
 

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

@@ -332,6 +332,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String, Object> getSteelOrderMessageToApp(Map<String, Object> map);
 
     List<Map<String, Object>> getLoadForLoadCarResult(Map<String, Object> map);
+    // 查询路段顺序号
+    BigDecimal getLineSeq(BigDecimal orderId);
 
     String getCapacityNumberByCapacityId(BigDecimal capacityNumber);
 }

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

@@ -622,9 +622,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         OmstruckOrder omstruckOrder=new OmstruckOrder();
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         BigDecimal capacityId =DataChange.dataToBigDecimal(map.get("capacityId"));
-        omstruckOrder.setOrderId(orderId);
-        omstruckOrder.setCapacityId(capacityId);
-        result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+        BigDecimal lineSeq = omstruckOrderMapper.getLineSeq(orderId);
+        if (lineSeq == null || lineSeq.intValue() == 0) {
+            omstruckOrder.setOrderId(orderId);
+            omstruckOrder.setCapacityId(capacityId);
+            result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+        }
         return result;
     }
 

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

@@ -3657,6 +3657,11 @@
         )
     </select>
 
+    <select id="getLineSeq" parameterType="DECIMAL" resultType="DECIMAL" >
+        SELECT OO.ORDER_LINE_SEQUENCE AS "orderLineSequence"
+        FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 
     <select id="getCapacityNumberByCapacityId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
         select CAPACITY_NUMBER from RMS_CAPACITY  where CAPACITY_ID = #{capacityId}