Merge branch 'dev'

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

@@ -81,6 +81,9 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
+        if (carrierSsoId != null && (carrierSsoId.equals("null") || carrierSsoId.equals("undefined"))) {
+            carrierSsoId = null;
+        }
         mapValue.put("carrierSsoId",carrierSsoId);
         List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -108,6 +111,9 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             }
         }
         mapValue.put("dispatchType",dispatchType);
+        if (carrierSsoId != null && (carrierSsoId.equals("null") || carrierSsoId.equals("undefined"))) {
+            carrierSsoId = null;
+        }
         mapValue.put("carrierSsoId",carrierSsoId);
         List<Map<String, Object>> dispatchSaleOrderList = null;
         if (mapValue.size() == 2) {
@@ -152,5 +158,16 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
         return success(dispatchMaterialList);
     }
 
+    /**
+     * 批量接收定向派单
+     * @param mapValue
+     * @return
+     */
+    @ApiOperation(value="批量接收定向派单")
+    @PostMapping(value = "/lockDispatchSaleOrderList")
+    public RESTfulResult lockDispatchSaleOrderList(@RequestBody Map<String,Object> mapValue) {
+        int result = amsDispatchSaleOrderService.lockDispatchSaleOrderList(mapValue);
+        return success(result);
+    }
 
 }

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

@@ -212,9 +212,9 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
      * @param mapList
      * @return
      */
-    @ApiOperation(value="新增销售订单物资信息")
+    @ApiOperation(value="车序号与物资新增")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "addTruckNo", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
+            @ApiImplicitParam(name = "addTruckNo", value = "车序号与物资新增", required = false, dataType = "AmsSaleOrderMaterial")
     })
     @PostMapping(value = "/addTruckNo")
     public RESTfulResult addTruckNo(@RequestBody List<Map<String,Object>> mapList){

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

@@ -42,5 +42,5 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
     List<Map<String, Object>> getDispatchMaterialList(BigDecimal dispatchId);
 
     // 通过ssoid查询承运商
-    BigDecimal getCarrierIdBySSO(String carrierSsoId);
+    List<Map<String, Object>> getCarrierIdBySSO(String carrierSsoId);
 }

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

@@ -74,4 +74,7 @@ public interface IAmsDispatchSaleOrderService{
 
     // 展示销售派单物资信息
     List<Map<String, Object>> getDispatchMaterialList(BigDecimal dispatchId);
+
+    //批量接收定向派单
+    int lockDispatchSaleOrderList(Map<String, Object> mapValue);
 }

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

@@ -152,10 +152,13 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
      */
     @Override
     public int lockDispatchSaleOrder(BigDecimal dispatchId, String carrierSsoId) {
-        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
         AmsDispatchSaleOrder amsDispatchSaleOrder = amsDispatchSaleOrderMapper.selectByPrimaryKey(dispatchId);
         amsDispatchSaleOrder.setDispatchDealTime(new Date());
-        amsDispatchSaleOrder.setCarrierId(carrierId);
+        if (carrierIdList != null && carrierIdList.size() == 1) {
+            BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
+            amsDispatchSaleOrder.setCarrierId(carrierId);
+        }
         amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(0));
         amsDispatchSaleOrder.setUpdateTime(new Date());
         int result = amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(amsDispatchSaleOrder);
