修改销售订单部分

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

@@ -35,18 +35,18 @@ public class AmsPurchaseOrderController extends BaseRESTfulController {
      */
     @ApiModelProperty(value = "采购订单管理对接接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "EASPurchaseId", value = "1", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "purchaseOrderNo", value = "WCGDD2021083000000007", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "materialCode", value = "08010102010300006", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "resultForeignShipName", value = "未来A", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "purchaseOrderBuyer", value = "张三", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "sendUnit", value = "四川美立达矿业有限责任公司", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "purchaseOrganization", value = "四川达州钢铁集团有限责任公司", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "receiveUnit", value = "四川达州钢铁集团有限责任公司", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "purchaseOrderMaterialNumber", value = "200", required = true, dataType = "Double"),
-            @ApiImplicitParam(name = "purchaseOrderDate", value = "2021-10-09 14:10:34", required = true, dataType = "Date"),
-            @ApiImplicitParam(name = "supplierDutyParagraph", value = "SCMLD20211027", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "EASPurchaseId", value = "1", required = true, dataType = "java.util.Integer"),
+            @ApiImplicitParam(name = "purchaseOrderNo", value = "WCGDD2021083000000007", required = true, dataType = "java.lang.String"),
+            @ApiImplicitParam(name = "materialCode", value = "08010102010300006", required = true, dataType = "java.lang.String"),
+            @ApiImplicitParam(name = "resultForeignShipName", value = "未来A", required = true, dataType = "java.lang.String"),
+            @ApiImplicitParam(name = "purchaseOrderBuyer", value = "张三", required = true, dataType = "java.lang.String"),
+            @ApiImplicitParam(name = "sendUnit", value = "四川美立达矿业有限责任公司", required = true, dataType = "java.lang.String"),
+            @ApiImplicitParam(name = "purchaseOrganization", value = "四川达州钢铁集团有限责任公司", required = true, dataType = "java.lang.String"),
+            @ApiImplicitParam(name = "receiveUnit", value = "四川达州钢铁集团有限责任公司", required = true, dataType = "java.lang.String"),
+            @ApiImplicitParam(name = "purchaseOrderMaterialNumber", value = "200", required = true, dataType = "java.util.Double"),
+            @ApiImplicitParam(name = "purchaseOrderDate", value = "2021-10-09 14:10:34", required = true, dataType = "java.util.Date"),
+            @ApiImplicitParam(name = "supplierDutyParagraph", value = "SCMLD20211027", required = true, dataType = "java.lang.String"),
+            @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "java.util.Integer"),
     })
     @PostMapping("/operationPurchaseOrder")
     public RESTfulResult operationPurchaseOrder(@RequestBody Map<String, Object> mapVal) {

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

@@ -2,21 +2,14 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsConsigneeServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,8 +24,6 @@ public class RmsConsigneeController extends BaseRESTfulController {
 
     @Autowired
     RmsConsigneeServiceImpl rmsConsigneeService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
 
     /**
      * 收货客户管理对接接口
@@ -47,32 +38,7 @@ public class RmsConsigneeController extends BaseRESTfulController {
         return success(result);
     }
 
-    /**
-     * 展示收获客户信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @ApiOperation(value="展示收获客户信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getConsigneeList")
-    public RESTfulResult getConsigneeList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer apiId){
-        List<Map<String,Object>> list = rmsConsigneeService.getConsigneeList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsConsigneeService.getConsigneeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
+
 
 
 }

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsMaterialServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -31,8 +30,6 @@ public class RmsMaterialController extends BaseRESTfulController {
 
     @Autowired
     RmsMaterialServiceImpl rmsMaterialService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
 
     /**
      * 物资管理对接接口
@@ -58,32 +55,7 @@ public class RmsMaterialController extends BaseRESTfulController {
         return success(result);
     }
 
-    /**
-     * 展示物资信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @ApiOperation(value="展示物资信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getMaterialList")
-    public RESTfulResult getMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer apiId){
-        List<Map<String,Object>> list = rmsMaterialService.getMaterialList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsMaterialService.getMaterialList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
+
 
 
 }

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsMaterialSteelServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +26,6 @@ public class RmsMaterialSteelController extends BaseRESTfulController {
 
     @Autowired
     RmsMaterialSteelServiceImpl rmsMaterialSteelService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
 
     /**
      * 得到没有质保书的炉号

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

@@ -1,85 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.service.impl.RmsPersonnelServiceImpl;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:HuJianGuo
- * @GreateTime:2021/10/23 17:34
- * @Version:V2.0
- */
-@RestController
-@RequestMapping("/${api.version}/rmspersonnel")
-public class RmsPersonnelController extends BaseRESTfulController {
-
-    @Autowired
-    RmsPersonnelServiceImpl rmsPersonnelService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
-
-    /**
-     * 人员管理对接接口
-     *
-     * @param mapVal
-     * @return
-     */
-    @ApiModelProperty(value = "人员管理对接接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "EASPersonnelId", value = "1", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "personnelJobNumber", value = "20210008", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "personnelName", value = "张三", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "personnelSex", value = "男", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "Integer"),
-    })
-    @PostMapping("/operationPersonnel")
-    public RESTfulResult operationPersonnel(@RequestBody Map<String, Object> mapVal) {
-        int result = rmsPersonnelService.operationPersonnel(mapVal);
-        return success(result);
-    }
-
-    /**
-     * 展示人员信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @ApiOperation(value="展示人员信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "197", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getPersonnelList")
-    public RESTfulResult getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer apiId){
-        List<Map<String,Object>> list = rmsPersonnelService.getPersonnelList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsPersonnelService.getPersonnelList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
-
-
-}

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsSupplierServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -31,8 +30,6 @@ public class RmsSupplierController extends BaseRESTfulController {
 
     @Autowired
     RmsSupplierServiceImpl rmsSupplierService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
 
     /**
      * 供应商管理对接接口
@@ -58,32 +55,7 @@ public class RmsSupplierController extends BaseRESTfulController {
         return success(result);
     }
 
-    /**
-     * 展示供应商信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @ApiOperation(value="展示供应商信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "198", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getSupplierList")
-    public RESTfulResult getSupplierList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId){
-        List<Map<String,Object>> list = rmsSupplierService.getSupplierList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsSupplierService.getSupplierList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
+
 
 
 }

src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java

@@ -1,19 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author zhangnan
- * @Date 2021/6/23 9:58
- * @Version 1.0
- */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
-public interface ColumnDataFeign {
-    @RequestMapping("getColumnData")
-    List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);
-}

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.AmsSaleOrder;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -11,4 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
 public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal> {
     // 得到销售订单信息
     Map<String, Object> getSaleOrderMessage(BigDecimal saleOrderId);
+
+    // 得到销售订单下的所有车序号
+    List<Map<String, Object>> getTruckNo(BigDecimal saleOrderId);
 }

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

@@ -94,12 +94,12 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
             amsPurchaseOrder.setDeleted(new BigDecimal(0));
             result = amsPurchaseOrderMapper.insertSelective(amsPurchaseOrder);
         }
