修改零星

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>AMS_SALE_ORDER_MATERIAL</param><!--销售计划-->
+                        <param>AMSTRUCK_SPORADIC_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/AmstruckSporadicMaterialController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.model.AmstruckSporadicMaterial;
+import com.steerinfo.dil.service.IAmstruckSporadicMaterialService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * AmstruckSporadicMaterial RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-04 08:32
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-04
+ * 作者：generator
+ * 参考：
+ * 描述：AmstruckSporadicMaterial RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/amstrucksporadicmaterials")
+public class AmstruckSporadicMaterialController extends BaseRESTfulController {
+
+    @Autowired
+    IAmstruckSporadicMaterialService amstruckSporadicMaterialService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("amstrucksporadicmaterial:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<AmstruckSporadicMaterial> list = amstruckSporadicMaterialService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("amstrucksporadicmaterial:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<AmstruckSporadicMaterial> list = amstruckSporadicMaterialService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据AmstruckSporadicMaterial对象创建")
+    @ApiImplicitParam(name = "amstruckSporadicMaterial", value = "详细实体amstruckSporadicMaterial", required = true, dataType = "AmstruckSporadicMaterial")
+    //@RequiresPermissions("amstrucksporadicmaterial:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute AmstruckSporadicMaterial model){
+        AmstruckSporadicMaterial amstruckSporadicMaterial = amstruckSporadicMaterialService.add(model);
+        return success(amstruckSporadicMaterial);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("amstrucksporadicmaterial:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable BigDecimal id){
+        AmstruckSporadicMaterial amstruckSporadicMaterial = amstruckSporadicMaterialService.getById(id);
+        return success(amstruckSporadicMaterial);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的amstruckSporadicMaterial信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "amstruckSporadicMaterial", value = "详细实体amstruckSporadicMaterial", required = true, dataType = "AmstruckSporadicMaterial")
+    })
+    //@RequiresPermissions("amstrucksporadicmaterial:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable BigDecimal id, @RequestBody AmstruckSporadicMaterial model){
+        model.setId(id);
+        AmstruckSporadicMaterial amstruckSporadicMaterial = amstruckSporadicMaterialService.modify(model);
+        return success(amstruckSporadicMaterial);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("amstrucksporadicmaterial:delete")
+    @DeleteMapping(value = "/{id}")//BigDecimal
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<BigDecimal> ids = ListUtils.convertList(list);
+			  amstruckSporadicMaterialService.delete(ids);
+    	}
+      return success();
+    }
+}

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

@@ -49,7 +49,7 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
     @ApiOperation(value="新增零星物资进出厂（以及销售钢材退货）,包括内转精煤")
     @PostMapping("/addSporadicOrders")
     public RESTfulResult addSporadicOrders(@RequestBody Map<String,Object> mapValue) {
-        int result = amstruckSporadicOrderService.addSporadicOrders(mapValue);
+        int result = amstruckSporadicOrderService.addSporadicOrder(mapValue);
         return success(result);
     }
 
@@ -80,15 +80,19 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
                                                Integer pageSize,
                                                Integer orderType,
                                                Integer issueStatus,
-                                               String con) {
+                                               String con,
+                                               Integer dispatchStatus) {
         if (con != null && !con.equals("undefined")) {
             String index="get_sporadic_order_list";//设置要查询的索引名称
             return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
         }
         mapValue.put("orderType",orderType);
         mapValue.put("issueStatus",issueStatus);
+        if (dispatchStatus!=null){
+            mapValue.put("dispatchStatus",dispatchStatus);
+        }
         List<Map<String, Object>> sporadicOrderList = null;
-        if (mapValue.size() == 2) {
+        if (mapValue.size() == 3) {
             //将查询结果存入索引中
             sporadicOrderList =  amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
             Map<String, Object> map1 = new HashMap<>();
@@ -167,4 +171,14 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
         return success(mapList);
     }
 
+
+
+    @ApiOperation(value="零星一车多趟新增订单")
+    @PostMapping("/addSporadicOrderTimes")
+    public RESTfulResult addSporadicOrderTimes(@RequestBody Map<String,Object> map) {
+       int i=amstruckSporadicOrderService.addSporadicOrderforTimes(map);
+        return success(i);
+    }
+
+
 }

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

@@ -0,0 +1,14 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmstruckSporadicMaterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface AmstruckSporadicMaterialMapper extends IBaseMapper<AmstruckSporadicMaterial, BigDecimal> {
+    //设置主键id
+    @Select("select seq_AMSTRUCK_SPORADIC_MATERIAL.nextval from dual")
+    BigDecimal getSporadicMaterial();
+}

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

@@ -18,9 +18,14 @@ public interface AmstruckSporadicOrderMapper extends IBaseMapper<AmstruckSporadi
     // 查询零星物资订单列表
     List<Map<String, Object>> getSporadicOrdersList(Map<String, Object> mapValue);
 
+    // 查询零星物资订单一车多趟列表
+    List<Map<String, Object>> getSporadicOrdersList1(Map<String, Object> mapValue);
     // 查询物资详情
     List<Map<String, Object>> seeAllMaterials(Map<String, Object> mapValue);
 
     // 根据零星订单id查询修改渲染
     List<Map<String, Object>> selectSporadicOrder(BigDecimal sporadicOrderId);
+
+    //一车多趟，根据运输订单id查找运输订单信息
+    Map<String,Object> selectOrderInfo(Integer orderId);
 }

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

@@ -9,6 +9,6 @@ import org.apache.ibatis.annotations.Select;
 @Mapper
 public interface TmstruckTotalResultMapper extends IBaseMapper<TmstruckTotalResult, BigDecimal> {
     //生成主键id
-    @Select("select seq_TMSTRUCK_TOTALRESULT.nextval from dual")
+    @Select("select seq_tmstruck_total_result.nextval from dual")
     BigDecimal selectTmstruckTotalResultId();
 }

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

