neizhuanyidiku1

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

@@ -1287,10 +1287,20 @@ OmstruckOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+
     @ApiOperation(value = "司机APP端查询下发给自己运输订单")
     @PostMapping("/sendOrderToApp")
     public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {
         List<Map<String,Object>> mapList = omstruckOrderService.sendOrderToApp(capacityNumber);
         return mapList;
     }
+
+    @ApiOperation(value = "分解异地库计划")
+    @PostMapping("/apportionInwardOffsetOrder")
+    public RESTfulResult apportionInwardOffsetOrder(@RequestBody Map<String,Object>mapvalue) {
+        int result = omstruckOrderService.apportionInwardOffsetOrder(mapvalue);
+        return success(result);
+    }
+
+
 }

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

@@ -201,4 +201,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //根据运输订单查询运输状态
     BigDecimal selectOrderType(BigDecimal orderId);
 
+    BigDecimal selectOrderId(BigDecimal dcId);
+
 }

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.OmstruckOrder;
-import com.steerinfo.framework.service.IBaseService;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -163,4 +162,7 @@ public interface IOmstruckOrderService {
 
     // 司机APP端查询下发给自己运输订单
     List<Map<String, Object>> sendOrderToApp(String capacityNumber);
+
+    int apportionInwardOffsetOrder(Map<String, Object> mapList);
+
 }

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

@@ -7,13 +7,9 @@ import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.DataChange;
-import com.sun.javafx.collections.MappingChange;
-import javafx.beans.binding.ObjectBinding;
-import javafx.scene.paint.Material;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import redis.clients.util.Hashing;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -1293,12 +1289,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             long data = new Date().getTime();
             //根据运输订单id查询车牌号
             String capacityNumber = omstruckOrderMapper.selectCapacityNumber(orderId);
-            BigDecimal orderType = omstruckOrderMapper.selectOrderType(orderId);
-
-            map9.put("receivePerson",capacityNumber);
-            map9.put("messageType",2);
-            map9.put("snedPerson","system");
-            map9.put("creatTime",data);
+//            BigDecimal orderType = omstruckOrderMapper.selectOrderType(orderId);
+//
+//            map9.put("receivePerson",capacityNumber);
+//            map9.put("messageType",2);
+//            map9.put("snedPerson","system");
+//            map9.put("creatTime",data);
 
             result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         }
@@ -1390,5 +1386,89 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return resultList;
     }
 
+    //新增内转异地库计划订单
+    @Override
+    public int apportionInwardOffsetOrder(Map<String, Object> mapValue) {
+        int result = 0;
+        List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        String dayPlanId = (String) mapValue.get("dayPlanId");
+        Integer lineId = (Integer) mapValue.get("lineId");
+        String orderType = (String) mapValue.get("orderType");
+//        Integer carrierId = (Integer) mapValue.get("carrierId");
+//        AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(new BigDecimal(planId));
+//        amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
+//        result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
+        BigDecimal materialId = omstruckOrderMapper.getInwardMaterial(new BigDecimal(dayPlanId));
+        for (Map<String,Object> orderMap : mapList) {
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
+            String capacityNumber = (String)orderMap.get("capacityNumber");
+            BigDecimal materialNumber = DataChange.dataToBigDecimal(orderMap.get("materialNumber")) ;
+//            BigDecimal materialWeight = DataChange.dataToBigDecimal(orderMap.get("materialWeight"));
+            Map<String,Object> capacityMap = new HashMap<>();
+
+            capacityMap.put("capacityNumber",capacityNumber);
+            List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(capacityMap);
+            RmsCapacity rmsCapacity = rmsCapacities.get(0);
+            rmsCapacity.setCapacityStatus(new BigDecimal(2));
+            result +=rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+            BigDecimal capacityId = rmsCapacity.getCapacityId();
+            capacityMap.clear();
+            capacityMap.put("capacityId",capacityId);
+            List<RmsDriverCapacity> rmsDriverCapacities = rmsDriverCapacityMapper.selectByParameters(capacityMap);
+            RmsDriverCapacity rmsDriverCapacity = rmsDriverCapacities.get(0);
+            BigDecimal dcId = rmsDriverCapacity.getDriverCapacityId();
+            if(dcId!=null){
+                BigDecimal orderId = omstruckOrderMapper.selectOrderId(dcId);
+                OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+                BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+                omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+                omstruckOrderMaterial.setOrderId(orderId);
+                omstruckOrderMaterial.setMaterialId(materialId);
+                omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
+                omstruckOrderMaterial.setInsertTime(new Date());
+                omstruckOrderMaterial.setUpdateTime(new Date());
+                omstruckOrderMaterial.setInsertUsername("admin");
+                omstruckOrderMaterial.setUpdateUsername("admin");
+                omstruckOrderMaterial.setInsertUpdateRemark("无");
+            }
+//            rmsDriverCapacity.setCarrierId(new BigDecimal(carrierId));
+            result +=rmsDriverCapacityMapper.updateByPrimaryKeySelective(rmsDriverCapacity);
+            BigDecimal orderId = omstruckOrderMapper.selectMaxId();
+            omstruckOrder.setOrderId(orderId);
+            omstruckOrder.setOrderPlanId(new BigDecimal(dayPlanId));
+            String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
+            omstruckOrder.setOrderNumber(orderNumber);
+            omstruckOrder.setOrderIssueTime(new Date());
+            omstruckOrder.setOrderStatus(new BigDecimal(3));
+            omstruckOrder.setInsertTime(new Date());
+            omstruckOrder.setUpdateTime(new Date());
+            omstruckOrder.setInsertUsername("admin");
+            omstruckOrder.setUpdateUsername("admin");
+            omstruckOrder.setInsertUpdateRemark("无");
+            omstruckOrder.setDeleted(new BigDecimal(0));
+            omstruckOrder.setOrderType(new BigDecimal(orderType));
+            omstruckOrder.setLineId(new BigDecimal(lineId));
+            omstruckOrder.setDriverCapacityId(rmsDriverCapacity.getDriverCapacityId());
+            result +=omstruckOrderMapper.insertSelective(omstruckOrder);
+            OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+            BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+            omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+            omstruckOrderMaterial.setOrderId(orderId);
+            omstruckOrderMaterial.setMaterialId(materialId);
+            omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
+            omstruckOrderMaterial.setInsertTime(new Date());
+            omstruckOrderMaterial.setUpdateTime(new Date());
+            omstruckOrderMaterial.setInsertUsername("admin");
+            omstruckOrderMaterial.setUpdateUsername("admin");
+            omstruckOrderMaterial.setInsertUpdateRemark("无");
+//            omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
+            result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+        }
+        return result;
+
+
+
+    }
+
 
 }

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

@@ -2675,4 +2675,8 @@
     <select id="selectOrderType" resultType="java.math.BigDecimal">
 
     </select>
+    <select id="selectOrderId" resultType="java.math.BigDecimal">
+        select oo.order_id from omstruck_order oo
+        where oo.driver_capacity_id=#{dcId}
+    </select>
 </mapper>