Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -721,9 +721,6 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (result == 0) {
             return failed("匹配不到车牌号！");
         }
-        if (result==6){
-            return success("操作成功");
-        }
         else {
             for (Map<String, Object> map : mapList) {
                 // 调用EAS接口将车牌号传给金蝶

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

@@ -790,7 +790,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             throw new Exception("订单未审核，无法派车！");
         }
         int result = 0;
-        BigDecimal isSteel=null;
         // 遍历每一行
         for (Map<String,Object> map : mapList) {
             // 得到车牌号
@@ -808,16 +807,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 找到详细地址下的省市县id
                 BigDecimal addressId = amsSaleOrderMapper.getAddressByPlace(placeId);
                 // 根据省市县匹配出省市县下的所有单价
-                Map<String,Object> hashMap = new HashMap<>();
-                hashMap.put("addressId",addressId);
-                hashMap.put("carrierId",carrierId);
-                List<Map<String,Object>> priceList = amsSaleOrderMapper.getAddressPriceList(hashMap);
+                Map<String, Object> hashMap = new HashMap<>();
+                hashMap.put("addressId", addressId);
+                hashMap.put("carrierId", carrierId);
+                List<Map<String, Object>> priceList = amsSaleOrderMapper.getAddressPriceList(hashMap);
                 // 如果长度为0，说明此地址所在省市县内也无单价
                 if (priceList != null && priceList.size() != 0) {
                     Map<String, Object> priceMap = priceList.get(0);
                     priceId = (BigDecimal) priceMap.get("priceId");
-                }
-                else {
+                } else {
                     priceId = new BigDecimal(2400);
                 }
             }
@@ -825,17 +823,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal lineId = DataChange.dataToBigDecimal(map.get("lineId"));
             // 司机电话号码
             String driverTel = (String) map.get("driverTel");
-            //判断是否为内转异地库到钢材
-            BigDecimal isIwardSteel =DataChange.dataToBigDecimal(map.get("isIwardSteel"));
-            if (isIwardSteel==null&&isIwardSteel.intValue()==0) {
-                 isSteel = new BigDecimal(1);
-            }
+            BigDecimal isSteel = new BigDecimal(1);
             // 得到运力id
             BigDecimal capacityId = amsSaleOrderMaterialMapper.getCapacityId(capacityNumber);
             if (capacityId == null) {
                 return 0;
             }
-            List<Map<String,Object>> materialList = amsSaleOrderMaterialMapper.getMaterial(saleOrderMaterialId);
+            List<Map<String, Object>> materialList = amsSaleOrderMaterialMapper.getMaterial(saleOrderMaterialId);
             /*
              定向派单表
              */
@@ -869,9 +863,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
              运输订单
              */
             OmstruckOrder omstruckOrder = new OmstruckOrder();
-            Map<String,Object> map1 = new HashMap<>();
-            map1.put("orderType",new BigDecimal(2));
-            map1.put("orderPlanId",saleOrderMaterialId);
+            Map<String, Object> map1 = new HashMap<>();
+            map1.put("orderType", new BigDecimal(2));
+            map1.put("orderPlanId", saleOrderMaterialId);
             List<OmstruckOrder> omstruckOrders = omstruckOrderMapper.selectByParameters(map1);
             if (omstruckOrders == null || omstruckOrders.size() == 0) {
                 // 运输订单主键
@@ -880,11 +874,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 车序号主键
                 omstruckOrder.setOrderPlanId(saleOrderMaterialId);
                 //添加承运商ID 和 运价ID
-                //Object priceId = map.get("priceId");
+//            Object priceId = map.get("priceId");
                 if (priceId != null) {
                     omstruckOrder.setPriceId(priceId);
-                }
-                else {
+                } else {
                     omstruckOrder.setPriceId(new BigDecimal(0));
                 }
                 omstruckOrder.setCarrierId(carrierId);
@@ -909,10 +902,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 if (isSteel != null && isSteel.intValue() == 1) {
                     status = new BigDecimal(1);
                 }
-                //内转钢材到异地库设置为4
-                 else if (isIwardSteel!=null&&isIwardSteel.intValue()==4){
-                    status = new BigDecimal(4);
-                }
                 // 非钢材（危化品，焦炭，副产品）
                 else {
                     status = new BigDecimal(2);
@@ -924,9 +913,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 omstruckOrder.setInsertTime(new Date());
                 omstruckOrder.setInsertUsername("");
                 result += omstruckOrderMapper.insertSelective(omstruckOrder);
-
-            }
-            else {
+            } else {
                 omstruckOrder = omstruckOrders.get(0);
             }
             for (Map<String, Object> materialMap : materialList) {
@@ -952,31 +939,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
             // 调用websocket
-            Map<String,Object> orderIdMap = new HashMap<>();
-            orderIdMap.put("orderId",omstruckOrder.getOrderId());
+            Map<String, Object> orderIdMap = new HashMap<>();
+            orderIdMap.put("orderId", omstruckOrder.getOrderId());
             amsSaleOrderMaterialService.pushMesToWebsocket(orderIdMap);
             // 生成运输执行总实绩
             result += tmsTruckFeign.addTotalResult(orderIdMap);
-            //根据返回的总实绩id新增
-            if (map.get("sendStationId")!=null){
-                BigDecimal maxId = tmstrainPleaseApproveResultMapper.getMaxId();
-                BigDecimal saleOrderId =DataChange.dataToBigDecimal(map.get("saleOrderId"));
-                TmstrainPleaseApproveResult tmstrainPleaseApproveResult=new TmstrainPleaseApproveResult();
-                tmstrainPleaseApproveResult.setResultId(maxId);
-                tmstrainPleaseApproveResult.setRailPlanId(saleOrderId);
-                tmstrainPleaseApproveResult.setSendStationId(DataChange.dataToBigDecimal(map.get("sendStationId")));
-                tmstrainPleaseApproveResult.setResultPleasePlanNo(DataChange.generateEightDigitsNumber("WPCJH",maxId.intValue()));
-                tmstrainPleaseApproveResult.setResultPlanDate(new Date());
-                tmstrainPleaseApproveResult.setResultCategory("钢材");
-                tmstrainPleaseApproveResult.setResultType(new BigDecimal(4));
-                tmstrainPleaseApproveResult.setInsertTime(new Date());
-                tmstrainPleaseApproveResult.setInsertUpdateRemark("内转钢材到异地库");
-                tmstrainPleaseApproveResultMapper.insertSelective(tmstrainPleaseApproveResult);
-
-            }
-            return 6;
         }
-        return result;
+        return  result;
     }
 
     /**

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

@@ -1815,6 +1815,7 @@
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
+    a_s_order.SALE_TYPE ,
     DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     RM.MATERIAL_NAME "materialName",
     a_s_order.CLOSE_STATUS "closeStatus"
@@ -1829,7 +1830,9 @@
     on RM.MATERIAL_ID = ASM.MATERIAL_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is not null
-    and a_s_order.DELETED = 0) SSSR
+    and a_s_order.DELETED = 0
+    and a_s_order.SALE_TYPE is null
+    ) SSSR
     <if test="con != null" >
       where SSSR."consigneeCompanyName" LIKE #{con}
     </if>