修改

pom.xml

@@ -106,12 +106,12 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dil</user>
-                    <password>Dil123789</password>
+                    <user>DAGANG</user>
+                    <password>root123</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>AMSTRUCK_SPORADIC_ORDER</param><!--销售计划-->
+                        <param>AMS_SALE_ORDER</param><!--销售计划-->
 <!--                        <param>AMSTRUCK_INWARD_REQUIREMENT</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->

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

@@ -592,4 +592,28 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, mapList,columndata);
         return success(pageList);
     }
+
+    @ApiModelProperty(value = "展示销售焦炭订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getCokeSaleOrderList")
+    public RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId,
+                                              String con) {
+        if (con != null && !con.equals("undefined")) {
+            mapValue.put("con","%" + con + "%");
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> saleCompanyList =  amsSaleOrderService.getCokeSaleOrderList(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> saleOrderList = amsSaleOrderService.getCokeSaleOrderList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
+        return success(pageList);
+    }
 }

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

@@ -273,4 +273,18 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value="承运商直接选择车牌号派发运输订单")
+    @PostMapping("dispatchTruckOrderByCarrier")
+    public RESTfulResult dispatchTruckOrderByCarrier(@RequestBody Map<String,Object> mapValue){
+        int result = amsSaleOrderMaterialService.dispatchTruckOrderByCarrier(mapValue);
+        return success(result);
+    }
+
+    @ApiOperation(value="关闭销售订单")
+    @PostMapping("closeSaleOrder")
+    public RESTfulResult closeSaleOrder(@RequestParam Integer saleOrderId){
+        int result = amsSaleOrderMaterialService.closeSaleOrder(new BigDecimal(saleOrderId));
+        return success(result);
+    }
+
 }

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

@@ -68,4 +68,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     // 销售订单物资
     List<Map<String, Object>> getSaleMaterial(Map<String,Object> loserMap);
+
+    // 销售焦炭订单
+    List<Map<String, Object>> getCokeSaleOrderList(Map<String,Object> mapValue);
 }

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

@@ -48,4 +48,6 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
     BigDecimal getMaterialWeightByOrderId(BigDecimal saleOrderId);
     //计算同一销售下的物资总净量
     BigDecimal getMaterialNetWeightBySaleId(BigDecimal saleOrderId);
+    // 得到是否是钢材
+    BigDecimal getIsSteel(BigDecimal lineId);
 }

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

@@ -21,8 +21,6 @@ public interface AmstruckSporadicOrderMapper extends IBaseMapper<AmstruckSporadi
     // 查询零星物资订单一车多趟列表
     List<Map<String, Object>> getSporadicOrdersList1(Map<String, Object> mapValue);
 
-
-
     // 查询物资详情
     List<Map<String, Object>> seeAllMaterials(Map<String, Object> mapValue);
 

src/main/java/com/steerinfo/dil/model/AmsSaleOrder.java

@@ -3,19 +3,20 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
 @ApiModel(value="销售订单")
 public class AmsSaleOrder implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(SALE_ORDER_ID,DECIMAL,38)