@@ -0,0 +1,198 @@
+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 AmstruckSporadicMaterial implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(SPORADIC_ORDER_MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal sporadicOrderMaterialId;
+
+    /**
+     * 物资id(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资id",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 物资重量(MATERIAL_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资重量",required=false)
+    private BigDecimal materialWeight;
+
+    /**
+     * 物资件数(MATERIAL_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资件数",required=false)
+    private BigDecimal materialNumber;
+
+    /**
+     * 零星订单ID(SPORADIC_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="零星订单ID",required=false)
+    private BigDecimal sporadicOrderId;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.sporadicOrderMaterialId;
+    }
+
+    @Override
+    public void setId(BigDecimal sporadicOrderMaterialId) {
+        this.sporadicOrderMaterialId = sporadicOrderMaterialId;
+    }
+
+    public BigDecimal getSporadicOrderMaterialId() {
+        return sporadicOrderMaterialId;
+    }
+
+    public void setSporadicOrderMaterialId(BigDecimal sporadicOrderMaterialId) {
+        this.sporadicOrderMaterialId = sporadicOrderMaterialId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getMaterialWeight() {
+        return materialWeight;
+    }
+
+    public void setMaterialWeight(BigDecimal materialWeight) {
+        this.materialWeight = materialWeight;
+    }
+
+    public BigDecimal getMaterialNumber() {
+        return materialNumber;
+    }
+
+    public void setMaterialNumber(BigDecimal materialNumber) {
+        this.materialNumber = materialNumber;
+    }
+
+    public BigDecimal getSporadicOrderId() {
+        return sporadicOrderId;
+    }
+
+    public void setSporadicOrderId(BigDecimal sporadicOrderId) {
+        this.sporadicOrderId = sporadicOrderId;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", sporadicOrderMaterialId=").append(sporadicOrderMaterialId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", materialWeight=").append(materialWeight);
+        sb.append(", materialNumber=").append(materialNumber);
+        sb.append(", sporadicOrderId=").append(sporadicOrderId);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -80,6 +80,18 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="零星订单编号",required=false)
     private String sporadicOrderNo;
 
+    /**
+     * 零星订单趟次(SPORADIC_ORDER_TIMES,DECIMAL,0)
+     */
+    @ApiModelProperty(value="零星订单趟次",required=false)
+    private BigDecimal sporadicOrderTimes;
+
+    /**
+     * 分派状态(DISPATCH_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="分派状态",required=false)
+    private BigDecimal dispatchStatus;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -188,6 +200,22 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
         this.sporadicOrderNo = sporadicOrderNo == null ? null : sporadicOrderNo.trim();
     }
 
+    public BigDecimal getSporadicOrderTimes() {
+        return sporadicOrderTimes;
+    }
+
+    public void setSporadicOrderTimes(BigDecimal sporadicOrderTimes) {
+        this.sporadicOrderTimes = sporadicOrderTimes;
+    }
+
+    public BigDecimal getDispatchStatus() {
+        return dispatchStatus;
+    }
+
+    public void setDispatchStatus(BigDecimal dispatchStatus) {
+        this.dispatchStatus = dispatchStatus;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -206,6 +234,8 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
         sb.append(", deleted=").append(deleted);
         sb.append(", issueStatus=").append(issueStatus);
         sb.append(", sporadicOrderNo=").append(sporadicOrderNo);
+        sb.append(", sporadicOrderTimes=").append(sporadicOrderTimes);
+        sb.append(", dispatchStatus=").append(dispatchStatus);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.AmstruckSporadicMaterial;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * AmstruckSporadicMaterial服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-04 08:32
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-04
+ * 作者：generator
+ * 参考：
+ * 描述：AmstruckSporadicMaterial服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IAmstruckSporadicMaterialService extends IBaseService<AmstruckSporadicMaterial, BigDecimal>{
+
+}

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

@@ -27,6 +27,11 @@ public interface IAmstruckSporadicOrderService {
     // 逻辑删除零星物资订单
     int deleteSporadicOrders(Integer sporadicOrderId);
 
+    //新增零星订单一车多趟
+    int addSporadicOrdersForCoke(Map<String,Object> map);
+    // 添加零星物资
+    int addSporadicOrder(Map<String,Object> map);
+
     // 查询零星物资订单列表
     List<Map<String, Object>> getSporadicOrdersList(Map<String, Object> mapValue);
 
@@ -38,4 +43,7 @@ public interface IAmstruckSporadicOrderService {
 
     // 查询修改渲染
     List<Map<String, Object>> selectSporadicOrder(Integer sporadicOrderId);
+
+    //一车多趟运输顶单排车
+    int addSporadicOrderforTimes(Map<String,Object> map);
 }

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

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.AmstruckSporadicMaterial;
+import com.steerinfo.dil.mapper.AmstruckSporadicMaterialMapper;
+import com.steerinfo.dil.service.IAmstruckSporadicMaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * AmstruckSporadicMaterial服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-04 08:32
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-04
+ * 作者：generator
+ * 参考：
+ * 描述：AmstruckSporadicMaterial服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "amstruckSporadicMaterialService")
+public class AmstruckSporadicMaterialServiceImpl extends BaseServiceImpl<AmstruckSporadicMaterial, BigDecimal> implements IAmstruckSporadicMaterialService {
+
+    @Autowired
+    private AmstruckSporadicMaterialMapper amstruckSporadicMaterialMapper;
+
+    @Override
+    protected IBaseMapper<AmstruckSporadicMaterial, BigDecimal> getMapper() {
+        return amstruckSporadicMaterialMapper;
+    }
+}

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

@@ -1,14 +1,8 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
-import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
-import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-import com.steerinfo.dil.model.TmstruckTotalResult;
+import com.steerinfo.dil.mapper.*;
+import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.dil.model.AmstruckSporadicOrder;
-import com.steerinfo.dil.mapper.AmstruckSporadicOrderMapper;
 import com.steerinfo.dil.service.IAmstruckSporadicOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +37,8 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
     OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
     @Autowired
     TmstruckTotalResultMapper tmstruckTotalResultMapper;
+    @Autowired
+    AmstruckSporadicMaterialMapper amstruckSporadicMaterialMapper;
 
     /**
      * 新增零星物资进出厂（以及销售钢材退货）
@@ -51,16 +47,14 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
      * mapvalue所需值：number(趟次)，supplierId(发货单位)，receiveId（收货单位），carrierId(承运商)，
      * orderType（订单类型）,lineId(运输路径),materialId(物资），orderMaterialNumber（物资件数）
      * materialPriority(装货优先级)
-     * orderType:15 内转精煤
+     * orderType:15 内转其他物资进厂需要趟次 16
+     * 内转其他物资出厂需要趟次
      * modifier：zx
      */
     @Transactional
     @Override
     public int addSporadicOrders(Map<String, Object> mapValue) {
-        int result = 0;
-        //获取趟次
-        Integer number = (Integer) mapValue.get("number");
-        for (int n = 1; n <= number; n++) {
+            int result = 0;
             // 新增零星订单表
             // 发货单位
             BigDecimal sendUnit = new BigDecimal((Integer) mapValue.get("supplierId"));
@@ -70,21 +64,24 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             BigDecimal carrierId = new BigDecimal((Integer) mapValue.get("carrierId"));
             // 得到订单类型
             BigDecimal orderType = new BigDecimal((Integer) mapValue.get("orderType"));
+
             // 得到运输路径
             BigDecimal lineId = new BigDecimal((Integer) mapValue.get("lineId"));
+            // 获取主键id
             BigDecimal sporadicOrderId = amstruckSporadicOrderMapper.selectSporadicOrderId();
             AmstruckSporadicOrder amstruckSporadicOrder = new AmstruckSporadicOrder();
-            //设置零星物流主键
+            // 设置零星物流主键
             amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
-            //设置零星物流编号
+
+            // 设置零星物流编号
             amstruckSporadicOrder.setSporadicOrderNo(DataChange.generateEightDigitsNumber("WLXDD", sporadicOrderId.intValue()));
-            //设置发货单位
+            // 设置发货单位
             amstruckSporadicOrder.setSendUnitId(sendUnit);
-            //设置收货单位
+            // 设置收货单位
             amstruckSporadicOrder.setReceiveUnitId(receiveUnitId);
-            //设置承运商
+            // 设置承运商
             amstruckSporadicOrder.setCarrierId(carrierId);
-            //设置下发状态
+            // 设置下发状态
             amstruckSporadicOrder.setIssueStatus(new BigDecimal(0));
             amstruckSporadicOrder.setInsertTime(new Date());
             amstruckSporadicOrder.setInsertUsername("admin");
@@ -102,11 +99,11 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             omstruckOrder.setInsertUsername("admin");
             omstruckOrder.setInsertUpdateRemark("无");
             omstruckOrder.setLineId(lineId);
-            //新增总实绩id
+            // 新增总实绩id
             TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
             tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectTmstruckTotalResultId());
             tmstruckTotalResult.setOrderId(omstruckOrder.getOrderId());
-            //新增总实绩
+            // 新增总实绩
             result += tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
             result += amstruckSporadicOrderMapper.insertSelective(amstruckSporadicOrder);
             result += omstruckOrderMapper.insertSelective(omstruckOrder);
@@ -119,12 +116,6 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
                 omstruckOrderMaterial.setOrderId(orderId);
                 omstruckOrderMaterial.setMaterialId(materialId);
-                //煤炭添加运力
-                if (orderType.intValue() == 15 || orderType.intValue() == 16) {
-                    BigDecimal capacityId = DataChange.dataToBigDecimal(map.get("capacityId"));
-                    omstruckOrder.setOrderId(orderId);
-                    omstruckOrder.setCapacityId(capacityId);
-                    result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
                     //设置物资装货优先级
                     omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map.get("materialPriority")));
                     omstruckOrderMaterial.setInsertUsername("admin");
@@ -137,111 +128,125 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                     }
                     result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
                 }