-        if (amsPurchaseOrders.size() != 0 && dataStatus == 2) {
+        if (amsPurchaseOrders.size() != 0 && dataStatus == 1) {
             AmsPurchaseOrder amsPurchaseOrder1 = amsPurchaseOrders.get(0);
             amsPurchaseOrder.setPurchaseOrderId(amsPurchaseOrder1.getPurchaseOrderId());
             result = amsPurchaseOrderMapper.updateByPrimaryKeySelective(amsPurchaseOrder);
         }
-        if (amsPurchaseOrders.size() != 0 && dataStatus == 3) {
+        if (amsPurchaseOrders.size() != 0 && dataStatus == 2) {
             AmsPurchaseOrder amsPurchaseOrder1 = amsPurchaseOrders.get(0);
             amsPurchaseOrder.setPurchaseOrderId(amsPurchaseOrder1.getPurchaseOrderId());
             amsPurchaseOrder.setDeleted(new BigDecimal(1));

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

@@ -1,10 +1,13 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
+import com.steerinfo.dil.model.AmsSaleOrder;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,7 +36,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
      */
     @Override
     public Map<String, Object> getSaleOrder(BigDecimal saleOrderId) {
+        List<Map<String,Object>> truckNoList = amsSaleOrderMapper.getTruckNo(saleOrderId);
         Map<String,Object> mapValue = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
+        mapValue.put("truckNoList",truckNoList);
         return mapValue;
     }
 
@@ -44,14 +49,23 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
      */
     @Override
     public int operationSaleOrder(Map<String, Object> mapVal) {
-        String consigneeCompanyName = (String) mapVal.get("consigneeCompanyName");
-        String materialName = (String) mapVal.get("materialName");
-        String materialSpecification = (String) mapVal.get("materialSpecification");
-        String materialModel = (String) mapVal.get("materialModel");
-        String saleRemark = (String) mapVal.get("saleRemark");
-        Double saleAccountBalanceDouble = (Double) mapVal.get("saleAccountBalance");
-        Double saleCurrentOrderAmountDouble = (Double) mapVal.get("saleCurrentOrderAmount");
-        Double saleHistoricalOrderAmountDouble = (Double) mapVal.get("saleHistoricalOrderAmount");
-        return 0;
+        // 得到销售订单号
+        String saleNumber = (String) mapVal.get("saleNumber");
+        // 得到账户余额
+        Double saleAccountBalance = (Double) mapVal.get("saleAccountBalance");
+        // 得到当前订单金额
+        Double saleCurrentOrderAmount = (Double) mapVal.get("saleCurrentOrderAmount");
+        // 得到历史订单金额
+        Double saleHistoricalOrderAmount = (Double) mapVal.get("saleHistoricalOrderAmount");
+        // 得到主键id
+        Map<String,Object> map = new HashMap<>();
+        map.put("saleNumber",saleNumber);
+        List<AmsSaleOrder> amsSaleOrders = amsSaleOrderMapper.selectByParameters(map);
+        AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
+        amsSaleOrder.setSaleNumber(saleNumber);
+        amsSaleOrder.setSaleAccountBalance(new BigDecimal(saleAccountBalance));
+        amsSaleOrder.setSaleCurrentOrderAmount(new BigDecimal(saleCurrentOrderAmount));
+        amsSaleOrder.setSaleHistoricalOrderAmount(new BigDecimal(saleHistoricalOrderAmount));
+        return amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
     }
 }

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

@@ -46,8 +46,6 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         String consigneeAbbreviation = (String) mapVal.get("consigneeAbbreviation");
         // 得到注册地址
         String consigneeRegisteredAddress = (String) mapVal.get("consigneeRegisteredAddress");
-        // 得到注册时间
-        Date consigneeRegistrationTime = (Date) mapVal.get("consigneeRegistrationTime");
         // 得到联系人
         String consigneeContactName = (String) mapVal.get("consigneeContactName");
         // 得到联系电话
@@ -63,7 +61,6 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         rmsConsignee.setConsigneeCompanyName(consigneeCompanyName);
         rmsConsignee.setConsigneeAbbreviation(consigneeAbbreviation);
         rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);
-        rmsConsignee.setConsigneeRegistrationTime(consigneeRegistrationTime);
         rmsConsignee.setConsigneeContactName(consigneeContactName);
         rmsConsignee.setConsigneeContactTel(consigneeContactTel);
         int result = 0;
@@ -76,13 +73,13 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
             result = rmsConsigneeMapper.insertSelective(rmsConsignee);
         }
         // 修改
