#
luxiaotao1123
2021-03-01 7bdaf206fa5014720f92b86dd339f579b33cc7d5
#
1个文件已添加
7个文件已修改
105 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/common/service/MainScheduler.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/common/service/MainService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/CustOrder.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/CustOrderService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/CustOrderMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/common/service/MainScheduler.java
New file
@@ -0,0 +1,38 @@
package zy.cloud.wms.common.service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.service.CustOrderService;
import java.util.List;
/**
 * Created by vincent on 2021/3/1
 */
@Slf4j
@Component
public class MainScheduler {
    @Autowired
    private CustOrderService custOrderService;
    @Autowired
    private MainService mainService;
    /**
     * 扫描销售订单数据,生成出库单
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    public void stockOutExecute(){
        List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 1));
        if (Cools.isEmpty(custOrders)){
            return;
        }
    }
}
src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -6,7 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.service.erp.entity.GetDataResult;
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.Prior;
@@ -33,11 +33,11 @@
    private PriorService priorService;
    @Transactional
    public void stockOutProcess(List<GetDataResult> list) {
    public void stockOutProcess(List<CustOrder> list) {
        if (Cools.isEmpty(list)) {
            return;
        }
        for (GetDataResult data : list) {
        for (CustOrder data : list) {
            // 判断物料是否存在
            Mat mat = matService.selectByMatnr(data.getUserCode());
            if (null == mat) {
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -5,12 +5,14 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import zy.cloud.wms.common.service.MainService;
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.service.erp.entity.GetDataResult;
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.utils.HttpHandler;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -27,14 +29,13 @@
    public static final String GET_ORDERS = "cM/basis/getOrders";
    @Autowired
    private MatService matService;
    @Autowired
    private MainService mainService;
    private CustOrderService custOrderService;
    /**
     * 原材料
     * 持久化销售订单
     */
//    @Scheduled(cron = "0/3 * * * * ? ")
    @Transactional
    public void getOrdersExecute(){
        try {
            Map<String, Object> json = new HashMap<>();
@@ -49,11 +50,36 @@
                log.error("请求:{}\nError,响应结果为空!", URI + GET_ORDERS);
            } else {
                log.info(response);
                Date now = new Date();
                Result result = JSON.parseObject(response, Result.class);
                if (result.getCode() != 1) {
                    return;
                }
                List<GetDataResult> list = JSON.parseArray(result.getData(), GetDataResult.class);
                if (!Cools.isEmpty(list)) {
                    // 生成出库单
                    mainService.stockOutProcess(list);
                    boolean complete = true;
                    for (GetDataResult data : list) {
                        CustOrder custOrder = new CustOrder(
                                data.getNumber(),    // 销售单号
                                data.getBillDate(),    // 单据日期[非空]
                                data.getBTypeID(),    // 客户编号
                                data.getETypeID(),    // 经手人编号[非空]
                                data.getUserCode(),    // 商品编号
                                data.getQty(),    // 商品数量
                                data.getPrice(),    // 商品单价
                                data.getComment(),    // 商品备注[非空]
                                1,    // 状态
                                now,    // 添加时间
                                now,    // 修改时间
                                null    // 备注
                        );
                        boolean insert = custOrderService.insert(custOrder);
                        if (!insert) {
                            complete = false;
                            log.error("保存销售订单失败!");
                        }
                    }
//                    custOrderService.completeLoading(list)
                }
            }
        } catch (IOException e) {
@@ -62,4 +88,6 @@
    }
}
src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
@@ -69,7 +69,7 @@
    /**
     * 状态 1: 待处理  2: 已完成  3: 取消  4: 异常  
     */
    @ApiModelProperty(value= "状态 1: 待处理  2: 已完成  3: 取消  4: 异常  ")
    @ApiModelProperty(value= "状态 0: 载入中 1: 待处理  2: 已完成  3: 取消  4: 异常  ")
    private Integer status;
    /**
@@ -195,6 +195,8 @@
    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "载入中";
            case 1:
                return "待处理";
            case 2:
src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
@@ -9,4 +9,7 @@
@Repository
public interface CustOrderMapper extends BaseMapper<CustOrder> {
    int completeLoading(String number);
}
src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
@@ -5,4 +5,6 @@
public interface CustOrderService extends IService<CustOrder> {
    boolean completeLoading(String number);
}
src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
@@ -9,4 +9,8 @@
@Service("custOrderService")
public class CustOrderServiceImpl extends ServiceImpl<CustOrderMapper, CustOrder> implements CustOrderService {
    @Override
    public boolean completeLoading(String number) {
        return this.baseMapper.completeLoading(number) > 0;
    }
}
src/main/resources/mapper/CustOrderMapper.xml
@@ -19,4 +19,8 @@
    </resultMap>
    <update id="completeLoading">
        update man_cust_order set status = 1 where 1=1 and number = #{number}
    </update>
</mapper>