-            }
-        }
             return result;
-
         }
 
 
-//    /**
-//     * 新增零星物资出厂煤
-//     * @param map
-//     * @return
-//     * author：zx
-//     */
-//    @Transactional
-//    @Override
-//    public int addSporadicOrdersForCoke(Map<String, Object> map) {
-//        int result = 0;
-//        // 新增零星订单表
-//        // 发货单位
-//        BigDecimal sendUnit = new BigDecimal((Integer) map.get("supplierId"));
-//        // 收货单位
-//        BigDecimal receiveUnitId = new BigDecimal((Integer) map.get("receiveId"));
-//        // 承运商
-//        BigDecimal carrierId = new BigDecimal((Integer) map.get("carrierId"));
-//        // 得到订单类型
-//        BigDecimal orderType = new BigDecimal((Integer) map.get("orderType"));
-//        // 得到运输路径
-//        BigDecimal lineId = new BigDecimal((Integer) map.get("lineId"));
-//        BigDecimal sporadicOrderId = amstruckSporadicOrderMapper.selectSporadicOrderId();
-//        AmstruckSporadicOrder amstruckSporadicOrder = new AmstruckSporadicOrder();
-//        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
-//        amstruckSporadicOrder.setSporadicOrderNo(DataChange.generateEightDigitsNumber("WLXDD", sporadicOrderId.intValue()));
-//        amstruckSporadicOrder.setSendUnitId(sendUnit);
-//        amstruckSporadicOrder.setReceiveUnitId(receiveUnitId);
-//        amstruckSporadicOrder.setCarrierId(carrierId);
-//        amstruckSporadicOrder.setIssueStatus(new BigDecimal(0));
-//        amstruckSporadicOrder.setInsertTime(new Date());
-//        amstruckSporadicOrder.setInsertUsername("admin");
-//        amstruckSporadicOrder.setDeleted(new BigDecimal(0));
-//        amstruckSporadicOrder.setInsertUpdateRemark("无");
-//        List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("mapList");
-//        // 新增运输订单表
-//        OmstruckOrder omstruckOrder = new OmstruckOrder();
-//        BigDecimal orderId = omstruckOrderMapper.selectMaxId();
-//        omstruckOrder.setOrderId(orderId);
-//        omstruckOrder.setOrderPlanId(sporadicOrderId);
-//        //生成运输订单
-//        omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue()));
-//        omstruckOrder.setOrderType(orderType);
-//        omstruckOrder.setInsertTime(new Date());
-//        omstruckOrder.setInsertUsername("admin");
-//        omstruckOrder.setInsertUpdateRemark("无");
-//        omstruckOrder.setLineId(lineId);
-//        //新增总实绩id
-//        TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
-//        tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectTmstruckTotalResultId());
-//        tmstruckTotalResult.setOrderId(omstruckOrder.getOrderId());
-//        //新增总实绩
-//        result += tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
-//        result += amstruckSporadicOrderMapper.insertSelective(amstruckSporadicOrder);
-//        result += omstruckOrderMapper.insertSelective(omstruckOrder);
-//        for (Map<String, Object> map1 : mapList) {
-//            BigDecimal materialId = new BigDecimal((Integer) map1.get("materialId"));
-//            BigDecimal materialWeight = DataChange.dataToBigDecimal(map1.get("orderMaterialWeight"));
-//            BigDecimal materialNumber = DataChange.dataToBigDecimal(map1.get("orderMaterialNumber"));
-//            BigDecimal capacityId=DataChange.dataToBigDecimal(map1.get("capacityId"));
-//            OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
-//            BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
-//            omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
-//            omstruckOrderMaterial.setOrderId(orderId);
-//            omstruckOrderMaterial.setMaterialId(materialId);
-//            //设置物资装货优先级
-//            omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map1.get("materialPriority")));
-//            omstruckOrderMaterial.setInsertUsername("admin");
-//            omstruckOrderMaterial.setInsertTime(new Date());
-//            omstruckOrder.setOrderId(orderId);
-//            //新增运力
-//            omstruckOrder.setCapacityId(capacityId);
-//            omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-//            if (materialWeight != null) {
-//                omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
-//            }
-//            if (materialNumber != null) {
-//                omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
-//            }
-//            result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
-//        }
-//
-//            return result;
-//    }
+    /**
+     * 新增零星物资一车多趟
+     * @param map
+     * @return
+     * author：zx
+     */
+    @Transactional
+    @Override
+    public int addSporadicOrdersForCoke(Map<String, Object> map) {
+        int result = 0;
+        // 新增零星订单表
+        // 发货单位
+        BigDecimal sendUnit = new BigDecimal((Integer) map.get("supplierId"));
+        // 收货单位
+        BigDecimal receiveUnitId = new BigDecimal((Integer) map.get("receiveId"));
+        // 承运商
+        BigDecimal carrierId = new BigDecimal((Integer) map.get("carrierId"));
+        // 得到订单类型
+        BigDecimal orderType = new BigDecimal((Integer) map.get("orderType"));
+        // 得到运输路径
+        BigDecimal lineId = new BigDecimal((Integer) map.get("lineId"));
+        BigDecimal sporadicOrderId = amstruckSporadicOrderMapper.selectSporadicOrderId();
+        AmstruckSporadicOrder amstruckSporadicOrder = new AmstruckSporadicOrder();
+        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
+        amstruckSporadicOrder.setSporadicOrderNo(DataChange.generateEightDigitsNumber("WLXDD", sporadicOrderId.intValue()));
+        amstruckSporadicOrder.setSendUnitId(sendUnit);
+        amstruckSporadicOrder.setReceiveUnitId(receiveUnitId);
+        // 设置趟次
+        BigDecimal orderTime=DataChange.dataToBigDecimal(map.get("orderTime"));
+        if (orderTime!=null) {
+            amstruckSporadicOrder.setSporadicOrderTimes(DataChange.dataToBigDecimal(orderTime));
+        }
+        amstruckSporadicOrder.setCarrierId(carrierId);
+        amstruckSporadicOrder.setIssueStatus(new BigDecimal(0));
+        amstruckSporadicOrder.setInsertTime(new Date());
+        amstruckSporadicOrder.setInsertUsername("admin");
+        amstruckSporadicOrder.setDeleted(new BigDecimal(0));
+        amstruckSporadicOrder.setInsertUpdateRemark("无");
+        amstruckSporadicOrder.setDispatchStatus(new BigDecimal(0));
+        List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("mapList");
+        // 新增运输订单表
+        OmstruckOrder omstruckOrder = new OmstruckOrder();
+        BigDecimal orderId = omstruckOrderMapper.selectMaxId();
+        omstruckOrder.setOrderId(orderId);
+        omstruckOrder.setOrderPlanId(sporadicOrderId);
+        //生成运输订单
+        omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue()));
+        omstruckOrder.setOrderType(orderType);
+        omstruckOrder.setInsertTime(new Date());
+        omstruckOrder.setInsertUsername("admin");
+        omstruckOrder.setInsertUpdateRemark("无");
+        omstruckOrder.setLineId(lineId);
+        //新增总实绩id
+        TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
+        tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectTmstruckTotalResultId());
+        tmstruckTotalResult.setOrderId(omstruckOrder.getOrderId());
+        //新增总实绩
+        result += tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
+        result += amstruckSporadicOrderMapper.insertSelective(amstruckSporadicOrder);
+        result += omstruckOrderMapper.insertSelective(omstruckOrder);
+        for (Map<String, Object> map1 : mapList) {
+            BigDecimal materialId = new BigDecimal((Integer) map1.get("materialId"));
+            BigDecimal materialWeight = DataChange.dataToBigDecimal(map1.get("orderMaterialWeight"));
+            BigDecimal materialNumber = DataChange.dataToBigDecimal(map1.get("orderMaterialNumber"));
+            OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+            BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+            omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+            omstruckOrderMaterial.setOrderId(orderId);
+            omstruckOrderMaterial.setMaterialId(materialId);
+            //设置物资装货优先级
+            BigDecimal materialPriority=DataChange.dataToBigDecimal(map1.get("materialPriority"));
+            //判断装卸货优先级是否为空
+            if (materialPriority!=null) {
+                omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map1.get("materialPriority")));
+            }else {
+                omstruckOrderMaterial.setMaterialPriority(new BigDecimal(1));
+            }
+            omstruckOrderMaterial.setInsertUsername("admin");
+            omstruckOrderMaterial.setInsertTime(new Date());
+            if (materialWeight != null) {
+                omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
+            }
+            if (materialNumber != null) {
+                omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
+            }
+            result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+            //新增零星订单子表
+            AmstruckSporadicMaterial amstruckSporadicMaterial=new AmstruckSporadicMaterial();
+            amstruckSporadicMaterial.setSporadicOrderMaterialId(amstruckSporadicMaterialMapper.getSporadicMaterial());
+            amstruckSporadicMaterial.setSporadicOrderId(amstruckSporadicOrder.getSporadicOrderId());
+            amstruckSporadicMaterial.setMaterialId(materialId);
+            amstruckSporadicMaterial.setMaterialWeight(DataChange.dataToBigDecimal(materialWeight));
+            amstruckSporadicMaterial.setMaterialNumber(DataChange.dataToBigDecimal(materialNumber));
+            amstruckSporadicMaterial.setInsertTime(new Date());
+            result += amstruckSporadicMaterialMapper.insertSelective(amstruckSporadicMaterial);
+        }
+            return result;
+    }
 
    //添加零星物资