-        if (rmsRmsConsignees.size() != 0 && dataStatus == 2) {
+        if (rmsRmsConsignees.size() != 0 && dataStatus == 1) {
             RmsConsignee rmsConsignee1 = rmsRmsConsignees.get(0);
             rmsConsignee.setConsigneeId(rmsConsignee1.getConsigneeId());
             result = rmsConsigneeMapper.updateByPrimaryKeySelective(rmsConsignee);
         }
         // 逻辑删除
-        if (rmsRmsConsignees.size() != 0 && dataStatus == 3) {
+        if (rmsRmsConsignees.size() != 0 && dataStatus == 2) {
             RmsConsignee rmsConsignee1 = rmsRmsConsignees.get(0);
             rmsConsignee.setConsigneeId(rmsConsignee1.getConsigneeId());
             rmsConsignee.setDeleted(new BigDecimal(1));

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

@@ -99,13 +99,13 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
             result = rmsMaterialMapper.insertSelective(rmsMaterial);
         }
         // 修改
-        if (rmsMaterials.size() != 0 && dataStatus == 2){
+        if (rmsMaterials.size() != 0 && dataStatus == 1){
             RmsMaterial rmsMaterial1 = rmsMaterials.get(0);
             rmsMaterial.setMaterialId(rmsMaterial1.getMaterialId());
             result = rmsMaterialMapper.updateByPrimaryKeySelective(rmsMaterial);
         }
         // 逻辑删除
-        if (rmsMaterials.size() != 0 && dataStatus == 3) {
+        if (rmsMaterials.size() != 0 && dataStatus == 2) {
             RmsMaterial rmsMaterial1 = rmsMaterials.get(0);
             rmsMaterial.setMaterialId(rmsMaterial1.getMaterialId());
             rmsMaterial.setDeleted(new BigDecimal(1));

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

@@ -64,13 +64,13 @@ public class RmsPersonnelServiceImpl implements IRmsPersonnelService {
             result = rmsPersonnelMapper.insertSelective(rmsPersonnel);
         }
         // 修改
-        if (rmsPersonnels.size() != 0 && dataStatus == 2) {
+        if (rmsPersonnels.size() != 0 && dataStatus == 1) {
             RmsPersonnel rmsPersonnel1 = rmsPersonnels.get(0);
             rmsPersonnel.setPersonnelId(rmsPersonnel1.getPersonnelId());
             result = rmsPersonnelMapper.updateByPrimaryKeySelective(rmsPersonnel);
         }
         // 逻辑删除
-        if (rmsPersonnels.size() != 0 && dataStatus == 3) {
+        if (rmsPersonnels.size() != 0 && dataStatus == 2) {
             RmsPersonnel rmsPersonnel1 = rmsPersonnels.get(0);
             rmsPersonnel.setPersonnelId(rmsPersonnel1.getPersonnelId());
             rmsPersonnel.setDeleted(new BigDecimal(1));

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

@@ -49,8 +49,6 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
         String supplierDutyParagraph = (String) mapVal.get("supplierDutyParagraph");
         // 得到供应商地址
         String supplierAddress = (String) mapVal.get("supplierAddress");
-        // 得到注册时间
-        Date supplierRegisterDate = (Date) mapVal.get("supplierRegisterDate");
         // 得到联系人
         String supplierContactsName = (String) mapVal.get("supplierAgent");
         // 得到联系电话
@@ -69,7 +67,6 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
         rmsSupplier.setSupplierAbbreviation(supplierAbbreviation);
         rmsSupplier.setSupplierDutyParagraph(supplierDutyParagraph);
         rmsSupplier.setSupplierAddress(supplierAddress);
-        rmsSupplier.setSupplierRegisterDate(supplierRegisterDate);
         rmsSupplier.setSupplierContactsName(supplierContactsName);
         rmsSupplier.setSupplierContactNumber(supplierContactNumber);
         int result = 0;
@@ -81,13 +78,13 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
             result = rmsSupplierMapper.insertSelective(rmsSupplier);
         }
         // 修改
-        if (rmsSuppliers.size() != 0 && dataStatus == 2) {
+        if (rmsSuppliers.size() != 0 && dataStatus == 1) {
             RmsSupplier rmsSupplier1 = rmsSuppliers.get(0);
             rmsSupplier.setSupplierId(rmsSupplier1.getSupplierId());
             result = rmsSupplierMapper.updateByPrimaryKeySelective(rmsSupplier);
         }
         // 逻辑删除
-        if (rmsSuppliers.size() != 0 && dataStatus == 3) {
+        if (rmsSuppliers.size() != 0 && dataStatus == 2) {
             RmsSupplier rmsSupplier1 = rmsSuppliers.get(0);
             rmsSupplier.setSupplierId(rmsSupplier1.getSupplierId());
             rmsSupplier.setDeleted(new BigDecimal(1));

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -1,38 +0,0 @@
-package com.steerinfo.dil.util;
-
-import com.steerinfo.dil.feign.ColumnDataFeign;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-@Component
-public class ColumnDataUtil {
-    @Autowired
-    ColumnDataFeign columnDataFeign;
-
-    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
-        Set<Map<String, Object>> setString = new HashSet<>();
-        for (Map<String, Object> map : list) {//遍历每条数据
-            Map<String, Object> map1 = new HashMap<>();
-            //map.get(name)获取每条数据中对应表头字段的数据
-            map1.put("text", map.get(name));
-            if (map.get(name) != null) {
-                map1.put("value", map.get(name));
-                setString.add(map1);
-            }
-        }
-        return setString;
-    }
-
-    public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
-        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
-        for (Map<String, Object> columnData : columnDataList) {
-            //每个表头字段的过滤条件
-            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
-        }
-        PageListAdd pageList = new PageListAdd(data);
-        pageList.setColumnData(columnDataList);
-        return pageList;
-    }
-}

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: [name]

src/main/resources/application-prod.yml

@@ -1,8 +1,9 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: [name]
+

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:paas-discovery-test.steerinfo.com}:${EUREKA_PORT:80}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -1,623 +1,640 @@
 <?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.AmsSaleOrderMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsSaleOrder">
-    <id column="SALE_ORDER_ID" jdbcType="DECIMAL" property="saleOrderId" />
-    <result column="PLAN_ID" jdbcType="DECIMAL" property="planId" />
-    <result column="SALE_NUMBER" jdbcType="VARCHAR" property="saleNumber" />
-    <result column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId" />
-    <result column="RECEIVE_ID" jdbcType="DECIMAL" property="receiveId" />
-    <result column="SALE_ACCOUNT_BALANCE" jdbcType="DECIMAL" property="saleAccountBalance" />
-    <result column="SALE_CURRENT_ORDER_AMOUNT" jdbcType="DECIMAL" property="saleCurrentOrderAmount" />
-    <result column="SALE_HISTORICAL_ORDER_AMOUNT" jdbcType="DECIMAL" property="saleHistoricalOrderAmount" />
-    <result column="SALE_ORDER_STATUS" jdbcType="DECIMAL" property="saleOrderStatus" />
-    <result column="SALE_ORDER_RECEIVE_CUSTOMER" jdbcType="VARCHAR" property="saleOrderReceiveCustomer" />
-    <result column="SALE_ORDER_ISSELF_MENTION" jdbcType="VARCHAR" property="saleOrderIsselfMention" />
-    <result column="SALE_UNIT_PRICE" jdbcType="DECIMAL" property="saleUnitPrice" />
-    <result column="SALE_ORDER_TAX" jdbcType="VARCHAR" property="saleOrderTax" />
-    <result column="SALE_REMARK" jdbcType="VARCHAR" property="saleRemark" />
-    <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">
-    SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE, 
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsSaleOrder">
+        <id column="SALE_ORDER_ID" jdbcType="DECIMAL" property="saleOrderId"/>
+        <result column="PLAN_ID" jdbcType="DECIMAL" property="planId"/>
+        <result column="SALE_NUMBER" jdbcType="VARCHAR" property="saleNumber"/>
+        <result column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId"/>
+        <result column="RECEIVE_ID" jdbcType="DECIMAL" property="receiveId"/>
+        <result column="SALE_ACCOUNT_BALANCE" jdbcType="DECIMAL" property="saleAccountBalance"/>
+        <result column="SALE_CURRENT_ORDER_AMOUNT" jdbcType="DECIMAL" property="saleCurrentOrderAmount"/>
+        <result column="SALE_HISTORICAL_ORDER_AMOUNT" jdbcType="DECIMAL" property="saleHistoricalOrderAmount"/>
+        <result column="SALE_ORDER_STATUS" jdbcType="DECIMAL" property="saleOrderStatus"/>
+        <result column="SALE_ORDER_RECEIVE_CUSTOMER" jdbcType="VARCHAR" property="saleOrderReceiveCustomer"/>
+        <result column="SALE_ORDER_ISSELF_MENTION" jdbcType="VARCHAR" property="saleOrderIsselfMention"/>
+        <result column="SALE_UNIT_PRICE" jdbcType="DECIMAL" property="saleUnitPrice"/>
+        <result column="SALE_ORDER_TAX" jdbcType="VARCHAR" property="saleOrderTax"/>
+        <result column="SALE_REMARK" jdbcType="VARCHAR" property="saleRemark"/>
+        <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">
+        SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE,
     SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER, 
     SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.RECEIVE_ID, t.SALE_ACCOUNT_BALANCE, 
+    </sql>
+    <sql id="columns_alias">
+        t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.RECEIVE_ID, t.SALE_ACCOUNT_BALANCE,
     t.SALE_CURRENT_ORDER_AMOUNT, t.SALE_HISTORICAL_ORDER_AMOUNT, t.SALE_ORDER_STATUS, 
     t.SALE_ORDER_RECEIVE_CUSTOMER, t.SALE_ORDER_ISSELF_MENTION, t.SALE_UNIT_PRICE, t.SALE_ORDER_TAX, 
     t.SALE_REMARK, 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 AMS_SALE_ORDER
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM AMS_SALE_ORDER t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="saleOrderId != null">
-        and SALE_ORDER_ID = #{saleOrderId}
-      </if>
-      <if test="planId != null">
-        and PLAN_ID = #{planId}
-      </if>
-      <if test="saleNumber != null and saleNumber != ''">
-        and SALE_NUMBER = #{saleNumber}
-      </if>
-      <if test="shipperId != null">
-        and SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="receiveId != null">
-        and RECEIVE_ID = #{receiveId}
-      </if>
-      <if test="saleAccountBalance != null">
-        and SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        and SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount}
-      </if>
-      <if test="saleHistoricalOrderAmount != null">
-        and SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount}
-      </if>
-      <if test="saleOrderStatus != null">
-        and SALE_ORDER_STATUS = #{saleOrderStatus}
-      </if>
-      <if test="saleOrderReceiveCustomer != null and saleOrderReceiveCustomer != ''">
-        and SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer}
-      </if>
-      <if test="saleOrderIsselfMention != null and saleOrderIsselfMention != ''">
-        and SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention}
-      </if>
-      <if test="saleUnitPrice != null">
-        and SALE_UNIT_PRICE = #{saleUnitPrice}
-      </if>
-      <if test="saleOrderTax != null and saleOrderTax != ''">
-        and SALE_ORDER_TAX = #{saleOrderTax}
-      </if>
-      <if test="saleRemark != null and saleRemark != ''">
-        and SALE_REMARK = #{saleRemark}
-      </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="saleOrderId != null">
-        and SALE_ORDER_ID = #{saleOrderId}
-      </if>
-      <if test="planId != null">
-        and PLAN_ID = #{planId}
-      </if>
-      <if test="saleNumber != null and saleNumber != ''">
-        and SALE_NUMBER LIKE '%${saleNumber}%'
-      </if>
-      <if test="shipperId != null">
-        and SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="receiveId != null">
-        and RECEIVE_ID = #{receiveId}
-      </if>
-      <if test="saleAccountBalance != null">
-        and SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        and SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount}
-      </if>
-      <if test="saleHistoricalOrderAmount != null">
-        and SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount}
-      </if>
-      <if test="saleOrderStatus != null">
-        and SALE_ORDER_STATUS = #{saleOrderStatus}
-      </if>
-      <if test="saleOrderReceiveCustomer != null and saleOrderReceiveCustomer != ''">
-        and SALE_ORDER_RECEIVE_CUSTOMER LIKE '%${saleOrderReceiveCustomer}%'
-      </if>
-      <if test="saleOrderIsselfMention != null and saleOrderIsselfMention != ''">
-        and SALE_ORDER_ISSELF_MENTION LIKE '%${saleOrderIsselfMention}%'
-      </if>
-      <if test="saleUnitPrice != null">
-        and SALE_UNIT_PRICE = #{saleUnitPrice}
-      </if>
-      <if test="saleOrderTax != null and saleOrderTax != ''">
-        and SALE_ORDER_TAX LIKE '%${saleOrderTax}%'
-      </if>
-      <if test="saleRemark != null and saleRemark != ''">
-        and SALE_REMARK LIKE '%${saleRemark}%'
-      </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 AMS_SALE_ORDER
-    where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from AMS_SALE_ORDER
-    where 1!=1 
-      <if test="planId != null">
-        or PLAN_ID = #{planId}
-      </if>
-      <if test="saleNumber != null and saleNumber != ''">
-        or SALE_NUMBER = #{saleNumber}
-      </if>
-      <if test="shipperId != null">
-        or SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="receiveId != null">
-        or RECEIVE_ID = #{receiveId}
-      </if>
-      <if test="saleAccountBalance != null">
-        or SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        or SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount}
-      </if>
-      <if test="saleHistoricalOrderAmount != null">
-        or SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount}
-      </if>
-      <if test="saleOrderStatus != null">
-        or SALE_ORDER_STATUS = #{saleOrderStatus}
-      </if>
-      <if test="saleOrderReceiveCustomer != null and saleOrderReceiveCustomer != ''">
-        or SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer}
-      </if>
-      <if test="saleOrderIsselfMention != null and saleOrderIsselfMention != ''">
-        or SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention}
-      </if>
-      <if test="saleUnitPrice != null">
-        or SALE_UNIT_PRICE = #{saleUnitPrice}
-      </if>
-      <if test="saleOrderTax != null and saleOrderTax != ''">
-        or SALE_ORDER_TAX = #{saleOrderTax}
-      </if>
-      <if test="saleRemark != null and saleRemark != ''">
-        or SALE_REMARK = #{saleRemark}
-      </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.AmsSaleOrder">
-    insert into AMS_SALE_ORDER (SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, 
-      SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE, 
-      SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, 
-      SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER, 
-      SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, 
-      SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED)
-    values (#{saleOrderId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{saleNumber,jdbcType=VARCHAR}, 
-      #{shipperId,jdbcType=DECIMAL}, #{receiveId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL}, 
-      #{saleCurrentOrderAmount,jdbcType=DECIMAL}, #{saleHistoricalOrderAmount,jdbcType=DECIMAL}, 
-      #{saleOrderStatus,jdbcType=DECIMAL}, #{saleOrderReceiveCustomer,jdbcType=VARCHAR}, 
-      #{saleOrderIsselfMention,jdbcType=VARCHAR}, #{saleUnitPrice,jdbcType=DECIMAL}, 
-      #{saleOrderTax,jdbcType=VARCHAR}, #{saleRemark,jdbcType=VARCHAR}, #{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.AmsSaleOrder">
-    insert into AMS_SALE_ORDER
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="saleOrderId != null">
-        SALE_ORDER_ID,
-      </if>
-      <if test="planId != null">
-        PLAN_ID,
-      </if>
-      <if test="saleNumber != null">
-        SALE_NUMBER,
-      </if>
-      <if test="shipperId != null">
-        SHIPPER_ID,
-      </if>
-      <if test="receiveId != null">
-        RECEIVE_ID,
-      </if>
-      <if test="saleAccountBalance != null">
-        SALE_ACCOUNT_BALANCE,
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        SALE_CURRENT_ORDER_AMOUNT,
-      </if>
-      <if test="saleHistoricalOrderAmount != null">
-        SALE_HISTORICAL_ORDER_AMOUNT,
-      </if>
-      <if test="saleOrderStatus != null">
-        SALE_ORDER_STATUS,
-      </if>
-      <if test="saleOrderReceiveCustomer != null">
-        SALE_ORDER_RECEIVE_CUSTOMER,
-      </if>
-      <if test="saleOrderIsselfMention != null">
-        SALE_ORDER_ISSELF_MENTION,
-      </if>
-      <if test="saleUnitPrice != null">
-        SALE_UNIT_PRICE,
-      </if>
-      <if test="saleOrderTax != null">
-        SALE_ORDER_TAX,
-      </if>
-      <if test="saleRemark != null">
-        SALE_REMARK,
-      </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="saleOrderId != null">
-        #{saleOrderId,jdbcType=DECIMAL},
-      </if>
-      <if test="planId != null">
-        #{planId,jdbcType=DECIMAL},
-      </if>
-      <if test="saleNumber != null">
-        #{saleNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperId != null">
-        #{shipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="receiveId != null">
-        #{receiveId,jdbcType=DECIMAL},
-      </if>
-      <if test="saleAccountBalance != null">
-        #{saleAccountBalance,jdbcType=DECIMAL},
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        #{saleCurrentOrderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="saleHistoricalOrderAmount != null">
-        #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="saleOrderStatus != null">
-        #{saleOrderStatus,jdbcType=DECIMAL},
-      </if>
-      <if test="saleOrderReceiveCustomer != null">
-        #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
-      </if>
-      <if test="saleOrderIsselfMention != null">
-        #{saleOrderIsselfMention,jdbcType=VARCHAR},
-      </if>
-      <if test="saleUnitPrice != null">
-        #{saleUnitPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="saleOrderTax != null">
-        #{saleOrderTax,jdbcType=VARCHAR},
-      </if>
-      <if test="saleRemark != null">
-        #{saleRemark,jdbcType=VARCHAR},
-      </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.AmsSaleOrder">
-    update AMS_SALE_ORDER
-    set PLAN_ID = #{planId,jdbcType=DECIMAL},
-      SALE_NUMBER = #{saleNumber,jdbcType=VARCHAR},
-      SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-      RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
-      SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
-      SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount,jdbcType=DECIMAL},
-      SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
-      SALE_ORDER_STATUS = #{saleOrderStatus,jdbcType=DECIMAL},
-      SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
-      SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention,jdbcType=VARCHAR},
-      SALE_UNIT_PRICE = #{saleUnitPrice,jdbcType=DECIMAL},
-      SALE_ORDER_TAX = #{saleOrderTax,jdbcType=VARCHAR},
-      SALE_REMARK = #{saleRemark,jdbcType=VARCHAR},
-      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 SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
-    update AMS_SALE_ORDER
-    <set>
-      <if test="planId != null">
-        PLAN_ID = #{planId,jdbcType=DECIMAL},
-      </if>
-      <if test="saleNumber != null">
-        SALE_NUMBER = #{saleNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperId != null">
-        SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="receiveId != null">
-        RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
-      </if>
-      <if test="saleAccountBalance != null">
-        SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="saleHistoricalOrderAmount != null">
-        SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="saleOrderStatus != null">
-        SALE_ORDER_STATUS = #{saleOrderStatus,jdbcType=DECIMAL},
-      </if>
-      <if test="saleOrderReceiveCustomer != null">
-        SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
-      </if>
-      <if test="saleOrderIsselfMention != null">
-        SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention,jdbcType=VARCHAR},
-      </if>
-      <if test="saleUnitPrice != null">
-        SALE_UNIT_PRICE = #{saleUnitPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="saleOrderTax != null">
-        SALE_ORDER_TAX = #{saleOrderTax,jdbcType=VARCHAR},
-      </if>
-      <if test="saleRemark != null">
-        SALE_REMARK = #{saleRemark,jdbcType=VARCHAR},
-      </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 SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where SALE_ORDER_ID = #{saleOrderId,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 AMS_SALE_ORDER 
-      (SALE_ORDER_ID, 
-      PLAN_ID, SALE_NUMBER, SHIPPER_ID, 
-      RECEIVE_ID, SALE_ACCOUNT_BALANCE, 
-      SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, 
-      SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER, 
-      SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, 
-      SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.saleOrderId,jdbcType=DECIMAL}, 
-      #{item.planId,jdbcType=DECIMAL}, #{item.saleNumber,jdbcType=VARCHAR}, #{item.shipperId,jdbcType=DECIMAL}, 
-      #{item.receiveId,jdbcType=DECIMAL}, #{item.saleAccountBalance,jdbcType=DECIMAL}, 
-      #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}, #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL}, 
-      #{item.saleOrderStatus,jdbcType=DECIMAL}, #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR}, 
-      #{item.saleOrderIsselfMention,jdbcType=VARCHAR}, #{item.saleUnitPrice,jdbcType=DECIMAL}, 
-      #{item.saleOrderTax,jdbcType=VARCHAR}, #{item.saleRemark,jdbcType=VARCHAR}, #{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 AMS_SALE_ORDER
-     set
-       SALE_ORDER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderId,jdbcType=DECIMAL}
-       </foreach>
-       ,PLAN_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.planId,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
-       </foreach>
-       ,RECEIVE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.receiveId,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ACCOUNT_BALANCE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleAccountBalance,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_CURRENT_ORDER_AMOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_HISTORICAL_ORDER_AMOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ORDER_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderStatus,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ORDER_RECEIVE_CUSTOMER=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR}
-       </foreach>
-       ,SALE_ORDER_ISSELF_MENTION=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderIsselfMention,jdbcType=VARCHAR}
-       </foreach>
-       ,SALE_UNIT_PRICE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleUnitPrice,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ORDER_TAX=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderTax,jdbcType=VARCHAR}
-       </foreach>
-       ,SALE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where SALE_ORDER_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.saleOrderId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from AMS_SALE_ORDER
-    where SALE_ORDER_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM AMS_SALE_ORDER
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM AMS_SALE_ORDER t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="saleOrderId != null">
+                and SALE_ORDER_ID = #{saleOrderId}
+            </if>
+            <if test="planId != null">
+                and PLAN_ID = #{planId}
+            </if>
+            <if test="saleNumber != null and saleNumber != ''">
+                and SALE_NUMBER = #{saleNumber}
+            </if>
+            <if test="shipperId != null">
+                and SHIPPER_ID = #{shipperId}
+            </if>
+            <if test="receiveId != null">
+                and RECEIVE_ID = #{receiveId}
+            </if>
+            <if test="saleAccountBalance != null">
+                and SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
+            </if>
+            <if test="saleCurrentOrderAmount != null">
+                and SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount}
+            </if>
+            <if test="saleHistoricalOrderAmount != null">
+                and SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount}
+            </if>
+            <if test="saleOrderStatus != null">
+                and SALE_ORDER_STATUS = #{saleOrderStatus}
+            </if>
+            <if test="saleOrderReceiveCustomer != null and saleOrderReceiveCustomer != ''">
+                and SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer}
+            </if>
+            <if test="saleOrderIsselfMention != null and saleOrderIsselfMention != ''">
+                and SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention}
+            </if>
+            <if test="saleUnitPrice != null">
+                and SALE_UNIT_PRICE = #{saleUnitPrice}
+            </if>
+            <if test="saleOrderTax != null and saleOrderTax != ''">
+                and SALE_ORDER_TAX = #{saleOrderTax}
+            </if>
+            <if test="saleRemark != null and saleRemark != ''">
+                and SALE_REMARK = #{saleRemark}
+            </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="saleOrderId != null">
+                and SALE_ORDER_ID = #{saleOrderId}
+            </if>
+            <if test="planId != null">
+                and PLAN_ID = #{planId}
+            </if>
+            <if test="saleNumber != null and saleNumber != ''">
+                and SALE_NUMBER LIKE '%${saleNumber}%'
+            </if>
+            <if test="shipperId != null">
+                and SHIPPER_ID = #{shipperId}
+            </if>
+            <if test="receiveId != null">
+                and RECEIVE_ID = #{receiveId}
+            </if>
+            <if test="saleAccountBalance != null">
+                and SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
+            </if>
+            <if test="saleCurrentOrderAmount != null">
+                and SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount}
+            </if>
+            <if test="saleHistoricalOrderAmount != null">
+                and SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount}
+            </if>
+            <if test="saleOrderStatus != null">
+                and SALE_ORDER_STATUS = #{saleOrderStatus}
+            </if>
+            <if test="saleOrderReceiveCustomer != null and saleOrderReceiveCustomer != ''">
+                and SALE_ORDER_RECEIVE_CUSTOMER LIKE '%${saleOrderReceiveCustomer}%'
+            </if>
+            <if test="saleOrderIsselfMention != null and saleOrderIsselfMention != ''">
+                and SALE_ORDER_ISSELF_MENTION LIKE '%${saleOrderIsselfMention}%'
+            </if>
+            <if test="saleUnitPrice != null">
+                and SALE_UNIT_PRICE = #{saleUnitPrice}
+            </if>
+            <if test="saleOrderTax != null and saleOrderTax != ''">
+                and SALE_ORDER_TAX LIKE '%${saleOrderTax}%'
+            </if>
+            <if test="saleRemark != null and saleRemark != ''">
+                and SALE_REMARK LIKE '%${saleRemark}%'
+            </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 AMS_SALE_ORDER
+        where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from AMS_SALE_ORDER
+        where 1!=1
+        <if test="planId != null">
+            or PLAN_ID = #{planId}
+        </if>
+        <if test="saleNumber != null and saleNumber != ''">
+            or SALE_NUMBER = #{saleNumber}
+        </if>
+        <if test="shipperId != null">
+            or SHIPPER_ID = #{shipperId}
+        </if>
+        <if test="receiveId != null">
+            or RECEIVE_ID = #{receiveId}
+        </if>
+        <if test="saleAccountBalance != null">
+            or SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
+        </if>
+        <if test="saleCurrentOrderAmount != null">
+            or SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount}
+        </if>
+        <if test="saleHistoricalOrderAmount != null">
+            or SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount}
+        </if>
+        <if test="saleOrderStatus != null">
+            or SALE_ORDER_STATUS = #{saleOrderStatus}
+        </if>
+        <if test="saleOrderReceiveCustomer != null and saleOrderReceiveCustomer != ''">
+            or SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer}
+        </if>
+        <if test="saleOrderIsselfMention != null and saleOrderIsselfMention != ''">
+            or SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention}
+        </if>
+        <if test="saleUnitPrice != null">
+            or SALE_UNIT_PRICE = #{saleUnitPrice}
+        </if>
+        <if test="saleOrderTax != null and saleOrderTax != ''">
+            or SALE_ORDER_TAX = #{saleOrderTax}
+        </if>
+        <if test="saleRemark != null and saleRemark != ''">
+            or SALE_REMARK = #{saleRemark}
+        </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.AmsSaleOrder">
+        insert into AMS_SALE_ORDER (SALE_ORDER_ID, PLAN_ID, SALE_NUMBER,
+                                    SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE,
+                                    SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT,
+                                    SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
+                                    SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE,
+                                    SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
+                                    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                    INSERT_UPDATE_REMARK, DELETED)
+        values (#{saleOrderId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{saleNumber,jdbcType=VARCHAR},
+                #{shipperId,jdbcType=DECIMAL}, #{receiveId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL},
+                #{saleCurrentOrderAmount,jdbcType=DECIMAL}, #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
+                #{saleOrderStatus,jdbcType=DECIMAL}, #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
+                #{saleOrderIsselfMention,jdbcType=VARCHAR}, #{saleUnitPrice,jdbcType=DECIMAL},
+                #{saleOrderTax,jdbcType=VARCHAR}, #{saleRemark,jdbcType=VARCHAR}, #{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.AmsSaleOrder">
+        insert into AMS_SALE_ORDER
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="saleOrderId != null">
+                SALE_ORDER_ID,
+            </if>
+            <if test="planId != null">
+                PLAN_ID,
+            </if>
+            <if test="saleNumber != null">
+                SALE_NUMBER,
+            </if>
+            <if test="shipperId != null">
+                SHIPPER_ID,
+            </if>
+            <if test="receiveId != null">
+                RECEIVE_ID,
+            </if>
+            <if test="saleAccountBalance != null">
+                SALE_ACCOUNT_BALANCE,
+            </if>
+            <if test="saleCurrentOrderAmount != null">
+                SALE_CURRENT_ORDER_AMOUNT,
+            </if>
+            <if test="saleHistoricalOrderAmount != null">
+                SALE_HISTORICAL_ORDER_AMOUNT,
+            </if>
+            <if test="saleOrderStatus != null">
+                SALE_ORDER_STATUS,
+            </if>
+            <if test="saleOrderReceiveCustomer != null">
+                SALE_ORDER_RECEIVE_CUSTOMER,
+            </if>
+            <if test="saleOrderIsselfMention != null">
+                SALE_ORDER_ISSELF_MENTION,
+            </if>
+            <if test="saleUnitPrice != null">
+                SALE_UNIT_PRICE,
+            </if>
+            <if test="saleOrderTax != null">
+                SALE_ORDER_TAX,
+            </if>
+            <if test="saleRemark != null">
+                SALE_REMARK,
+            </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="saleOrderId != null">
+                #{saleOrderId,jdbcType=DECIMAL},
+            </if>
+            <if test="planId != null">
+                #{planId,jdbcType=DECIMAL},
+            </if>
+            <if test="saleNumber != null">
+                #{saleNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="shipperId != null">
+                #{shipperId,jdbcType=DECIMAL},
+            </if>
+            <if test="receiveId != null">
+                #{receiveId,jdbcType=DECIMAL},
+            </if>
+            <if test="saleAccountBalance != null">
+                #{saleAccountBalance,jdbcType=DECIMAL},
+            </if>
+            <if test="saleCurrentOrderAmount != null">
+                #{saleCurrentOrderAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="saleHistoricalOrderAmount != null">
+                #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="saleOrderStatus != null">
+                #{saleOrderStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="saleOrderReceiveCustomer != null">
+                #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
+            </if>
+            <if test="saleOrderIsselfMention != null">
+                #{saleOrderIsselfMention,jdbcType=VARCHAR},
+            </if>
+            <if test="saleUnitPrice != null">
+                #{saleUnitPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="saleOrderTax != null">
+                #{saleOrderTax,jdbcType=VARCHAR},
+            </if>
+            <if test="saleRemark != null">
+                #{saleRemark,jdbcType=VARCHAR},
+            </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.AmsSaleOrder">
+        update AMS_SALE_ORDER
+        set PLAN_ID                      = #{planId,jdbcType=DECIMAL},
+            SALE_NUMBER                  = #{saleNumber,jdbcType=VARCHAR},
+            SHIPPER_ID                   = #{shipperId,jdbcType=DECIMAL},
+            RECEIVE_ID                   = #{receiveId,jdbcType=DECIMAL},
+            SALE_ACCOUNT_BALANCE         = #{saleAccountBalance,jdbcType=DECIMAL},
+            SALE_CURRENT_ORDER_AMOUNT    = #{saleCurrentOrderAmount,jdbcType=DECIMAL},
+            SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
+            SALE_ORDER_STATUS            = #{saleOrderStatus,jdbcType=DECIMAL},
+            SALE_ORDER_RECEIVE_CUSTOMER  = #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
+            SALE_ORDER_ISSELF_MENTION    = #{saleOrderIsselfMention,jdbcType=VARCHAR},
+            SALE_UNIT_PRICE              = #{saleUnitPrice,jdbcType=DECIMAL},
+            SALE_ORDER_TAX               = #{saleOrderTax,jdbcType=VARCHAR},
+            SALE_REMARK                  = #{saleRemark,jdbcType=VARCHAR},
+            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 SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
+        update AMS_SALE_ORDER
+        <set>
+            <if test="planId != null">
+                PLAN_ID = #{planId,jdbcType=DECIMAL},
+            </if>
+            <if test="saleNumber != null">
+                SALE_NUMBER = #{saleNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="shipperId != null">
+                SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
+            </if>
+            <if test="receiveId != null">
+                RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
+            </if>
+            <if test="saleAccountBalance != null">
+                SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
+            </if>
+            <if test="saleCurrentOrderAmount != null">
+                SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="saleHistoricalOrderAmount != null">
+                SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="saleOrderStatus != null">
+                SALE_ORDER_STATUS = #{saleOrderStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="saleOrderReceiveCustomer != null">
+                SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
+            </if>
+            <if test="saleOrderIsselfMention != null">
+                SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention,jdbcType=VARCHAR},
+            </if>
+            <if test="saleUnitPrice != null">
+                SALE_UNIT_PRICE = #{saleUnitPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="saleOrderTax != null">
+                SALE_ORDER_TAX = #{saleOrderTax,jdbcType=VARCHAR},
+            </if>
+            <if test="saleRemark != null">
+                SALE_REMARK = #{saleRemark,jdbcType=VARCHAR},
+            </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 SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where SALE_ORDER_ID = #{saleOrderId,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 AMS_SALE_ORDER
+        (SALE_ORDER_ID,
+        PLAN_ID, SALE_NUMBER, SHIPPER_ID,
+        RECEIVE_ID, SALE_ACCOUNT_BALANCE,
+        SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT,
+        SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
+        SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE,
+        SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.saleOrderId,jdbcType=DECIMAL},
+        #{item.planId,jdbcType=DECIMAL}, #{item.saleNumber,jdbcType=VARCHAR}, #{item.shipperId,jdbcType=DECIMAL},
+        #{item.receiveId,jdbcType=DECIMAL}, #{item.saleAccountBalance,jdbcType=DECIMAL},
+        #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}, #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL},
+        #{item.saleOrderStatus,jdbcType=DECIMAL}, #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR},
+        #{item.saleOrderIsselfMention,jdbcType=VARCHAR}, #{item.saleUnitPrice,jdbcType=DECIMAL},
+        #{item.saleOrderTax,jdbcType=VARCHAR}, #{item.saleRemark,jdbcType=VARCHAR},
+        #{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 AMS_SALE_ORDER
+        set
+        SALE_ORDER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderId,jdbcType=DECIMAL}
+        </foreach>
+        ,PLAN_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.planId,jdbcType=DECIMAL}
+        </foreach>
+        ,SALE_NUMBER=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,SHIPPER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
+        </foreach>
+        ,RECEIVE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.receiveId,jdbcType=DECIMAL}
+        </foreach>
+        ,SALE_ACCOUNT_BALANCE=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleAccountBalance,jdbcType=DECIMAL}
+        </foreach>
+        ,SALE_CURRENT_ORDER_AMOUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,SALE_HISTORICAL_ORDER_AMOUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,SALE_ORDER_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,SALE_ORDER_RECEIVE_CUSTOMER=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR}
+        </foreach>
+        ,SALE_ORDER_ISSELF_MENTION=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderIsselfMention,jdbcType=VARCHAR}
+        </foreach>
+        ,SALE_UNIT_PRICE=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleUnitPrice,jdbcType=DECIMAL}
+        </foreach>
+        ,SALE_ORDER_TAX=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderTax,jdbcType=VARCHAR}
+        </foreach>
+        ,SALE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+            when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where SALE_ORDER_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.saleOrderId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from AMS_SALE_ORDER
+        where SALE_ORDER_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-  <!-- 得到销售订单信息 -->
-  <select id="getSaleOrderMessage" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT RC.CONSIGNEE_COMPANY_NAME        AS "consigneeCompanyName",
-           RM.MATERIAL_NAME                 AS "materialName",
-           RM.MATERIAL_SPECIFICATION        AS "materialSpecification",
-           RM.MATERIAL_MODEL                AS "materialModel",
-           ASO.SALE_REMARK                  AS "saleRemark",
-           ASO.SALE_ACCOUNT_BALANCE         AS "saleAccountBalance",
-           ASO.SALE_CURRENT_ORDER_AMOUNT    AS "saleCurrentOrderAmount",
-           ASO.SALE_HISTORICAL_ORDER_AMOUNT AS "saleHistoricalOrderAmount"
-    FROM AMS_SALE_ORDER ASO
-           LEFT JOIN RMS_CONSIGNEE RC
-                     ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
-           LEFT JOIN AMS_SALE_PLAN ASP
-                     ON ASP.PLAN_ID = ASO.PLAN_ID
-           LEFT JOIN RMS_MATERIAL RM
-                     ON ASP.MATERIAL_ID = RM.MATERIAL_ID
-  </select>
+    <!-- 得到销售订单信息 -->
+    <select id="getSaleOrderMessage" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ASO.SALE_NUMBER           AS "saleNumber",
+               RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+               ASO.INSERT_TIME           AS "saleTime",
+               RS.SHIPPER_NAME           AS "shipperName",
+               RM.MATERIAL_CODE          AS "materialCode",
+               RM.MATERIAL_NAME          AS "materialName",
+               RUOM.UNIT_OF_MEASURE_NAME AS "unitOfMeasureName",
+               ASP.PLAN_MATERIAL_NUMBER  AS "planMaterialNumber"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN AMS_SALE_PLAN ASP
+                           ON ASP.PLAN_ID = ASO.PLAN_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON ASP.MATERIAL_ID = RM.MATERIAL_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+                           ON RUOM.UNIT_OF_MEASURE_ID = RM.UNIT_OF_MEASURE_ID
+    </select>
+
+    <!-- 得到订单下的车序号 -->
+    <select id="getTruckNo" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+        WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+    </select>
 </mapper>