#

luxiaotao1123

2021-03-17 b31c69631ee75cdc02195a2e3efff3f9ad95943d

#

 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java

@@ -19,16 +19,14 @@
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.Tag;
import zy.cloud.wms.manager.mapper.CustOrderMapper;
import zy.cloud.wms.manager.mapper.TagMapper;
import zy.cloud.wms.manager.service.*;
import zy.cloud.wms.manager.utils.HttpHandler;
import zy.cloud.wms.manager.utils.NodeUtils;

import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -57,6 +55,8 @@
    private TagService tagService;
    @Autowired
    private TagMapper tagMapper;
    @Autowired
    private CustOrderMapper custOrderMapper;

    /**
     * 商品下载
@@ -202,6 +202,7 @@
            }
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException(e.getMessage());
        }
    }

@@ -264,6 +265,7 @@
            }
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException(e.getMessage());
        }
    }

@@ -335,10 +337,85 @@
            }
        } catch (IOException e) {
            e.printStackTrace();
            throw new RuntimeException(e.getMessage());
        }

    }

    /**
     * 完成销售订单
     */
    @Scheduled(cron = "0/10 * * * * ? ")
    @Transactional
//    @PostConstruct
    public void finishOrdersExecute(){
        try {
            List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 4));
            if (!Cools.isEmpty(custOrders)) {
                List<String> numbers = custOrders.stream().map(CustOrder::getNumber).distinct().collect(Collectors.toList());
                for (String number : numbers) {
                    GetOrderResult0 getOrderResult0 = new GetOrderResult0();
                    List<GetOrderResultDetl0> list = new ArrayList<>();
                    getOrderResult0.setDetail(list);
                    // 遍历递减
                    Iterator<CustOrder> iterator = custOrders.iterator();
                    while (iterator.hasNext()) {
                        CustOrder custOrder = iterator.next();
                        if (custOrder.getNumber().equals(number)) {
                            // 表头
                            if (Cools.isEmpty(getOrderResult0.getNumber())) {
                                getOrderResult0.setNumber(number);
                                getOrderResult0.setVchType(34); // todo:luxiaotao
                                getOrderResult0.setBillDate(custOrder.getBillDate());
                                getOrderResult0.setBTypeID(custOrder.getBTypeId());
                                getOrderResult0.setKTypeID("宏挺仓库");
                            }
                            // 表体
                            GetOrderResultDetl0 detl0 = new GetOrderResultDetl0();
                            detl0.setUserCode(custOrder.getUserCode());
                            detl0.setQty(custOrder.getQty());
                            detl0.setPrice(custOrder.getPrice());
                            detl0.setComment(custOrder.getComment());
                            list.add(detl0);
                            iterator.remove();
                        }
                    }

                    System.out.println(JSON.toJSONString(getOrderResult0));

                    int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
                    if (save > 0) {
                        if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
                            throw new CoolException("删除销售订单失败");
                        }
                    }

//                    String response = new HttpHandler.Builder()
//                            .setUri(URI)
//                            .setPath(GET_ORDERS)
//                            .setJson(JSON.toJSONString(getOrderResult0))
//                            .build()
//                            .doPost();
//                    if (!Cools.isEmpty(response)) {
////                log.info(response);
//                        Date now = new Date();
//                        Result result = JSON.parseObject(response, Result.class);
//                        if (result.getCode() != 1) {
//                            return;
//                        }
//                        // 转历史档
//                    }

                }
            }


        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException(e.getMessage());
        }

    }

    /**
     * 更新库存
@@ -413,6 +490,7 @@
            }
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException(e.getMessage());
        }



 src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java

@@ -16,6 +16,8 @@
    // 自增
    private String Vchcode;

    private Integer vchType;

    // 备注
    private String summary;

@@ -28,6 +30,9 @@
    // 经手人编号  可空
    private String eTypeID;

    // 仓库编号
    private String kTypeID;

    private List<GetOrderResultDetl0> Detail;



 src/main/java/zy/cloud/wms/common/service/task/LogScheduler.java

New file
@@ -0,0 +1,23 @@
package zy.cloud.wms.common.service.task;

import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RestController;

/**
 * 历史档任务控制器
 * Created by vincent on 2020/11/27
 */
@Slf4j
@Component
@RestController
public class LogScheduler {

    @Transactional
//    @PostConstruct
    public void custOrderLogExecute(){

    }

}

 src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java

@@ -1,9 +1,8 @@
package zy.cloud.wms.manager.mapper;

import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.*;
import zy.cloud.wms.manager.entity.CustOrder;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@@ -12,5 +11,9 @@

    int updateStatus(@Param("number") String number, @Param("status") Integer status);

    @Insert("insert into man_cust_order_log select * from man_cust_order where number=#{number}")
    int saveLog(String number);

    @Update("delete from man_cust_order where number=#{number}")
    int delete(@Param("number") String number);
}