-//    @Override
-//    public int addSporadicOrder(Map<String, Object> map) {
-//        Integer orderType =(Integer) map.get("orderType");
-//        switch (orderType){
-//            case 12:addSporadicOrders(map);
-//                     break;
-//            case 13:addSporadicOrders(map);
-//                     break;
-//            case 15: addSporadicOrdersForCoke(map);
-//                     break;
-//        }
-//        return 1;
-//    }
+    @Override
+    public int addSporadicOrder(Map<String, Object> map) {
+        Integer orderType =(Integer) map.get("orderType");
+        switch (orderType){
+            case 12:addSporadicOrders(map);
+                     break;
+            case 13:addSporadicOrders(map);
+                     break;
+            case 15: addSporadicOrdersForCoke(map);
+                     break;
+            case 16: addSporadicOrdersForCoke(map);
+                    break;
+        }
+        return 1;
+    }
 
     /**
      * 下发零星物资订单
@@ -287,21 +292,42 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
      */
     @Override
     public List<Map<String, Object>> getSporadicOrdersList(Map<String, Object> mapValue) {
-        List<Map<String,Object>> mapList = amstruckSporadicOrderMapper.getSporadicOrdersList(mapValue);
-        for (Map<String, Object> map : mapList) {
-            BigDecimal type = (BigDecimal) map.get("type");
-            String orderType = "";
-            if (type.intValue() == 12) {
-                orderType += "零星物资进厂";
-            }
-            if (type.intValue() == 13) {
-                orderType += "零星物资出厂";
-            }
-            map.put("orderType",orderType);
+        Integer orderType1 = (Integer) mapValue.get("orderType");
+        List<Map<String, Object>> mapList=null;
+        switch (orderType1) {
+            case 12:
+                mapList = amstruckSporadicOrderMapper.getSporadicOrdersList(mapValue);
+                for (Map<String, Object> map : mapList) {
+                    BigDecimal type = (BigDecimal) map.get("type");
+                    String orderType = "";
+                    if (type.intValue() == 12) {
+                        orderType += "零星物资进厂";
+                    }
+                    if (type.intValue() == 13) {
+                        orderType += "零星物资出厂";
+                    }
+                    map.put("orderType", orderType);
+                }
+                break;
+            case 15:
+               mapList = amstruckSporadicOrderMapper.getSporadicOrdersList1(mapValue);
+                for (Map<String, Object> map1 : mapList) {
+                    BigDecimal type = (BigDecimal) map1.get("type");
+                    String orderType = "";
+                    if (type.intValue() == 15) {
+                        orderType += "零星物资一车多趟进厂";
+                    }
+                    if (type.intValue() == 16) {
+                        orderType += "零星物资一车多趟出厂";
+                    }
+                    map1.put("orderType", orderType);
+                }
+                break;
         }
         return mapList;
     }
 
+
     /**
      * 查询物资详情
      * @param mapValue
@@ -344,4 +370,57 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         List<Map<String, Object>> mapList = amstruckSporadicOrderMapper.selectSporadicOrder(new BigDecimal(sporadicOrderId));
         return mapList;
     }
+    //一车多趟
+    @Override
+    public int addSporadicOrderforTimes(Map<String, Object> map) {
+        int result=0;
+        List<Map<String,Object>> maps= (List<Map<String, Object>>) map.get("mapList");
+            for (Map<String,Object> map1:maps){
+                Integer orderId =(Integer) map.get("orderId");
+                Integer sporadicOrderId =(Integer) map.get("sporadicOrderId");
+                AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+                amstruckSporadicOrder.setSporadicOrderId(DataChange.dataToBigDecimal(sporadicOrderId));
+                amstruckSporadicOrder.setDispatchStatus(new BigDecimal(1));
+                amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+                //根据运输订单id查找订单信息
+                Map<String, Object> map2 = amstruckSporadicOrderMapper.selectOrderInfo(orderId);
+                //生成新的订单
+                OmstruckOrder omstruckOrder=new OmstruckOrder();
+                BigDecimal orderId1 = omstruckOrderMapper.selectMaxId();
+                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.setLineId(DataChange.dataToBigDecimal(map2.get("lineId")));
+                omstruckOrder.setOrderType(DataChange.dataToBigDecimal(map2.get("orderType")));
+                result += omstruckOrderMapper.insertSelective(omstruckOrder);
+                //新增总实绩id
+                TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
+                tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectTmstruckTotalResultId());
+                tmstruckTotalResult.setOrderId(omstruckOrder.getOrderId());
+                tmstruckTotalResult.setInsertTime(new Date());
+                result+=tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
+                //新增订单子表
+                OmstruckOrderMaterial omstruckOrderMaterial=new OmstruckOrderMaterial();
+                omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
+                omstruckOrderMaterial.setOrderId(omstruckOrder.getOrderId());
+                omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map2.get("materialId")));
+                omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map2.get("materialNumber")));
+                omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map2.get("materialWeight")));
+                omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map2.get("materialPriority")));
+                omstruckOrderMaterial.setInsertTime(new Date());
+                omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+                   //设置运力id
+                Integer capacityId = (Integer) map1.get("capacityId");
+                omstruckOrder.setOrderId(orderId1);
+                omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityId));
+                //自动下发
+                omstruckOrder.setOrderStatus(new BigDecimal(4));
+                omstruckOrder.setOrderIssueTime(new Date());
+                omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            }
+
+        return result;
+    }
 }

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-ams-api-dev

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-ams-api-dev

src/main/resources/bootstrap.yml

@@ -19,7 +19,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.108:8088}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
 

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

@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.AmstruckSporadicMaterialMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmstruckSporadicMaterial">
+    <id column="SPORADIC_ORDER_MATERIAL_ID" jdbcType="DECIMAL" property="sporadicOrderMaterialId" />
+    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+    <result column="MATERIAL_WEIGHT" jdbcType="DECIMAL" property="materialWeight" />
+    <result column="MATERIAL_NUMBER" jdbcType="DECIMAL" property="materialNumber" />
+    <result column="SPORADIC_ORDER_ID" jdbcType="DECIMAL" property="sporadicOrderId" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+  </resultMap>
+  <sql id="columns">
+    SPORADIC_ORDER_MATERIAL_ID, MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_NUMBER, SPORADIC_ORDER_ID, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+    DELETED
+  </sql>
+  <sql id="columns_alias">
+    t.SPORADIC_ORDER_MATERIAL_ID, t.MATERIAL_ID, t.MATERIAL_WEIGHT, t.MATERIAL_NUMBER, 
+    t.SPORADIC_ORDER_ID, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
+    t.INSERT_UPDATE_REMARK, t.DELETED
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM AMSTRUCK_SPORADIC_MATERIAL
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM AMSTRUCK_SPORADIC_MATERIAL t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="sporadicOrderMaterialId != null">
+        and SPORADIC_ORDER_MATERIAL_ID = #{sporadicOrderMaterialId}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="materialWeight != null">
+        and MATERIAL_WEIGHT = #{materialWeight}
+      </if>
+      <if test="materialNumber != null">
+        and MATERIAL_NUMBER = #{materialNumber}
+      </if>
+      <if test="sporadicOrderId != null">
+        and SPORADIC_ORDER_ID = #{sporadicOrderId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="sporadicOrderMaterialId != null">
+        and SPORADIC_ORDER_MATERIAL_ID = #{sporadicOrderMaterialId}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="materialWeight != null">
+        and MATERIAL_WEIGHT = #{materialWeight}
+      </if>
+      <if test="materialNumber != null">
+        and MATERIAL_NUMBER = #{materialNumber}
+      </if>
+      <if test="sporadicOrderId != null">
+        and SPORADIC_ORDER_ID = #{sporadicOrderId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from AMSTRUCK_SPORADIC_MATERIAL
+    where SPORADIC_ORDER_MATERIAL_ID = #{sporadicOrderMaterialId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from AMSTRUCK_SPORADIC_MATERIAL
+    where 1!=1 
+      <if test="materialId != null">
+        or MATERIAL_ID = #{materialId}
+      </if>
+      <if test="materialWeight != null">
+        or MATERIAL_WEIGHT = #{materialWeight}
+      </if>
+      <if test="materialNumber != null">
+        or MATERIAL_NUMBER = #{materialNumber}
+      </if>
+      <if test="sporadicOrderId != null">
+        or SPORADIC_ORDER_ID = #{sporadicOrderId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckSporadicMaterial">
+    insert into AMSTRUCK_SPORADIC_MATERIAL (SPORADIC_ORDER_MATERIAL_ID, MATERIAL_ID, 
+      MATERIAL_WEIGHT, MATERIAL_NUMBER, SPORADIC_ORDER_ID, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+      )
+    values (#{sporadicOrderMaterialId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, 
+      #{materialWeight,jdbcType=DECIMAL}, #{materialNumber,jdbcType=DECIMAL}, #{sporadicOrderId,jdbcType=DECIMAL}, 
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckSporadicMaterial">
+    insert into AMSTRUCK_SPORADIC_MATERIAL
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="sporadicOrderMaterialId != null">
+        SPORADIC_ORDER_MATERIAL_ID,
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID,
+      </if>
+      <if test="materialWeight != null">
+        MATERIAL_WEIGHT,
+      </if>
+      <if test="materialNumber != null">
+        MATERIAL_NUMBER,
+      </if>
+      <if test="sporadicOrderId != null">
+        SPORADIC_ORDER_ID,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="sporadicOrderMaterialId != null">
+        #{sporadicOrderMaterialId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialId != null">
+        #{materialId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialWeight != null">
+        #{materialWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="materialNumber != null">
+        #{materialNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="sporadicOrderId != null">
+        #{sporadicOrderId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckSporadicMaterial">
+    update AMSTRUCK_SPORADIC_MATERIAL
+    set MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      MATERIAL_WEIGHT = #{materialWeight,jdbcType=DECIMAL},
+      MATERIAL_NUMBER = #{materialNumber,jdbcType=DECIMAL},
+      SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL}
+    where SPORADIC_ORDER_MATERIAL_ID = #{sporadicOrderMaterialId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckSporadicMaterial">
+    update AMSTRUCK_SPORADIC_MATERIAL
+    <set>
+      <if test="materialId != null">
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialWeight != null">
+        MATERIAL_WEIGHT = #{materialWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="materialNumber != null">
+        MATERIAL_NUMBER = #{materialNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="sporadicOrderId != null">
+        SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where SPORADIC_ORDER_MATERIAL_ID = #{sporadicOrderMaterialId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where SPORADIC_ORDER_MATERIAL_ID = #{sporadicOrderMaterialId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMSTRUCK_SPORADIC_MATERIAL 
+      (SPORADIC_ORDER_MATERIAL_ID, 
+      MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_NUMBER, 
+      SPORADIC_ORDER_ID, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.sporadicOrderMaterialId,jdbcType=DECIMAL}, 
+      #{item.materialId,jdbcType=DECIMAL}, #{item.materialWeight,jdbcType=DECIMAL}, #{item.materialNumber,jdbcType=DECIMAL}, 
+      #{item.sporadicOrderId,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update AMSTRUCK_SPORADIC_MATERIAL
+     set
+       SPORADIC_ORDER_MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.sporadicOrderMaterialId,jdbcType=DECIMAL}
+       </foreach>
+       ,MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+       </foreach>
+       ,MATERIAL_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.materialWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,MATERIAL_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.materialNumber,jdbcType=DECIMAL}
+       </foreach>
+       ,SPORADIC_ORDER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.sporadicOrderId,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.sporadicOrderMaterialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+     where SPORADIC_ORDER_MATERIAL_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.sporadicOrderMaterialId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from AMSTRUCK_SPORADIC_MATERIAL
+    where SPORADIC_ORDER_MATERIAL_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

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

@@ -2,37 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.AmstruckSporadicOrderMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmstruckSporadicOrder">
-        <id column="SPORADIC_ORDER_ID" jdbcType="DECIMAL" property="sporadicOrderId"/>
-        <result column="SEND_UNIT_ID" jdbcType="DECIMAL" property="sendUnitId"/>
-        <result column="RECEIVE_UNIT_ID" jdbcType="DECIMAL" property="receiveUnitId"/>
-        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId"/>
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
-        <result column="ISSUE_STATUS" jdbcType="DECIMAL" property="issueStatus"/>
-        <result column="SPORADIC_ORDER_NO" jdbcType="VARCHAR" property="sporadicOrderNo"/>
+        <id column="SPORADIC_ORDER_ID" jdbcType="DECIMAL" property="sporadicOrderId" />
+        <result column="SEND_UNIT_ID" jdbcType="DECIMAL" property="sendUnitId" />
+        <result column="RECEIVE_UNIT_ID" jdbcType="DECIMAL" property="receiveUnitId" />
+        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="ISSUE_STATUS" jdbcType="DECIMAL" property="issueStatus" />
+        <result column="SPORADIC_ORDER_NO" jdbcType="VARCHAR" property="sporadicOrderNo" />
+        <result column="SPORADIC_ORDER_TIMES" jdbcType="DECIMAL" property="sporadicOrderTimes" />
+        <result column="DISPATCH_STATUS" jdbcType="DECIMAL" property="dispatchStatus" />
     </resultMap>
     <sql id="columns">
         SPORADIC_ORDER_ID, SEND_UNIT_ID, RECEIVE_UNIT_ID, CARRIER_ID, INSERT_USERNAME, INSERT_TIME,
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ISSUE_STATUS, SPORADIC_ORDER_NO
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ISSUE_STATUS, SPORADIC_ORDER_NO,
+    SPORADIC_ORDER_TIMES, DISPATCH_STATUS
     </sql>
     <sql id="columns_alias">
         t.SPORADIC_ORDER_ID, t.SEND_UNIT_ID, t.RECEIVE_UNIT_ID, t.CARRIER_ID, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.ISSUE_STATUS, t.SPORADIC_ORDER_NO
+    t.ISSUE_STATUS, t.SPORADIC_ORDER_NO, t.SPORADIC_ORDER_TIMES, t.DISPATCH_STATUS
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM AMSTRUCK_SPORADIC_ORDER
+        SELECT <include refid="columns" /> FROM AMSTRUCK_SPORADIC_ORDER
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM AMSTRUCK_SPORADIC_ORDER t
+        SELECT <include refid="columns_alias" /> FROM AMSTRUCK_SPORADIC_ORDER t
     </sql>
     <sql id="where">
         <where>
@@ -72,6 +71,12 @@
             <if test="sporadicOrderNo != null and sporadicOrderNo != ''">
                 and SPORADIC_ORDER_NO = #{sporadicOrderNo}
             </if>
+            <if test="sporadicOrderTimes != null">
+                and SPORADIC_ORDER_TIMES = #{sporadicOrderTimes}
+            </if>
+            <if test="dispatchStatus != null">
+                and DISPATCH_STATUS = #{dispatchStatus}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -112,11 +117,16 @@
             <if test="sporadicOrderNo != null and sporadicOrderNo != ''">
                 and SPORADIC_ORDER_NO LIKE '%${sporadicOrderNo}%'
             </if>
+            <if test="sporadicOrderTimes != null">
+                and SPORADIC_ORDER_TIMES = #{sporadicOrderTimes}
+            </if>
+            <if test="dispatchStatus != null">
+                and DISPATCH_STATUS = #{dispatchStatus}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from AMSTRUCK_SPORADIC_ORDER
+        delete from AMSTRUCK_SPORADIC_ORDER
         where SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -155,17 +165,24 @@
         <if test="sporadicOrderNo != null and sporadicOrderNo != ''">
             or SPORADIC_ORDER_NO = #{sporadicOrderNo}
         </if>
+        <if test="sporadicOrderTimes != null">
+            or SPORADIC_ORDER_TIMES = #{sporadicOrderTimes}
+        </if>
+        <if test="dispatchStatus != null">
+            or DISPATCH_STATUS = #{dispatchStatus}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
         insert into AMSTRUCK_SPORADIC_ORDER (SPORADIC_ORDER_ID, SEND_UNIT_ID, RECEIVE_UNIT_ID,
                                              CARRIER_ID, INSERT_USERNAME, INSERT_TIME,
                                              UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-                                             DELETED, ISSUE_STATUS, SPORADIC_ORDER_NO)
+                                             DELETED, ISSUE_STATUS, SPORADIC_ORDER_NO,
+                                             SPORADIC_ORDER_TIMES, DISPATCH_STATUS)
         values (#{sporadicOrderId,jdbcType=DECIMAL}, #{sendUnitId,jdbcType=DECIMAL}, #{receiveUnitId,jdbcType=DECIMAL},
                 #{carrierId,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR},
-                #{deleted,jdbcType=DECIMAL}, #{issueStatus,jdbcType=DECIMAL}, #{sporadicOrderNo,jdbcType=VARCHAR})
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{deleted,jdbcType=DECIMAL}, #{issueStatus,jdbcType=DECIMAL}, #{sporadicOrderNo,jdbcType=VARCHAR},
+                #{sporadicOrderTimes,jdbcType=DECIMAL}, #{dispatchStatus,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
         insert into AMSTRUCK_SPORADIC_ORDER
@@ -206,6 +223,12 @@
             <if test="sporadicOrderNo != null">
                 SPORADIC_ORDER_NO,
             </if>
+            <if test="sporadicOrderTimes != null">
+                SPORADIC_ORDER_TIMES,
+            </if>
+            <if test="dispatchStatus != null">
+                DISPATCH_STATUS,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sporadicOrderId != null">
@@ -244,21 +267,29 @@
             <if test="sporadicOrderNo != null">
                 #{sporadicOrderNo,jdbcType=VARCHAR},
             </if>
+            <if test="sporadicOrderTimes != null">
+                #{sporadicOrderTimes,jdbcType=DECIMAL},
+            </if>
+            <if test="dispatchStatus != null">
+                #{dispatchStatus,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
         update AMSTRUCK_SPORADIC_ORDER
-        set SEND_UNIT_ID         = #{sendUnitId,jdbcType=DECIMAL},
-            RECEIVE_UNIT_ID      = #{receiveUnitId,jdbcType=DECIMAL},
-            CARRIER_ID           = #{carrierId,jdbcType=DECIMAL},
-            INSERT_USERNAME      = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME          = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME      = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME          = #{updateTime,jdbcType=TIMESTAMP},
+        set SEND_UNIT_ID = #{sendUnitId,jdbcType=DECIMAL},
+            RECEIVE_UNIT_ID = #{receiveUnitId,jdbcType=DECIMAL},
+            CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-            DELETED              = #{deleted,jdbcType=DECIMAL},
-            ISSUE_STATUS         = #{issueStatus,jdbcType=DECIMAL},
-            SPORADIC_ORDER_NO    = #{sporadicOrderNo,jdbcType=VARCHAR}
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            ISSUE_STATUS = #{issueStatus,jdbcType=DECIMAL},
+            SPORADIC_ORDER_NO = #{sporadicOrderNo,jdbcType=VARCHAR},
+            SPORADIC_ORDER_TIMES = #{sporadicOrderTimes,jdbcType=DECIMAL},
+            DISPATCH_STATUS = #{dispatchStatus,jdbcType=DECIMAL}
         where SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
@@ -297,20 +328,26 @@
             <if test="sporadicOrderNo != null">
                 SPORADIC_ORDER_NO = #{sporadicOrderNo,jdbcType=VARCHAR},
             </if>
+            <if test="sporadicOrderTimes != null">
+                SPORADIC_ORDER_TIMES = #{sporadicOrderTimes,jdbcType=DECIMAL},
+            </if>
+            <if test="dispatchStatus != null">
+                DISPATCH_STATUS = #{dispatchStatus,jdbcType=DECIMAL},
+            </if>
         </set>
         where SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
+        <include refid="select" />
         where SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
+        <include refid="select" />
+        <include refid="where" />
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
+        <include refid="select" />
+        <include refid="whereLike" />
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into AMSTRUCK_SPORADIC_ORDER
@@ -319,7 +356,9 @@
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETED,
-        ISSUE_STATUS, SPORADIC_ORDER_NO)
+        ISSUE_STATUS, SPORADIC_ORDER_NO,
+        SPORADIC_ORDER_TIMES, DISPATCH_STATUS
+        )
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.sporadicOrderId,jdbcType=DECIMAL},
@@ -327,69 +366,79 @@
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
-        #{item.issueStatus,jdbcType=DECIMAL}, #{item.sporadicOrderNo,jdbcType=VARCHAR} from dual
+        #{item.issueStatus,jdbcType=DECIMAL}, #{item.sporadicOrderNo,jdbcType=VARCHAR},
+        #{item.sporadicOrderTimes,jdbcType=DECIMAL}, #{item.dispatchStatus,jdbcType=DECIMAL}
+        from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update AMSTRUCK_SPORADIC_ORDER
         set
         SPORADIC_ORDER_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.sporadicOrderId,jdbcType=DECIMAL}
         </foreach>
         ,SEND_UNIT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.sendUnitId,jdbcType=DECIMAL}
         </foreach>
         ,RECEIVE_UNIT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.receiveUnitId,jdbcType=DECIMAL}
         </foreach>
         ,CARRIER_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
         ,ISSUE_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.issueStatus,jdbcType=DECIMAL}
         </foreach>
         ,SPORADIC_ORDER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SPORADIC_ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.sporadicOrderNo,jdbcType=VARCHAR}
         </foreach>
+        ,SPORADIC_ORDER_TIMES=
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
+            when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.sporadicOrderTimes,jdbcType=DECIMAL}
+        </foreach>
+        ,DISPATCH_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
+            when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.dispatchStatus,jdbcType=DECIMAL}
+        </foreach>
         where SPORADIC_ORDER_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.sporadicOrderId,jdbcType=DECIMAL}
         </foreach>
     </update>
     <delete id="batchDelete" parameterType="java.util.List">
         delete from AMSTRUCK_SPORADIC_ORDER
         where SPORADIC_ORDER_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -468,6 +517,72 @@
         <include refid="orderBy"></include>
     </select>
 
+
+    <!--   查询一车多趟零星物资 -->
+    <select id="getSporadicOrdersList1" parameterType="java.util.Map" resultType="java.util.Map">
+       select *
+       from(
+        SELECT
+        ASO.SPORADIC_ORDER_ID AS "sporadicOrderId",
+        ASO.SPORADIC_ORDER_NO AS "sporadicOrderNo",
+        RSU.SUPPLIER_NAME AS "supplierName",
+        RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+        RCA.CARRIER_NAME AS "carrierName",
+        ASO.INSERT_TIME AS "insertTime",
+        OO.ORDER_TYPE AS "type",
+        OO.ORDER_ID "orderId",
+        ASO.SPORADIC_ORDER_TIMES "sporadicOrderTimes"
+        FROM AMSTRUCK_SPORADIC_ORDER ASO
+        LEFT JOIN RMS_CONSIGNEE RCO
+        ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
+        LEFT JOIN RMS_SUPPLIER RSU
+        ON ASO.SEND_UNIT_ID = RSU.SUPPLIER_ID
+        LEFT JOIN RMS_CARRIER RCA
+        ON RCA.CARRIER_ID = ASO.CARRIER_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+            WHERE OO.ORDER_TYPE in (15,16)
+            AND ASO.ISSUE_STATUS = #{issueStatus}
+            AND ASO.DELETED = 0
+            <if test="dispatchStatus != null">
+                AND ASO.DISPATCH_STATUS =  #{dispatchStatus}
+            </if>
+            )
+        <where>
+            <if test="sporadicOrderNo != null">
+                and
+                <foreach collection="sporadicOrderNo" item="item" open="(" separator="or" close=")">
+                    "sporadicOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertTime != null">
+                and
+                <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+                    "insertTime" like to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
     <!-- 查询所有物资 -->
     <select id="seeAllMaterials" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
@@ -515,5 +630,21 @@
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         WHERE SPORADIC_ORDER_ID = #{sporadicOrderId}
     </select>
+<!--  根基运输订单id查找运输订单信息  -->
+    <select id="selectOrderInfo" parameterType="java.lang.Integer" resultType="java.util.Map">
+        select OO.ORDER_PLAN_ID "orderPlanId",
+               OO.ORDER_NUMBER "orderNumber",
+               OO.LINE_ID "lineId",
+               OO.ORDER_LINE_SEQUENCE "lineSqe",
+               OOM.MATERIAL_ID "materialId",
+               OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+               OOM.MATERIAL_PRIORITY "materialPriority",
+               OO.ORDER_TYPE "orderType"
+        from OMSTRUCK_ORDER OO
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OO.ORDER_ID=OOM.ORDER_ID
+        where OO.ORDER_ID=#{orderId}
+    </select>
 
 </mapper>