销售订单接口

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -63,7 +63,7 @@ public enum StatusEnum {
     PURCHASE_HIDE("0","隐藏",""),
     PURCHASE_SHOW("1","显示",""),
 
-    //采购计划状态
+    //采购/销售计划状态
     ORDER_REVIEWED("1", "待审核", "reviewed"),
     ORDER_PASSED("3", "已通过", "passed"),
     ORDER_REJECTED("4", "已驳回", "rejected"),

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PurchaseOrderController.java

@@ -44,7 +44,7 @@ public class PurchaseOrderController {
      * @return
      */
     @PostMapping("/api/editStatus")
-    public String editStatus(PurchaseOrder purchaseOrder) {
+    public String editStatus(@RequestBody PurchaseOrder purchaseOrder) {
         return purchaseOrderService.editStatus(purchaseOrder);
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SaleOrderController.java

@@ -1,9 +1,14 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
+import com.yh.saas.plugin.yiliangyiyun.service.ISaleOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.plugins.Page;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
 
 /**
  * <p>
@@ -16,6 +21,85 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/saleOrder")
 public class SaleOrderController {
+    @Autowired
+    private ISaleOrderService saleOrderService;
+
+    /**
+     * 成交
+     * @param saleOrder
+     * @return
+     */
+    @PostMapping("/api/deal")
+    public String deal(@RequestBody SaleOrder saleOrder) {
+        return saleOrderService.deal(saleOrder);
+    }
+    /**
+     * 补充定金/解冻定金/完成/更改基差
+     * @param saleOrder
+     * @return
+     */
+    @PostMapping("/api/editStatus")
+    public String editStatus(@RequestBody SaleOrder saleOrder) {
+        return saleOrderService.editStatus(saleOrder);
+    }
+
+    /**
+     * 平仓
+     * @param saleOrder
+     * @return
+     */
+    @PostMapping("/api/closePosition")
+    public String closePosition(@RequestBody SaleOrder saleOrder) {
+        return saleOrderService.closePosition(saleOrder);
+    }
+
+    /**
+     * 客户点价
+     * @param saleOrder
+     * @return
+     */
+    @PostMapping("/api/pointPrice")
+    public String pointPrice(@RequestBody SaleOrder saleOrder) throws ServiceException, ParseException {
+        return saleOrderService.pointPrice(saleOrder.getId(), saleOrder.getUnitPrice());
+    }
+
+    /**
+     * 销售订单列表
+     * @param saleOrder
+     * @return
+     */
+    @GetMapping("/selectSaleOrder")
+    public Page<SaleOrder> selectSaleOrder(SaleOrder saleOrder) {
+        return saleOrderService.selectSaleOrder(saleOrder);
+    }
+
+    /**
+     * 添加销售订单
+     * @param saleOrder
+     * @return
+     */
+    @PostMapping("/api/insertSaleOrder")
+    public String insertSaleOrder(@RequestBody SaleOrder saleOrder) {
+        return saleOrderService.insertSaleOrder(saleOrder);
+    }
+
+    /**
+     * 删除销售订单
+     * @param saleOrder
+     */
+    @PostMapping("/api/deleteSaleOrder")
+    public void deleteSaleOrder(@RequestBody SaleOrder saleOrder) {
+        saleOrderService.deleteSaleOrder(saleOrder.getId());
+    }
+    /**
+     * 编辑销售订单
+     * @param saleOrder
+     * @return
+     */
+    @PostMapping("/api/editSaleOrder")
+    public String editSaleOrder(@RequestBody SaleOrder saleOrder){
+        return saleOrderService.editSaleOrder(saleOrder);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SaleOrder.java

@@ -1,12 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.util.Date;
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
+import java.util.List;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
@@ -136,13 +136,13 @@ public class SaleOrder extends BaseModel<SaleOrder> {
      */
     private String tradingTarget;
     /**
-     * 卖方
+     * 买方
      */
-    private String seller;
+    private String buyer;
     /**
-     * 卖方电话
+     * 买方电话
      */
-    private String sellerPhone;
+    private String buyerPhone;
     /**
      * 装袋备注
      */
@@ -203,6 +203,57 @@ public class SaleOrder extends BaseModel<SaleOrder> {
      * 审核状态
      */
     private String approveStatus;
+    /**
+     * PC端(传1)
+     */
+    @TableField(exist = false)
+    private String pcFlag;
+    /**
+     * 0 补充定金 1解冻定金 2完成 3更改基差
+     */
+    @TableField(exist = false)
+    private Integer flag;
+    /**
+     * 本次定金
+     */
+    @TableField(exist = false)
+    private Float money;
+
+    /**
+     * 已出库量
+     */
+    @TableField(exist = false)
+    private String stockOutQuantity;
+
+    /**
+     * 已出库量集合
+     */
+    @TableField(exist = false)
+    private List<WarehouseInOutInfo> stockOutQuantityList;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+
+    /**
+     *查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+
+    //改价记录
+    @TableField(exist = false)
+    private List<PriceChangeRecord> priceChangeRecordList;
+    //成交记录
+    @TableField(exist = false)
+    private List<TransactionRecord> transactionRecordList;
+    //平仓记录
+    @TableField(exist = false)
+    private List<TransactionRecord> closePositionList;
+    //客户信息
+    @TableField(exist = false)
+    private CustomerInfo customerInfo;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/SaleOrderMapper.java

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseOrder;
 import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 销售订单 Mapper 接口
@@ -12,5 +16,20 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @since 2021-08-04
  */
 public interface SaleOrderMapper extends BaseMapper<SaleOrder> {
+    /**
+     * 根据条件查询销售订单总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询销售订单列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<SaleOrder> getListByCondition(Map<String, Object> pageView);
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISaleOrderService.java

@@ -1,7 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
+
+import java.text.ParseException;
 
 /**
  * <p>
@@ -12,5 +16,57 @@ import com.baomidou.mybatisplus.service.IService;
  * @since 2021-08-04
  */
 public interface ISaleOrderService extends IService<SaleOrder> {
+    /**
+     * 成交
+     * @param saleOrder
+     * @return
+     */
+    String deal(SaleOrder saleOrder);
+
+    /**
+     * 更改状态
+     * @param saleOrder
+     * @return
+     */
+    String editStatus(SaleOrder saleOrder);
+
+    /**
+     * 平仓
+     * @param saleOrder
+     * @return
+     */
+    String closePosition(SaleOrder saleOrder);
+
+    /**
+     * 客户点价
+     * @param id
+     * @return
+     */
+    String pointPrice(String id,Float unitPrice) throws ParseException, ServiceException;
+
+    /**
+     * 销售订单列表
+     * @param saleOrder
+     * @return
+     */
+    Page<SaleOrder> selectSaleOrder(SaleOrder saleOrder);
+
+    /**
+     * 添加销售订单
+     * @param saleOrder
+     * @return
+     */
+    String insertSaleOrder(SaleOrder saleOrder);
+
+    /**
+     * 删除销售订单
+     * @param id
+     */
+    void deleteSaleOrder(String id);
+    /**
+     * 编辑销售订单
+     * @param saleOrder
+     */
+    String editSaleOrder(SaleOrder saleOrder);
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SaleOrderServiceImpl.java

@@ -1,10 +1,29 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.winsea.svc.base.workflow.entity.Workflow;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
+import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.SaleOrderMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.ISaleOrderService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
+import com.yh.saas.toolkit.workflow.service.IWorkflowService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * <p>
@@ -16,5 +35,356 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder> implements ISaleOrderService {
+    @Autowired
+    private ITransactionRecordService transactionRecordService;
+    @Autowired
+    private ICommonBillOperateHisService billOperateHisService;
+    @Autowired
+    private IPriceChangeRecordService priceChangeRecordService;
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
+    @Autowired
+    private IWorkflowService workflowService;
+    @Autowired
+    private GeTuiUtils geTuiUtils;
+    @Autowired
+    private ICustomerInfoService customerInfoService;
+
+    /**
+     * 成交
+     */
+    @Override
+    public String deal(SaleOrder saleOrder) {
+        //状态改为已成交
+        saleOrder.setStatusFlag(StatusEnum.ORDER_DEALED.getFlag());
+        saleOrder.setStatus(StatusEnum.ORDER_DEALED.getName());
+        //更新销售订单表
+        this.updateById(saleOrder);
+        //向成交记录表插入数据
+        TransactionRecord transactionRecord=new TransactionRecord();
+        transactionRecord.setId(IdGenerator.generateUUID());
+        transactionRecord.setOrderId(saleOrder.getId());
+        transactionRecord.setCompId(saleOrder.getCompId());
+        //标识为0 成交
+        transactionRecord.setRecordFlag("0");
+        transactionRecord.setTransactionPrice(saleOrder.getTransactionPrice());
+        transactionRecord.setBasis(saleOrder.getBasis());
+        transactionRecord.setTurnover(saleOrder.getTransactionsNumber());
+        transactionRecordService.insert(transactionRecord);
+        //向改价记录表插入数据
+        PriceChangeRecord priceChangeRecord=new PriceChangeRecord();
+        priceChangeRecord.setId(IdGenerator.generateUUID());
+        priceChangeRecord.setCompId(saleOrder.getCompId());
+        priceChangeRecord.setOrderId(saleOrder.getId());
+        priceChangeRecord.setPrice(saleOrder.getTransactionPrice());
+        priceChangeRecord.setPriceType("成交价");
+        priceChangeRecordService.insert(priceChangeRecord);
+        geTuiUtils.pushByCid("成交通知","您的合同已成交，成交价："+saleOrder.getTransactionPrice()+"元/吨",saleOrder.getCommonId());
+        return saleOrder.getId();
+    }
+
+    /**
+     * 更改
+     * @param saleOrder
+     * @return
+     */
+    @Override
+    public String editStatus(SaleOrder saleOrder) {
+        //查询销售订单信息
+        SaleOrder saleOrder1=this.selectById(saleOrder.getId());
+        if (saleOrder1 != null) {
+            //0补充定金
+            if (saleOrder.getFlag() == 0) {
+                saleOrder1.setFreezingDeposit(saleOrder1.getFreezingDeposit() + saleOrder.getMoney());
+                saleOrder1.setDefaultDeposit(saleOrder1.getDefaultDeposit() - saleOrder.getMoney());
+                //更改销售订单信息
+                this.updateById(saleOrder1);
+                return "OK";
+            }
+            //1解冻定金
+            else if (saleOrder.getFlag() == 1) {
+                saleOrder1.setFreezingDeposit(0.0f);
+                //更改销售订单信息
+                this.updateById(saleOrder1);
+                return "OK";
+            }
+            //2 完成
+            else if (saleOrder.getFlag() == 2) {
+                saleOrder1.setStatusFlag(StatusEnum.ORDER_COMPLETED.getFlag());
+                saleOrder1.setStatus(StatusEnum.ORDER_COMPLETED.getName());
+                //更改销售订单信息
+                this.updateById(saleOrder1);
+                // 插入操作历史
+                String staffName = this.billOperateHisService.getStaffAndName();
+                // 插入操作历史
+                this.billOperateHisService.saveBillOperateHis(saleOrder1.getId(), NumberConstant.CONSTANT_PURCHASE, staffName, null,
+                        saleOrder1.getStatus(), null, "");
+                return "OK";
+            }
+            //3更改基差
+            else {
+                saleOrder1.setBasis(saleOrder.getBasis());
+                //更改销售订单信息
+                this.updateById(saleOrder1);
+                return "OK";
+            }
+        }
+        return "NG";
+    }
+
+    /**
+     * 平仓
+     * @param saleOrder
+     * @return
+     */
+    @Override
+    public String closePosition(SaleOrder saleOrder) {
+        //修改主表信息
+        boolean one = this.updateById(saleOrder);
+        //向平仓记录表插入数据
+        TransactionRecord transactionRecord=new TransactionRecord();
+        transactionRecord.setId(IdGenerator.generateUUID());
+        transactionRecord.setOrderId(saleOrder.getId());
+        transactionRecord.setCompId(saleOrder.getCompId());
+        //标识为1 平仓
+        transactionRecord.setRecordFlag("1");
+        transactionRecord.setTransactionPrice(saleOrder.getTransactionPrice());
+        transactionRecord.setBasis(saleOrder.getBasis());
+        transactionRecord.setTurnover(saleOrder.getTransactionsNumber());
+        boolean two = transactionRecordService.insert(transactionRecord);
+        geTuiUtils.pushByCid("平仓通知","您的合同：" + saleOrder.getContractNo() + " 平仓成功",saleOrder.getCommonId());
+        if (one && two) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+
+    /**
+     * 客户点价
+     * @param id
+     * @return
+     */
+    @Override
+    public String pointPrice(String id, Float unitPrice) throws ParseException, ServiceException {
+        //查询销售订单信息
+        SaleOrder saleOrder = this.selectById(id);
+        if (saleOrder != null) {
+            String format = "HH:mm:ss";
+            SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+            // 三个不可改价时间（8：00-11：30/12：30-15：00/20：00-23：00）
+            Date startTime = new SimpleDateFormat(format).parse("08:00:00");
+            Date endTime = new SimpleDateFormat(format).parse("11:30:00");
+            Date startTimeNext = new SimpleDateFormat(format).parse("12:30:00");
+            Date endTimeNext = new SimpleDateFormat(format).parse("15:00:00");
+            Date startTimeFinal = new SimpleDateFormat(format).parse("20:00:00");
+            Date endTimeFinal = new SimpleDateFormat(format).parse("23:00:00");
+            Date now = new SimpleDateFormat(format).parse(formatter.format(new Date()));
+            // 定义时间段
+            boolean result = belongCalendar(now, startTime, endTime);
+            boolean resultNext = belongCalendar(now, startTimeNext, endTimeNext);
+            boolean resultFinal = belongCalendar(now, startTimeFinal, endTimeFinal);
+            //判断三个时间段内不可点价
+            if (result || resultNext || resultFinal) {
+                throw new AppServiceException(ExceptionDefinition.POINT_PRICE_TIME_ERROR);
+            }
+            else{
+                saleOrder.setUnitPrice(unitPrice);
+                //更改销售订单信息
+                this.updateById(saleOrder);
+                //向改价记录表插入数据
+                PriceChangeRecord priceChangeRecord = new PriceChangeRecord();
+                priceChangeRecord.setId(IdGenerator.generateUUID());
+                priceChangeRecord.setOrderId(saleOrder.getId());
+                priceChangeRecord.setPrice(unitPrice);
+                priceChangeRecord.setPriceType("点价");
+                priceChangeRecordService.insert(priceChangeRecord);
+                return "OK";
+            }
+        }
+        return "NG";
+    }
+    /**
+     * 判断时间是否在时间段内
+     *
+     * @param nowTime
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    public static boolean belongCalendar(Date nowTime, Date beginTime,
+                                         Date endTime) {
+        Calendar date = Calendar.getInstance();
+        date.setTime(nowTime);
+
+        Calendar begin = Calendar.getInstance();
+        begin.setTime(beginTime);
+
+        Calendar end = Calendar.getInstance();
+        end.setTime(endTime);
+
+        if (date.after(begin) && date.before(end)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 销售订单列表
+     * @param saleOrder
+     * @return
+     */
+    @Override
+    public Page<SaleOrder> selectSaleOrder(SaleOrder saleOrder) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (saleOrder.getCurrentPage() - 1)
+                * saleOrder.getPageSize());
+        //公司id
+        pageView.put("compId", saleOrder.getCompId());
+        pageView.put("commonId", saleOrder.getCommonId());
+        pageView.put("searchKeyWord", saleOrder.getSearchKeyWord());
+        pageView.put("searchType", saleOrder.getSearchType());
+        pageView.put("pcFlag",saleOrder.getPcFlag());
+        pageView.put("pageSize", saleOrder.getPageSize());
+        pageView.put("currentPage", saleOrder.getCurrentPage());
+        // 查询销售订单总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<SaleOrder> dataList = baseMapper.getListByCondition(pageView);
+        if (!CollectionUtils.isEmpty(dataList)) {
+            for (SaleOrder saleOrdera : dataList) {
+                //定义已出库量
+                String stockOutQuantity = "";
+                //查询出库量
+                List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                        .eq("contract_no",saleOrdera.getContractNo())
+                        .eq("in_out_flag","1")
+                        .eq("status_flag","3")
+                        .eq("delete_flag","0"));
+                if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                    for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                        if (StringUtils.isEmpty(stockOutQuantity)) {
+                            stockOutQuantity = "0";
+                        }
+                        stockOutQuantity = String.valueOf(Float.valueOf(stockOutQuantity) + warehouseInOutInfo.getNetWeight());
+                    }
+                }
+                //查询改价记录
+                List<PriceChangeRecord> priceChangeRecordList = priceChangeRecordService.selectList(new EntityWrapper<PriceChangeRecord>()
+                        .eq("order_id",saleOrdera.getId())
+                        .eq("delete_flag","0"));
+                //查询成交记录
+                List<TransactionRecord> transactionRecordList = transactionRecordService.selectList(new EntityWrapper<TransactionRecord>()
+                        .eq("order_id",saleOrdera.getId())
+                        .eq("record_flag","0")
+                        .eq("delete_flag","0"));
+                //查询平仓记录
+                List<TransactionRecord> closePositionList = transactionRecordService.selectList(new EntityWrapper<TransactionRecord>()
+                        .eq("order_id",saleOrdera.getId())
+                        .eq("record_flag","1")
+                        .eq("delete_flag","0"));
+                //查询客户信息
+                Wrapper<CustomerInfo> customerInfoWrapper = new EntityWrapper<>();
+                customerInfoWrapper.andNew().eq("comp_name",saleOrdera.getCustomer()).or()
+                        .eq("customer_name",saleOrdera.getCustomer());
+                customerInfoWrapper.eq("delete_flag","0");
+                CustomerInfo customerInfo=customerInfoService.selectOne(customerInfoWrapper);
+                if (customerInfo!=null){
+                    saleOrdera.setCustomerInfo(customerInfo);
+                }
+                saleOrdera.setStockOutQuantityList(warehouseInOutInfoList);
+                saleOrdera.setTransactionRecordList(transactionRecordList);
+                saleOrdera.setClosePositionList(closePositionList);
+                saleOrdera.setPriceChangeRecordList(priceChangeRecordList);
+                saleOrdera.setStockOutQuantity(stockOutQuantity);
+            }
+        }
+        Page<SaleOrder> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(saleOrder.getCurrentPage());
+        page.setSize(saleOrder.getPageSize());
+        return page;
+    }
+
+    /**
+     * 添加销售订单
+     * @param saleOrder
+     * @return
+     */
+    @Override
+    public String insertSaleOrder(SaleOrder saleOrder) {
+        //新增主键id
+        saleOrder.setId(IdGenerator.generateUUID());
+        // 操作主表数据
+        boolean one = this.insert(saleOrder);
+        boolean isStartWorkflow = StringUtils.isBlank(saleOrder.getWorkflowId());
+        // 不是退回的单子
+        if (isStartWorkflow) {
+            Workflow workflow = workflowService
+                    .findLatestWorkflowByBusinessCode("PURCHASE-ORDER-APPROVE");
+            // 没配置审核流程，直接结束并处理信息
+            if (workflow == null) {
+                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+            }
+            // 开启审核流
+            else {
+                // 设置状态 已提交审核
+                saleOrder.setWorkflowId(workflow.getId());
+                this.updateById(saleOrder);
+                workflowService.startInstance(workflow.getId(), saleOrder.getId());
+            }
+        }
+        // 退回的单子 再启用
+        else {
+            this.updateById(saleOrder);
+            workflowService.activateInstance(saleOrder.getWorkflowId(), saleOrder.getId());
+        }
+        if (one) {
+            return "OK";
+        }else{
+            return "NG";
+        }
+    }
+
+    /**
+     * 删除销售订单
+     * @param id
+     */
+    @Override
+    public void deleteSaleOrder(String id) {
+        //删除销售订单
+        SaleOrder saleOrder = this.selectById(id);
+        this.deleteById(saleOrder.getId());
+        //删除改价记录
+        List<PriceChangeRecord> priceChangeRecordList = priceChangeRecordService.selectList(new EntityWrapper<PriceChangeRecord>()
+                .eq(PriceChangeRecord.QueryFiles.ORDER_ID, id));
+        if (!CollectionUtils.isEmpty(priceChangeRecordList)) {
+            for (PriceChangeRecord priceChangeRecord : priceChangeRecordList) {
+                priceChangeRecordService.deleteById(priceChangeRecord.getId());
+            }
+        }
+        //删除成交记录
+        List<TransactionRecord> transactionRecordList = transactionRecordService.selectList(new EntityWrapper<TransactionRecord>()
+                .eq(TransactionRecord.QueryFiles.ORDER_ID, id));
+        if (!CollectionUtils.isEmpty(transactionRecordList)) {
+            for (TransactionRecord transactionRecord : transactionRecordList) {
+                transactionRecordService.deleteById(transactionRecord.getId());
+            }
+        }
+    }
 
+    /**
+     * 编辑销售订单
+     * @param saleOrder
+     */
+    @Override
+    public String editSaleOrder(SaleOrder saleOrder) {
+        boolean one = this.updateById(saleOrder);
+        if (one) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SaleOrderMapper.xml

@@ -1,5 +1,104 @@
 <?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.yh.saas.plugin.yiliangyiyun.mapper.SaleOrderMapper">
-
+    <!-- 获得销售订单总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(s.id)
+        FROM sale_order s
+        left join sale_plan_info i on s.sale_plan=i.sale_plan_no
+        left join price_change_record c on s.id=c.order_id
+        left join transaction_record t on s.id=t.order_id
+        WHERE
+        s.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND s.status_flag = '1'
+            </if>
+            <if test="searchType == 2">
+                AND s.status_flag = '3'
+                OR s.status_flag = '5'
+            </if>
+            <if test="searchType == 3">
+                AND s.status_flag = '7'
+            </if>
+        </if>
+        <if test="pcFlag != null and pcFlag != ''">
+            <if test="pcFlag == 0">
+                AND s.common_id = #{commonId}
+            </if>
+            <if test="pcFlag == 1">
+                AND s.comp_id = #{compId}
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(s.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(s.customer) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+    <!-- 获得销售订单列表 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder">
+        SELECT
+        s.id,
+        s.contract_no as contractNo,
+        s.procurement_plan as procurementPlan,
+        s.goods_name as goodsName,
+        s.customer,
+        s.unit_price as unitPrice,
+        s.basis,
+        s.freezing_deposit as freezingDeposit,
+        s.default_deposit as defaultDeposit,
+        s.unloading_charge as unloadingCharge,
+        s.invoice_fee as invoiceFee,
+        s.open_position as openPosition,
+        s.closed_position as closedPosition,
+        s.cumulative_turnover as cumulativeTurnover,
+        s.type,
+        s.status,
+        s.update_date as updateDate,
+        i.packing_type as packingType,
+        i.weight,
+        c.price_type as priceType,
+        c.price,
+        t.record_flag as recordfFlag,
+        t.transaction_price as transactionPrice,
+        t.turnover,
+        t.basis,
+        t.deal_date as dealDate
+        FROM sale_order s
+        left join sale_plan_info i on s.sale_plan=i.sale_plan_no
+        left join price_change_record c on s.id=c.order_id
+        left join transaction_record t on s.id=t.order_id
+        WHERE
+        s.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND s.status_flag = '1'
+            </if>
+            <if test="searchType == 2">
+                AND s.status_flag = '3'
+                OR s.status_flag = '5'
+            </if>
+            <if test="searchType == 3">
+                AND s.status_flag = '7'
+            </if>
+        </if>
+        <if test="pcFlag != null and pcFlag != ''">
+            <if test="pcFlag == 0">
+                AND s.common_id = #{commonId}
+            </if>
+            <if test="pcFlag == 1">
+                AND s.comp_id = #{compId}
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(s.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(s.customer) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY s.update_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>