提交代码

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

@@ -1303,8 +1303,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @ApiModelProperty(value = "修改厂内未装货车辆的运单车牌号")
     @PostMapping("/updateCapacityNumberInFactory")
     public RESTfulResult updateCapacityNumberInFactory(@RequestBody Map<String,Object> mapValue) {
-        int result = amsSaleOrderService.updateCapacityNumberInFactory(mapValue);
-        if (result == 0) {
+        Map<String, Object> result = amsSaleOrderService.updateCapacityNumberInFactory(mapValue);
+        int result1= (int) result.get("result");
+        if (result1 == 0) {
             return failed("已装货车辆不允许修改车牌");
         }
         else {

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

@@ -42,6 +42,9 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     BigDecimal getOldCapacityId(BigDecimal orderId);
 
+    //选择运力的车牌号
+    BigDecimal getCapacityTel(String capacityNo);
+
     int deleteSpellingList(Object listId);
 
     //删除排队实绩

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

@@ -156,7 +156,7 @@ public interface IAmsSaleOrderService {
     // 展示所有状态销售订单列表
     List<Map<String, Object>> getAllSteelSaleOrderList(Map<String, Object> mapValue);
     // 修改厂内未装货车辆的运单车牌号
-    int updateCapacityNumberInFactory(Map<String, Object> mapValue);
+    Map<String, Object> updateCapacityNumberInFactory(Map<String, Object> mapValue);
     //修改收货客户的电话(销售)
     int updateConsigneeTel(Map<String,Object> mapValue);
     // 得到销售订单物资表主键

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

@@ -1929,14 +1929,22 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
      * @return
      */
     @Override
-    public int updateCapacityNumberInFactory(Map<String, Object> mapValue) {
+    public Map<String, Object> updateCapacityNumberInFactory(Map<String, Object> mapValue) {
         Object lineSequence = mapValue.get("lineSequence");
         int result = 0;
         try{
             //查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
             BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
-            if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0){
-                return 1;
+            if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0) {
+                mapValue.put("result",1);
+                return mapValue;
+            }
+            String capacityNo = (String) mapValue.get("capacityNo");
+            BigDecimal capacityTel = omstruckOrderMapper.getCapacityTel(capacityNo);
+            if (capacityTel.compareTo(BigDecimal.ZERO)!=0){
+                mapValue.put("capacityTel",capacityTel);
+            }else {
+                mapValue.put("capacityTel",0);
             }
             if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
                 String capacityids="";
@@ -1982,7 +1990,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         }catch (Exception e){
             System.out.println("e"+e.getMessage());
         }
-        return result;
+        mapValue.put("result",result);
+        return mapValue;
 
     }
 

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

@@ -868,6 +868,12 @@
         SELECT OO.CAPACITY_ID FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+
+    <select id="getCapacityTel" resultType="java.math.BigDecimal">
+        select nvl(RC.CAPACITY_TEL,0) "capacityTel" from RMS_CAPACITY RC
+        WHERE RC.CAPACITY_NUMBER=#{capacityNo}
+        AND ROWNUM =1
+    </select>
     <select id="getSteelIsSpelling" resultType="java.util.Map" parameterType="java.math.BigDecimal">
         select LIST_ID  "listId",
                IS_SPELLING "isSpelling",