@@ -255,8 +258,14 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
     @Override
     public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> mapValue) {
         String carrierSsoId = (String) mapValue.get("carrierSsoId");
-        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
-        mapValue.put("carrierId",carrierId);
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        if (carrierIdList != null && carrierIdList.size() == 1) {
+            BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
+            mapValue.put("carrierId", carrierId);
+        }
+        else {
+            mapValue.put("carrierId",null);
+        }
         List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(mapValue);
         if (mapList == null) {
             return null;
@@ -342,8 +351,14 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
     @Override
     public List<Map<String, Object>> getPCDispatchSaleOrderList(Map<String, Object> mapValue) {
         String carrierSsoId = (String) mapValue.get("carrierSsoId");
-        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
-        mapValue.put("carrierId",carrierId);
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        if (carrierIdList != null && carrierIdList.size() == 1) {
+            BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
+            mapValue.put("carrierId", carrierId);
+        }
+        else {
+            mapValue.put("carrierId",null);
+        }
         List<Map<String, Object>> dispatchSaleOrderList = amsDispatchSaleOrderMapper.getPCDispatchSaleOrderList(mapValue);
         for (Map<String,Object> map: dispatchSaleOrderList) {
 //            Date dispatchDealTime = (Date) map.get("dispatchDealTime");
@@ -474,4 +489,34 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getDispatchMaterialList(dispatchId);
         return mapList;
     }
+
+    /**
+     * 批量接收定向派单
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public int lockDispatchSaleOrderList(Map<String, Object> mapValue) {
+        String carrierSsoId = (String) mapValue.get("carrierSsoId");
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        BigDecimal carrierId = null;
+        if (carrierIdList != null && carrierIdList.size() == 1) {
+            carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
+        }
+        int result = 0;
+        List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        for (Map<String, Object> map : mapList) {
+            AmsDispatchSaleOrder amsDispatchSaleOrder = new AmsDispatchSaleOrder();
+            BigDecimal dispatchId = DataChange.dataToBigDecimal(map.get("dispatchId"));
+            amsDispatchSaleOrder.setDispatchId(dispatchId);
+            if (carrierId != null) {
+                amsDispatchSaleOrder.setCarrierId(carrierId);
+            }
+            amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(0));
+            amsDispatchSaleOrder.setUpdateTime(new Date());
+            amsDispatchSaleOrder.setDispatchDealTime(new Date());
+            result += amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(amsDispatchSaleOrder);
+        }
+        return result;
+    }
 }

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

@@ -204,7 +204,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             else {
                 // 收货地址id
                 BigDecimal shippingAddressId = DataChange.dataToBigDecimal(map.get("shippingAddressId"));
-                // 收货日期
+                // 截止日期
                 String dateOfReceiptStr = (String) map.get("dateOfReceipt");
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                 Date dateOfReceipt = null;
@@ -224,7 +224,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
                 amsSaleOrderMaterial.setSaleOrderMaterialTruckNo(truckNo);
                 amsSaleOrderMaterial.setSaleShippingAddressId(shippingAddressId);
                 // 钢材收货日期
-                amsSaleOrderMaterial.setSteelReceiptDate(dateOfReceipt);
+                amsSaleOrderMaterial.setSaleDateOfReceipt(dateOfReceipt);
                 amsSaleOrderMaterial.setSaleOrderConsignee(orderConsignee);
                 if (orderConsignee != null) {
                     amsSaleOrderMaterial.setSaleOrderConsigneeTel(orderConsigneeTel.toString());

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

@@ -509,6 +509,7 @@
                            ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
                  LEFT JOIN OMSTRUCK_ORDER OO
                            ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                           AND OO.ORDER_TYPE IN (1,2)
                  LEFT JOIN AMS_SALE_ORDER ASO
                            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
                  LEFT JOIN RMS_SHIPPER RSH
@@ -525,6 +526,7 @@
           </if>
           AND OO.CAPACITY_ID IS NULL
           AND ADSO.DISPATCH_DEAL_TIME IS NOT NULL
+              ORDER BY ADSO.DISPATCH_DEAL_TIME DESC
     </select>
 
     <select id="getNullOrNotNull" parameterType="DECIMAL" resultType="java.util.Map">
@@ -648,10 +650,12 @@
         WHERE ADSO.DISPATCH_ID = #{dispatchId}
     </select>
 
-    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
+    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="java.util.Map" >
         SELECT
             RC.CARRIER_ID AS "carrierId"
         FROM RMS_CARRIER RC
-        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+        <if test="carrierSsoId != null" >
+            WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+        </if>
     </select>
 </mapper>