+     * 主键ID(SALE_ORDER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal saleOrderId;
 
     /**
-     * 销售计划ID(PLAN_ID,DECIMAL,38)
+     * 销售计划ID(PLAN_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="销售计划ID",required=false)
     private BigDecimal planId;
@@ -27,13 +28,13 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     private String saleNumber;
 
     /**
-     * 发货单位ID(SHIPPER_ID,DECIMAL,38)
+     * 发货单位ID(SHIPPER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="发货单位ID",required=false)
     private BigDecimal shipperId;
 
     /**
-     * 收货单位ID(RECEIVE_ID,DECIMAL,38)
+     * 收货单位ID(RECEIVE_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="收货单位ID",required=false)
     private BigDecimal receiveId;
@@ -57,13 +58,13 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     private BigDecimal saleHistoricalOrderAmount;
 
     /**
-     * 销售订单状态（0：未上报；1:已上报；2：销售公司已审核通过；3：销售公司已审核未通过；4：财务部已审核通过；5：财务部已审核未通过；）(SALE_ORDER_STATUS,DECIMAL,38)
+     * 销售订单状态（0：未上报；1:已上报；2：销售公司已审核通过；3：销售公司已审核未通过；4：财务部已审核通过；5：财务部已审核未通过；）(SALE_ORDER_STATUS,DECIMAL,0)
      */
     @ApiModelProperty(value="销售订单状态（0：未上报；1:已上报；2：销售公司已审核通过；3：销售公司已审核未通过；4：财务部已审核通过；5：财务部已审核未通过；）",required=false)
     private BigDecimal saleOrderStatus;
 
     /**
-     * 收款客户(SALE_ORDER_RECEIVE_CUSTOMER,VARCHAR,20)
+     * 收款客户(SALE_ORDER_RECEIVE_CUSTOMER,VARCHAR,250)
      */
     @ApiModelProperty(value="收款客户",required=false)
     private String saleOrderReceiveCustomer;
@@ -87,13 +88,13 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     private String saleOrderTax;
 
     /**
-     * 备注(SALE_REMARK,VARCHAR,20)
+     * 备注(SALE_REMARK,VARCHAR,250)
      */
     @ApiModelProperty(value="备注",required=false)
     private String saleRemark;
 
     /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     * 记录创建人(INSERT_USERNAME,VARCHAR,50)
      */
     @ApiModelProperty(value="记录创建人",required=false)
     private String insertUsername;
@@ -128,6 +129,12 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="是否删除（0：否，1：是）",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 订单关闭状态(0:未关闭；1：已关闭)(CLOSE_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="订单关闭状态(0:未关闭；1：已关闭)",required=false)
+    private BigDecimal closeStatus;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -300,6 +307,14 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public BigDecimal getCloseStatus() {
+        return closeStatus;
+    }
+
+    public void setCloseStatus(BigDecimal closeStatus) {
+        this.closeStatus = closeStatus;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -326,6 +341,7 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
+        sb.append(", closeStatus=").append(closeStatus);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -58,4 +58,9 @@ public interface IAmsSaleOrderMaterialService{
     // 销售直接派发销售订单
     int dispatchTruckOrderBySale(Map<String, Object> mapValue);
 
+    // 承运商直接派发销售订单
+    int dispatchTruckOrderByCarrier(Map<String, Object> mapValue);
+
+    // 关闭销售订单
+    int closeSaleOrder(BigDecimal saleOrderId);
 }

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

@@ -94,4 +94,7 @@ public interface IAmsSaleOrderService {
     List<Map<String, Object>> getAmsSaleOrderApprovedes(Map<String, Object> map);
 
     List<Map<String, Object>> getSaleOrderAndMaterialById(Map<String,Object> mapValue);
+
+    // 销售焦炭订单
+    List<Map<String, Object>> getCokeSaleOrderList(Map<String,Object> mapValue);
 }

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

@@ -50,7 +50,6 @@ public interface IAmstruckSporadicOrderService {
 
     //一车多趟运输顶单排车
     int addSporadicOrderforTimes(Map<String,Object> map);
-
     //一车多趟停止
     int closeSporadicOrder(Map<String,Object> map);
 }

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

@@ -46,6 +46,8 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
     IMFeign imFeign;
     @Autowired
     TmsTruckFeign tmsTruckFeign;
+    @Autowired
+    AmsSaleOrderMapper amsSaleOrderMapper;
 
     @Override
     public int addAmsSaleOrderMaterial(AmsSaleOrderMaterial amsSaleOrderMaterial) {
@@ -324,6 +326,8 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             BigDecimal carrierId = DataChange.dataToBigDecimal(map.get("carrierId"));
             // 运输线路id
             BigDecimal lineId = DataChange.dataToBigDecimal(map.get("lineId"));
+            // 通过线路id判断是否是钢材
+            BigDecimal isSteel = amsSaleOrderMaterialMapper.getIsSteel(lineId);
             // 物资重量
             BigDecimal materialNumber = DataChange.dataToBigDecimal(map.get("orderPlanWeight"));
             // 车牌号
@@ -334,7 +338,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             String consigneeName = String.valueOf(map.get("saleOrderConsignee"));
             // 收货方电话
             String consigneeTel = String.valueOf(map.get("saleOrderConsigneeTel"));
-            // 发货日期
+            // 截止日期
             String dateOfReceiptStr = String.valueOf(map.get("saleDateOfReceipt"));
             Date dateOfReceipt = null;
             if (!"null".equals(dateOfReceiptStr) && !"undefined".equals(dateOfReceiptStr)) {
@@ -353,7 +357,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             amsSaleOrderMaterial.setSaleOrderMaterialTruckNo(new BigDecimal(count));
             // 收货地址
             amsSaleOrderMaterial.setSaleShippingAddressId(saleShippingAddressId);
-            // 收货日期
+            // 截止日期
             amsSaleOrderMaterial.setSaleDateOfReceipt(dateOfReceipt);
             // 收货方姓名
             if (!consigneeName.equals("null") && !consigneeName.equals("undefined")) {
@@ -413,8 +417,17 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             omstruckOrder.setOrderIssueTime(new Date());
             // 运单状态
             omstruckOrder.setOrderStatus(new BigDecimal(4));
-            // 订单类型(非钢材销售)
-            omstruckOrder.setOrderType(new BigDecimal(2));
+            BigDecimal status;
+            // 非钢材（危化品和焦炭）
+            if (isSteel != null && (isSteel.intValue() == 3 || isSteel.intValue() == 4)) {
+                status = new BigDecimal(2);
+            }
+            // 钢材
+            else {
+                status = new BigDecimal(1);
+            }
+            // 订单类型
+            omstruckOrder.setOrderType(status);
             // 运输线路id
             omstruckOrder.setLineId(lineId);
             /*
@@ -463,6 +476,194 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
         return result;
     }
 
+    /**
+     * 承运商直接派发销售订单
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public int dispatchTruckOrderByCarrier(Map<String, Object> mapValue) {
+        int result = 0;
+        // 得到列内容
+        List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        // 销售订单主键
+        BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
+        // 得到最大的车序号
+        BigDecimal count = DataChange.dataToBigDecimal(mapValue.get("truckNo"));
+        // 车序号计数
+        if (count.intValue() == 0) {
+            count = new BigDecimal(1);
+        }
+        // 遍历每一个列
+        for (Map<String, Object> map : mapList) {
+            // 销售订单-物资中间表id
+            BigDecimal saleMaterialId = DataChange.dataToBigDecimal(map.get("saleMaterialId"));
+            // 物资id
+            BigDecimal materialId = DataChange.dataToBigDecimal(map.get("materialId"));
+            // 收货地址id
+            BigDecimal saleShippingAddressId = DataChange.dataToBigDecimal(map.get("saleShippingAddressId"));
+            if (saleShippingAddressId.intValue() == 0) {
+                saleShippingAddressId = null;
+            }
+            // 承运商id
+            BigDecimal carrierId = DataChange.dataToBigDecimal(map.get("carrierId"));
+            // 运输线路id
+            BigDecimal lineId = DataChange.dataToBigDecimal(map.get("lineId"));
+            // 通过线路id判断是否是钢材
+            BigDecimal isSteel = amsSaleOrderMaterialMapper.getIsSteel(lineId);
+            // 物资重量
+            BigDecimal materialNumber = DataChange.dataToBigDecimal(map.get("orderPlanWeight"));
+            // 车牌号
+            String capacityNumber = (String) map.get("capacityNumber");
+            // 得到运力id
+            BigDecimal capacityId = amsSaleOrderMaterialMapper.getCapacityId(capacityNumber);
+            // 收货方姓名
+            String consigneeName = String.valueOf(map.get("saleOrderConsignee"));
+            // 收货方电话
+            String consigneeTel = String.valueOf(map.get("saleOrderConsigneeTel"));
+            // 截止日期
+            String dateOfReceiptStr = "4102415999000";
+            Date dateOfReceipt = new Date(Long.valueOf(dateOfReceiptStr));
+            /*
+             车序号表
+             */
+            AmsSaleOrderMaterial amsSaleOrderMaterial = new AmsSaleOrderMaterial();
+            // 主键
+            BigDecimal saleOrderMaterialId = amsSaleOrderMaterialMapper.selectMaxId();
+            amsSaleOrderMaterial.setSaleOrderMaterialId(saleOrderMaterialId);
+            // 销售订单主键
+            amsSaleOrderMaterial.setSaleOrderId(saleOrderId);
+            // 车序号
+            amsSaleOrderMaterial.setSaleOrderMaterialTruckNo(count);
+            // 收货地址
+            amsSaleOrderMaterial.setSaleShippingAddressId(saleShippingAddressId);
+            // 截止日期
+            amsSaleOrderMaterial.setSaleDateOfReceipt(dateOfReceipt);
+            // 收货方姓名
+            if (!consigneeName.equals("null") && !consigneeName.equals("undefined")) {
+                amsSaleOrderMaterial.setSaleOrderConsignee(consigneeName);
+            }
+            // 收货方联系方式
+            if (!consigneeTel.equals("null") && !consigneeTel.equals("undefined")) {
+                amsSaleOrderMaterial.setSaleOrderConsigneeTel(consigneeTel);
+            }
+            // 下发状态
+            amsSaleOrderMaterial.setIssueStatus(new BigDecimal(2));
+            /*
+             车序号与物资子表
+             */
+            AmsSaleTrucknoMaterial amsSaleTrucknoMaterial = new AmsSaleTrucknoMaterial();
+            // 主键
+            BigDecimal truckNoMaterialId = amsSaleTrucknoMaterialMapper.selectMaxId();
+            amsSaleTrucknoMaterial.setTrucknoMaterialId(truckNoMaterialId);
+            // 销售订单-物资中间表id
+            amsSaleTrucknoMaterial.setMaterialId(saleMaterialId);
+            // 车序号主键
+            amsSaleTrucknoMaterial.setSaleOrderMaterialId(saleOrderMaterialId);
+            // 物资重量
+            amsSaleTrucknoMaterial.setSaleOrderMaterialNumber(materialNumber);
+            /*
+             定向派单表
+             */
+            AmsDispatchSaleOrder amsDispatchSaleOrder = new AmsDispatchSaleOrder();
+            // 主键
+            BigDecimal dispatchId = amsDispatchSaleOrderMapper.selectOtherId();
+            amsDispatchSaleOrder.setDispatchId(dispatchId);
+            // 车序号表id
+            amsDispatchSaleOrder.setSaleOrderMaterialId(saleOrderMaterialId);
+            // 承运商id
+            amsDispatchSaleOrder.setCarrierId(carrierId);
+            // 派单时间和成交时间
+            amsDispatchSaleOrder.setDispatchTime(new Date());
+            amsDispatchSaleOrder.setDispatchDealTime(new Date());
+            // 成交类型
+            amsDispatchSaleOrder.setDispatchType(new BigDecimal(0));
+            // 车序号状态
+            amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(2));
+            /*
+             运输订单
+             */
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
+            // 运输订单主键
+            BigDecimal orderId = omstruckOrderMapper.selectMaxId();
+            omstruckOrder.setOrderId(orderId);
+            // 车序号主键
+            omstruckOrder.setOrderPlanId(saleOrderMaterialId);
+            // 运输订单号
+            omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD",orderId.intValue()));
+            // 运力id
+            omstruckOrder.setCapacityId(capacityId);
+            // 下发时间
+            omstruckOrder.setOrderIssueTime(new Date());
+            // 运单状态
+            omstruckOrder.setOrderStatus(new BigDecimal(4));
+            BigDecimal status;
+            // 非钢材（危化品和焦炭）
+            if (isSteel != null && (isSteel.intValue() == 3 || isSteel.intValue() == 4)) {
+                status = new BigDecimal(2);
+            }
+            // 钢材
+            else {
+                status = new BigDecimal(1);
+            }
+            // 订单类型
+            omstruckOrder.setOrderType(status);
+            // 运输线路id
+            omstruckOrder.setLineId(lineId);
+            /*
+             运输订单子表
+             */
+            OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+            // 主键
+            BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+            omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+            // 运输订单id
+            omstruckOrderMaterial.setOrderId(orderId);
+            // 物资id
+            omstruckOrderMaterial.setMaterialId(materialId);
+            // 物资重量
+            omstruckOrderMaterial.setOrderMaterialWeight(materialNumber);
+            // 新增车序号表
+            result += amsSaleOrderMaterialMapper.insertSelective(amsSaleOrderMaterial);
+            // 新增车序号-物资中间表
+            result += amsSaleTrucknoMaterialMapper.insertSelective(amsSaleTrucknoMaterial);
+            // 新增定向派单表
+            result += amsDispatchSaleOrderMapper.insertSelective(amsDispatchSaleOrder);
+            // 新增运输订单
+            result += omstruckOrderMapper.insertSelective(omstruckOrder);
+            // 新增运输订单子表
+            result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+            // 调用websocket
+            Map<String,Object> orderIdMap = new HashMap<>();
+            orderIdMap.put("orderId",orderId);
+            pushMesToWebsocket(orderIdMap);
+            // 生成运输执行总实绩
+            result += tmsTruckFeign.addTotalResult(orderIdMap);
+            // 车序号累加
+            count = new BigDecimal(count.intValue() + 1);
+        }
+        // 修改状态为开启状态
+        AmsSaleOrder amsSaleOrder = new AmsSaleOrder();
+        amsSaleOrder.setSaleOrderId(saleOrderId);
+        amsSaleOrder.setCloseStatus(new BigDecimal(0));
+        result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+        return result;
+    }
+
+    /**
+     * 关闭销售订单
+     * @param saleOrderId
+     * @return
+     */
+    @Override
+    public int closeSaleOrder(BigDecimal saleOrderId) {
+        AmsSaleOrder amsSaleOrder = new AmsSaleOrder();
+        amsSaleOrder.setSaleOrderId(saleOrderId);
+        amsSaleOrder.setCloseStatus(new BigDecimal(1));
+        int result = amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+        return result;
+    }
+
     /**
      * 发送消息到 websocket 推送消息
      * orderId  订单Id

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

@@ -463,4 +463,21 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         }
         return mapList;
     }
+
+    /**
+     * 销售焦炭订单
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getCokeSaleOrderList(Map<String, Object> mapValue) {
+        List<Map<String,Object>> mapList = amsSaleOrderMapper.getCokeSaleOrderList(mapValue);
+        String statusStr;
+        for (Map<String, Object> resultMap : mapList) {
+            BigDecimal saleOrderStatus = (BigDecimal) resultMap.get("saleOrderStatus");
+            statusStr = saleOrderStatus.intValue() == 2 ? "销售公司已审批" : "财务已审批";
+            resultMap.put("statusStr",statusStr);
+        }
+        return mapList;
+    }
 }

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

@@ -443,7 +443,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 omstruckOrder.setOrderId(orderId1);
                 omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map2.get("orderPlanId")));
                 omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", orderId1.intValue()));
-                //omstruckOrder.setOrderLineSequence(DataChange.dataToBigDecimal(map2.get("lineSqe")));
+                //设置新增时间
                 omstruckOrder.setInsertTime(new Date());
                 omstruckOrder.setInsertUsername(userId);
                 omstruckOrder.setLineId(DataChange.dataToBigDecimal(map2.get("lineId")));

src/main/resources/application-dev.yml

@@ -15,10 +15,12 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:192.168.1.102:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8018}
 
-server:
-  port: 8015
 
+
+  #测试环境端口
+server:
+    port: 8015

src/main/resources/application-prod.yml

@@ -6,19 +6,20 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: DAL-OMS-API-PROD
+    name: dil-ams-api-dev
 
-#feign设置
 openfeign:
-  #   正式环境
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.166:8089}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8055}
+#   正式环境
+   ESFeign:
+     url: ${ESFEIGN_URL:172.16.33.166:8089}
+   ColumnDataFeign:
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+   TmsTruckFeign:
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+   ImFeign:
+      url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+ #正式环境端口
 
 server:
   port: 8079

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/ams
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -11,6 +11,7 @@ spring:
     encoding: UTF-8
   mvc:
     static-path-pattern:
+
 #eureka设置
 eureka:
   client:
@@ -48,3 +49,4 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
+

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

@@ -731,4 +731,10 @@
                      ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </select>
+
+  <select id="getIsSteel" parameterType="DECIMAL" resultType="DECIMAL">
+    SELECT RL.IS_STEEL AS "isSteel"
+    FROM RMS_LINE RL
+    WHERE RL.LINE_ID = #{lineId}
+  </select>
 </mapper>