Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-06-09 da40f82d921daa63de501392519c6ecfbe8962a3

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -7,13 +7,13 @@
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.OutStockMainService;
import com.zy.asrs.service.OutStockService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.dto.InStockDto;
import com.zy.common.service.erp.entity.CPICMO;
import com.zy.common.service.erp.entity.InStockBillEntry;
import com.zy.common.service.erp.entity.M_item;
import com.zy.common.service.erp.entity.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -39,6 +39,10 @@
    private MatCodeService matCodeService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private OutStockMainService outStockMainService;
    @Autowired
    private OutStockService outStockService;

    private Map<Integer, M_item> itemMap = new HashMap<>();

@@ -190,26 +194,34 @@
    /**
     * 成品出库-发货通知单表头
     */
    @Scheduled(cron = "0/30 * * * * ? ")
    @Scheduled(cron = "0/15 * * * * ? ")
    public void syncOutStock(){
        boolean result = erpService.syncOutStock();
        if (result) {
//            System.out.format("%s\33[%d;%dm%s%n", "", 32, 3, "==========OutStockBill表同步成功==========");
        } else {
            System.out.format("%s\33[%d;%dm%s%n", "", 31, 3, "==========OutStockBill表同步失败==========");
        List<OutStockBill> result = erpService.syncOutStock();
        for (Integer i = 0; i < result.size(); i++) {
            OutStockBill main = outStockMainService.selectOne(new EntityWrapper<OutStockBill>().eq("FBrNo", result.get(i).getFBrNo()).and().eq("FInterID", result.get(i).getFInterID()));
            if (null == main) {
                if (!outStockMainService.insert(result.get(i))) {
                    log.info("出库通知主表OutStockBill同步失败");
                };
            } else {

            }
        }
    }

    /**
     * 成品出库-发货通知单表体
     */
    @Scheduled(cron = "0/30 * * * * ? ")
    @Scheduled(cron = "0/15 * * * * ? ")
    public void syncOutStockDetail(){
        boolean result = erpService.syncOutStockDetail();
        if (result) {
//            System.out.format("%s\33[%d;%dm%s%n", "", 32, 3, "==========OutStockBillEntry表同步成功==========");
        } else {
            System.out.format("%s\33[%d;%dm%s%n", "", 31, 3, "==========OutStockBillEntry表同步失败==========");
        List<OutStockBillEntry> result = erpService.syncOutStockDetail();
        for (Integer i = 0; i < result.size(); i++) {
            OutStockBillEntry main = outStockService.selectOne(new EntityWrapper<OutStockBillEntry>().eq("FInterID", result.get(i).getFInterID()).and().eq("FEntryID", result.get(i).getFEntryID()));
            if (null == main) {
                if (!outStockService.insert(result.get(i))) {
                    log.info("出库通知明细表OutStockBillEntry同步失败");
                };
            }
        }
    }