小太阳出库通知接口调整

王佳豪

2021-04-26 b11c837f8ff994757be13f49123fa8c458bc92a5

小太阳出库通知接口调整

 src/main/java/com/zy/asrs/mapper/OutStockMainMapper.java

New file
@@ -0,0 +1,16 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.common.service.erp.entity.OutStockBill;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Map;

@Mapper
@Repository
public interface OutStockMainMapper extends BaseMapper<OutStockBill> {
    List<OutStockBill> queryOutStockMain(@Param("FBrNo") String FBrNo, @Param("FInterID") Integer FInterID);
}

 src/main/java/com/zy/asrs/service/OutStockMainService.java

New file
@@ -0,0 +1,10 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.common.service.erp.entity.OutStockBill;

import java.util.List;

public interface OutStockMainService extends IService<OutStockBill> {
    List<OutStockBill> queryOutStockMain(String FBrNo, Integer FInterID);
}

 src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java

@@ -6,6 +6,8 @@
import com.zy.asrs.entity.LocNormal;
import com.zy.asrs.mapper.LocNormalMapper;
import com.zy.asrs.service.LocNormalService;
import com.zy.common.service.erp.ErpSqlServer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
@@ -14,6 +16,8 @@

@Service("locNormalService")
public class LocNormalServiceImpl extends ServiceImpl<LocNormalMapper, LocNormal> implements LocNormalService {
    @Autowired
    ErpSqlServer erpSqlServer;

    @Override
    public List<LocNormal> getLocNormalData() {
@@ -37,6 +41,13 @@

    @Override
    public void locNormalIn(List<LocNormal> list) {
        // 平仓入库后更新中间表数据，Fflag_finish改为1，表示平仓入库成功
        if (list.size() > 0) {
            for (Integer i = 0; i < list.size(); i++) {
                String sql = "update CPICMO set Fflag_finish = 1 where FBillNo = '" + list.get(i).getWarehouse() + "' and Fnumber = '" + list.get(i).getMatnr() +"'";
                erpSqlServer.update(sql);
            }
        }
        baseMapper.locNormalIn(list);
    }


 src/main/java/com/zy/asrs/service/impl/OutStockMainServiceImpl.java

New file
@@ -0,0 +1,17 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.mapper.OutStockMainMapper;
import com.zy.asrs.service.OutStockMainService;
import com.zy.common.service.erp.entity.OutStockBill;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("outStockMainService")
public class OutStockMainServiceImpl extends ServiceImpl<OutStockMainMapper, OutStockBill> implements OutStockMainService {
    @Override
    public List<OutStockBill> queryOutStockMain(String FBrNo, Integer FInterID) {
        return baseMapper.queryOutStockMain(FBrNo, FInterID);
    }
}

 src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java

@@ -56,7 +56,7 @@
        List<LocDetl> locList = new ArrayList<LocDetl>();
        for (Integer i = 0; i < matList.size(); i++) {
            /*自动根据物料编码选取最优出货顺序（先进先出，靠外货物先出）*/
            tempLocList = baseMapper.queryMatWithLoc(matList.get(i).getFNumber());
            tempLocList = baseMapper.queryMatWithLoc(matList.get(i).getFnumber());
            BigDecimal needNum = matList.get(i).getFAuxQty();
            BigDecimal locNum = BigDecimal.ZERO;
            if (tempLocList.size() > 0) {

 src/main/java/com/zy/common/service/erp/ErpService.java

@@ -1,7 +1,10 @@
package com.zy.common.service.erp;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.asrs.service.OutStockMainService;
import com.zy.asrs.service.OutStockService;
import com.zy.common.service.erp.dto.InStockDto;
import com.zy.common.service.erp.dto.PInStockDto;
import com.zy.common.service.erp.entity.*;
@@ -281,146 +284,13 @@
        return erpSqlServer.update(sql) > 0;
    }

    public boolean syncOutStock() {
        return erpSqlServer.update("MERGE INTO xtyasrs.dbo.OutStockBill AS a \n" +
                "USING (SELECT * FROM  xtyasrs_dual.dbo.OutStockBill c)\n" +
                "AS b\n" +
                " ON a.FInterID = b.FInterID\n" +
                "WHEN MATCHED THEN\n" +
                "UPDATE SET \n" +
                "FBrNo = b.FBrNo,\n" +
                "FInterID = b.FInterID,\n" +
                "FBillNo = b.FBillNo,\n" +
                "FTranType = b.FTranType,\n" +
                "FSalType = b.FSalType,\n" +
                "FCustID = b.FCustID,\n" +
                "FDate = b.FDate,\n" +
                "FStockID = b.FStockID,\n" +
                "FAdd = b.FAdd,\n" +
                "FNote = b.FNote,\n" +
                "FEmpID = b.FEmpID,\n" +
                "FCheckerID = b.FCheckerID,\n" +
                "FBillerID = b.FBillerID,\n" +
                "FManagerID = b.FManagerID,\n" +
                "FClosed = b.FClosed,\n" +
                "FInvoiceClosed = b.FInvoiceClosed,\n" +
                "FBClosed = b.FBClosed,\n" +
                "FDeptID = b.FDeptID,\n" +
                "FSettleID = b.FSettleID,\n" +
                "FTranStatus = b.FTranStatus,\n" +
                "FExchangeRate = b.FExchangeRate,\n" +
                "FCurrencyID = b.FCurrencyID,\n" +
                "FStatus = b.FStatus,\n" +
                "FCancellation = b.FCancellation,\n" +
                "FMultiCheckLevel1 = b.FMultiCheckLevel1,\n" +
                "FMultiCheckLevel2 = b.FMultiCheckLevel2,\n" +
                "FMultiCheckLevel3 = b.FMultiCheckLevel3,\n" +
                "FMultiCheckLevel4 = b.FMultiCheckLevel4,\n" +
                "FMultiCheckLevel5 = b.FMultiCheckLevel5,\n" +
                "FMultiCheckLevel6 = b.FMultiCheckLevel6,\n" +
                "FMultiCheckDate1 = b.FMultiCheckDate1,\n" +
                "FMultiCheckDate2 = b.FMultiCheckDate2,\n" +
                "FMultiCheckDate3 = b.FMultiCheckDate3,\n" +
                "FMultiCheckDate4 = b.FMultiCheckDate4,\n" +
                "FMultiCheckDate5 = b.FMultiCheckDate5,\n" +
                "FMultiCheckDate6 = b.FMultiCheckDate6,\n" +
                "FCurCheckLevel = b.FCurCheckLevel,\n" +
                "FRelateBrID = b.FRelateBrID,\n" +
                "FCheckDate = b.FCheckDate,\n" +
                "FExplanation = b.FExplanation,\n" +
                "FFetchAdd = b.FFetchAdd,\n" +
                "FSelTranType = b.FSelTranType,\n" +
                "FChildren = b.FChildren,\n" +
                "FBrID = b.FBrID,\n" +
                "FAreaPS = b.FAreaPS,\n" +
                "FPOOrdBillNo = b.FPOOrdBillNo,\n" +
                "FManageType = b.FManageType,\n" +
                "FPrintCount = b.FPrintCount,\n" +
                "Fflag_rw = b.Fflag_rw,\n" +
                "Fflag_finish = b.Fflag_finish,\n" +
                "FWeiOrder = b.FWeiOrder,\n" +
                "FWeiOpenID = b.FWeiOpenID,\n" +
                "FOrderBillNo = b.FOrderBillNo,\n" +
                "FWLNumber = b.FWLNumber,\n" +
                "FWLCompany = b.FWLCompany,\n" +
                "FReturnFundType = b.FReturnFundType\n" +
                "WHEN NOT MATCHED  THEN\n" +
                "\tINSERT (FBrNo, FInterID, FBillNo, FTranType, FSalType, FCustID, FDate, FStockID, FAdd, FNote, FEmpID, FCheckerID, FBillerID, FManagerID, FClosed, FInvoiceClosed, FBClosed, FDeptID, FSettleID, FTranStatus, FExchangeRate, FCurrencyID, FStatus, FCancellation, FMultiCheckLevel1, FMultiCheckLevel2, FMultiCheckLevel3, FMultiCheckLevel4, FMultiCheckLevel5, FMultiCheckLevel6, FMultiCheckDate1, FMultiCheckDate2, FMultiCheckDate3, FMultiCheckDate4, FMultiCheckDate5, FMultiCheckDate6, FCurCheckLevel, FRelateBrID, FCheckDate, FExplanation, FFetchAdd, FSelTranType, FChildren, FBrID, FAreaPS, FPOOrdBillNo, FManageType, FPrintCount, Fflag_rw, Fflag_finish, FWeiOrder, FWeiOpenID, FOrderBillNo, FWLNumber, FWLCompany, FReturnFundType) \n" +
                "\tVALUES (b.FBrNo, b.FInterID, b.FBillNo, FTranType, FSalType, FCustID, FDate, FStockID, FAdd, FNote, FEmpID, FCheckerID, FBillerID, FManagerID, FClosed, FInvoiceClosed, FBClosed, FDeptID, FSettleID, FTranStatus, FExchangeRate, FCurrencyID, FStatus, FCancellation, FMultiCheckLevel1, FMultiCheckLevel2, FMultiCheckLevel3, FMultiCheckLevel4, FMultiCheckLevel5, FMultiCheckLevel6, FMultiCheckDate1, FMultiCheckDate2, FMultiCheckDate3, FMultiCheckDate4, FMultiCheckDate5, FMultiCheckDate6, FCurCheckLevel, FRelateBrID, FCheckDate, FExplanation, FFetchAdd, FSelTranType, FChildren, FBrID, FAreaPS, FPOOrdBillNo, FManageType, FPrintCount, Fflag_rw, Fflag_finish, FWeiOrder, FWeiOpenID, FOrderBillNo, FWLNumber, FWLCompany, FReturnFundType);")> 0;
    /* 查询erp中年表OutStockBill数据 */
    public List<OutStockBill> syncOutStock() {
        return erpSqlServer.select("SELECT * FROM  xtyasrs_dual.dbo.OutStockBill", OutStockBill.class);
    }

    public boolean syncOutStockDetail() {
        return erpSqlServer.update("MERGE INTO xtyasrs.dbo.OutStockBillEntry AS a \n" +
                "USING (SELECT * FROM  xtyasrs_dual.dbo.OutStockBillEntry c)\n" +
                "AS b\n" +
                " ON (a.FInterID = b.FInterID and a.FEntryID = b.FEntryID)\n" +
                "WHEN MATCHED THEN\n" +
                "UPDATE SET\n" +
                "FBrNo = b.FBrNo,\n" +
                "FInterID = b.FInterID,\n" +
                "FEntryID = b.FEntryID,\n" +
                "FDetailID = b.FDetailID,\n" +
                "FItemID = b.FItemID,\n" +
                "FQty = b.FQty,\n" +
                "FCommitQty = b.FCommitQty,\n" +
                "FPrice = b.FPrice,\n" +
                "FAmount = b.FAmount,\n" +
                "FOrderInterID = b.FOrderInterID,\n" +
                "FDate = b.FDate,\n" +
                "FNote = b.FNote,\n" +
                "FInvoiceQty = b.FInvoiceQty,\n" +
                "FBCommitQty = b.FBCommitQty,\n" +
                "FUnitID = b.FUnitID,\n" +
                "FAuxBCommitQty = b.FAuxBCommitQty,\n" +
                "FAuxCommitQty = b.FAuxCommitQty,\n" +
                "FAuxInvoiceQty = b.FAuxInvoiceQty,\n" +
                "FAuxPrice = b.FAuxPrice,\n" +
                "FAuxQty = b.FAuxQty,\n" +
                "FSourceEntryID = b.FSourceEntryID,\n" +
                "FMapNumber = b.FMapNumber,\n" +
                "FMapName = b.FMapName,\n" +
                "FAuxPropID = b.FAuxPropID,\n" +
                "FBatchNo = b.FBatchNo,\n" +
                "FCheckDate = b.FCheckDate,\n" +
                "FExplanation = b.FExplanation,\n" +
                "FFetchAdd = b.FFetchAdd,\n" +
                "FFetchDate = b.FFetchDate,\n" +
                "FMultiCheckDate1 = b.FMultiCheckDate1,\n" +
                "FMultiCheckDate2 = b.FMultiCheckDate2,\n" +
                "FMultiCheckDate3 = b.FMultiCheckDate3,\n" +
                "FMultiCheckDate4 = b.FMultiCheckDate4,\n" +
                "FMultiCheckDate5 = b.FMultiCheckDate5,\n" +
                "FMultiCheckDate6 = b.FMultiCheckDate6,\n" +
                "FSecCoefficient = b.FSecCoefficient,\n" +
                "FSecQty = b.FSecQty,\n" +
                "FSecCommitQty = b.FSecCommitQty,\n" +
                "FSourceTranType = b.FSourceTranType,\n" +
                "FSourceInterId = b.FSourceInterId,\n" +
                "FSourceBillNo = b.FSourceBillNo,\n" +
                "FContractInterID = b.FContractInterID,\n" +
                "FContractEntryID = b.FContractEntryID,\n" +
                "FContractBillNo = b.FContractBillNo,\n" +
                "FOrderEntryID = b.FOrderEntryID,\n" +
                "FOrderBillNo = b.FOrderBillNo,\n" +
                "FStockID = b.FStockID,\n" +
                "FBackQty = b.FBackQty,\n" +
                "FAuxBackQty = b.FAuxBackQty,\n" +
                "FSecBackQty = b.FSecBackQty,\n" +
                "FStdAmount = b.FStdAmount,\n" +
                "FPlanMode = b.FPlanMode,\n" +
                "FMTONo = b.FMTONo,\n" +
                "FStockQtyOnlyForShow = b.FStockQtyOnlyForShow,\n" +
                "FComplexQty = b.FComplexQty,\n" +
                "Fmodel = b.Fmodel,\n" +
                "Fname = b.Fname,\n" +
                "Fnumber = b.Fnumber,\n" +
                "FBarCode = b.FBarCode,\n" +
                "FBTPLCommitQty = b.FBTPLCommitQty,\n" +
                "FTPLCommitQty = b.FTPLCommitQty,\n" +
                "fsecinvoiceqty = b.fsecinvoiceqty\n" +
                "WHEN NOT MATCHED  THEN\n" +
                "\tINSERT (FBrNo, FInterID, FEntryID, FDetailID, FItemID, FQty, FCommitQty, FPrice, FAmount, FOrderInterID, FDate, FNote, FInvoiceQty, FBCommitQty, FUnitID, FAuxBCommitQty, FAuxCommitQty, FAuxInvoiceQty, FAuxPrice, FAuxQty, FSourceEntryID, FMapNumber, FMapName, FAuxPropID, FBatchNo, FCheckDate, FExplanation, FFetchAdd, FFetchDate, FMultiCheckDate1, FMultiCheckDate2, FMultiCheckDate3, FMultiCheckDate4, FMultiCheckDate5, FMultiCheckDate6, FSecCoefficient, FSecQty, FSecCommitQty, FSourceTranType, FSourceInterId, FSourceBillNo, FContractInterID, FContractEntryID, FContractBillNo, FOrderEntryID, FOrderBillNo, FStockID, FBackQty, FAuxBackQty, FSecBackQty, FStdAmount, FPlanMode, FMTONo, FStockQtyOnlyForShow, FComplexQty, Fmodel, Fname, Fnumber, FBarCode, FBTPLCommitQty, FTPLCommitQty, fsecinvoiceqty) \n" +
                "\tVALUES (b.FBrNo, b.FInterID, b.FEntryID, b.FDetailID, b.FItemID, b.FQty, b.FCommitQty, b.FPrice, b.FAmount, b.FOrderInterID, b.FDate, b.FNote, b.FInvoiceQty, b.FBCommitQty, b.FUnitID, b.FAuxBCommitQty, b.FAuxCommitQty, b.FAuxInvoiceQty, b.FAuxPrice, b.FAuxQty, b.FSourceEntryID, b.FMapNumber, b.FMapName, b.FAuxPropID, b.FBatchNo, b.FCheckDate, b.FExplanation, b.FFetchAdd, b.FFetchDate, b.FMultiCheckDate1, b.FMultiCheckDate2, b.FMultiCheckDate3, b.FMultiCheckDate4, b.FMultiCheckDate5, b.FMultiCheckDate6, b.FSecCoefficient, b.FSecQty, b.FSecCommitQty, b.FSourceTranType, b.FSourceInterId, b.FSourceBillNo, b.FContractInterID, b.FContractEntryID, b.FContractBillNo, b.FOrderEntryID, b.FOrderBillNo, b.FStockID, b.FBackQty, b.FAuxBackQty, b.FSecBackQty, b.FStdAmount, b.FPlanMode, b.FMTONo, b.FStockQtyOnlyForShow, b.FComplexQty, b.Fmodel, b.Fname, b.Fnumber, b.FBarCode, b.FBTPLCommitQty, b.FTPLCommitQty, b.fsecinvoiceqty);")> 0;
    public List<OutStockBillEntry> syncOutStockDetail() {
        return erpSqlServer.select("SELECT * FROM  xtyasrs_dual.dbo.OutStockBillEntry", OutStockBillEntry.class);
    }



 src/main/java/com/zy/common/service/erp/entity/OutStockBill.java

@@ -1,8 +1,12 @@
package com.zy.common.service.erp.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import io.swagger.models.auth.In;
import lombok.Data;
import net.sf.jsqlparser.expression.DateTimeLiteralExpression;

import java.io.Serializable;
import java.util.Date;

/**
@@ -10,116 +14,154 @@
 * Created by vincent on 2020/11/27
 */
@Data
public class OutStockBill {
@TableName("OutStockBill")
public class OutStockBill implements Serializable {
    @TableField("FBrNo")
    private String FBrNo;
    /*通知单内码*/
    @TableField("FInterID")
    private Integer FInterID;
    /*单据编号*/
    @TableField("FBillNo")
    private String FBillNo;
    /*单据类型*/
    @TableField("FTranType")
    private Integer FTranType;
    /*销售方式*/
    @TableField("FSalType")
    private Integer FSalType;
    /*购货单位*/
    @TableField("FCustID")
    private Integer FCustID;
    /*日期*/
    @TableField("FDate")
    private Date FDate;
    /*收货仓库*/
    @TableField("FStockID")
    private Integer FStockID;
    /*地址*/
    @TableField("FAdd")
    private String FAdd;
    /*退料原因*/
    @TableField("FNote")
    private String FNote;
    /*业务员*/
    @TableField("FEmpID")
    private Integer FEmpID;
    /*审核人*/
    @TableField("FCheckerID")
    private Integer FCheckerID;
    /*制单*/
    @TableField("FBillerID")
    private Integer FBillerID;
    /*主管*/
    @TableField("FManagerID")
    private Integer FManagerID;

    @TableField("FClosed")
    private Integer FClosed;

    @TableField("FInvoiceClosed")
    private Short FInvoiceClosed;

    @TableField("FBClosed")
    private Short FBClosed;
    /*部门*/
    @TableField("FDeptID")
    private Integer FDeptID;
    /*结算方式*/
    @TableField("FSettleID")
    private Integer FSettleID;
    /*传输状态*/
    @TableField("FTranStatus")
    private Integer FTranStatus;
    /*汇率*/
    @TableField("FExchangeRate")
    private Double FExchangeRate;
    /*币别*/
    @TableField("FCurrencyID")
    private Integer FCurrencyID;
    /*状态*/
    @TableField("FStatus")
    private Short FStatus;
    /*作废*/
    @TableField("FCancellation")
    private Long FCancellation;
    /*一审*/
    @TableField("FMultiCheckLevel1")
    private Integer FMultiCheckLevel1;
    /*二审*/
    @TableField("FMultiCheckLevel2")
    private Integer FMultiCheckLevel2;
    /*三审*/
    @TableField("FMultiCheckLevel3")
    private Integer FMultiCheckLevel3;
    /*四审*/
    @TableField("FMultiCheckLevel4")
    private Integer FMultiCheckLevel4;
    /*五审*/
    @TableField("FMultiCheckLevel5")
    private Integer FMultiCheckLevel5;
    /*六审*/
    @TableField("FMultiCheckLevel6")
    private Integer FMultiCheckLevel6;
    /*一级审核日期*/
    @TableField("FMultiCheckDate1")
    private Date FMultiCheckDate1;
    /*二级审核日期*/
    @TableField("FMultiCheckDate2")
    private Date FMultiCheckDate2;
    /*三级审核日期*/
    @TableField("FMultiCheckDate3")
    private Date FMultiCheckDate3;
    /*四级审核日期*/
    @TableField("FMultiCheckDate4")
    private Date FMultiCheckDate4;
    /*五级审核日期*/
    @TableField("FMultiCheckDate5")
    private Date FMultiCheckDate5;
    /*六级审核日期*/
    @TableField("FMultiCheckDate6")
    private Date FMultiCheckDate6;

    @TableField("FCurCheckLevel")
    private Integer FCurCheckLevel;
    /*订货机构*/
    @TableField("FRelateBrID")
    private Integer FRelateBrID;
    /*审核日期*/
    @TableField("FCheckDate")
    private Date FCheckDate;

    @TableField("FExplanation")
    private String FExplanation;

    @TableField("FFetchAdd")
    private String FFetchAdd;

    @TableField("FSelTranType")
    private Integer FSelTranType;

    @TableField("FChildren")
    private Integer FChildren;

    @TableField("FBrID")
    private Integer FBrID;

    @TableField("FAreaPS")
    private Integer FAreaPS;

    @TableField("FPOOrdBillNo")
    private String FPOOrdBillNo;

    @TableField("FManageType")
    private Integer FManageType;

    @TableField("FPrintCount")
    private Short FPrintCount;

    @TableField("Fflag_rw")
    private Integer Fflag_rw;

    @TableField("Fflag_finish")
    private Integer Fflag_finish;

    @TableField("FWeiOrder")
    private String FWeiOrder;

    @TableField("FWeiOpenID")
    private String FWeiOpenID;

    @TableField("FOrderBillNo")
    private String FOrderBillNo;

    @TableField("FWLNumber")
    private String FWLNumber;

    @TableField("FWLCompany")
    private String FWLCompany;

    @TableField("FReturnFundType")
    private String FReturnFundType;
}

 src/main/java/com/zy/common/service/erp/entity/OutStockBillEntry.java

@@ -1,5 +1,7 @@
package com.zy.common.service.erp.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

import java.math.BigDecimal;
@@ -10,135 +12,162 @@
 * Created by vincent on 2020/11/27
 */
@Data
@TableName("OutStockBillEntry")
public class OutStockBillEntry {
    /* 订单状态，出库中或已出库 */
    @TableField(exist = false)
    private Integer workRecord;
    /*单据编号-OutStockBill表数据 */
    @TableField(exist = false)
    private String FBillNo;
    /*地址-OutStockBill表数据*/
    @TableField(exist = false)
    private String FAdd;

    @TableField("FBrNo")
    private String FBrNo;
    /*通知单内码*/
    @TableField("FInterID")
    private Integer FInterID;
    /*分录号*/
    @TableField("FEntryID")
    private Integer FEntryID;
    /*产品代码内码*/
    @TableField("FItemID")
    private Integer FItemID;
    /*基本单位数量*/
    @TableField("FQty")
    private BigDecimal FQty;
    /*发货数量*/
    @TableField("FCommitQty")
    private BigDecimal FCommitQty;
    /*单价*/
    @TableField("FPrice")
    private BigDecimal FPrice;
    /*金额*/
    @TableField("FAmount")
    private BigDecimal FAmount;
    /*销售订单单号*/
    @TableField("FOrderInterID")
    private Integer FOrderInterID;
    /*日期*/
    @TableField("FDate")
    private Date FDate;
    /*备注*/
    @TableField("FNote")
    private String FNote;
    /*开票数量*/
    @TableField("FInvoiceQty")
    private BigDecimal FInvoiceQty;
    /*退货数量*/
    @TableField("FBCommitQty")
    private BigDecimal FBCommitQty;
    /*计量单位*/
    private BigDecimal FUnitID;
    @TableField("FUnitID")
    private Integer FUnitID;
    /*辅助退货数量*/
    @TableField("FAuxBCommitQty")
    private BigDecimal FAuxBCommitQty;
    /*辅助发货数量*/
    @TableField("FAuxCommitQty")
    private BigDecimal FAuxCommitQty;
    /*辅助开票数量*/
    @TableField("FAuxInvoiceQty")
    private BigDecimal FAuxInvoiceQty;
    /*单价*/
    @TableField("FAuxPrice")
    private BigDecimal FAuxPrice;
    /*数量*/
    @TableField("FAuxQty")
    private BigDecimal FAuxQty;
    /*源单行号*/
    @TableField("FSourceEntryID")
    private Integer FSourceEntryID;
    /*对应代码*/
    @TableField("FMapNumber")
    private String FMapNumber;
    /*对应名称*/
    @TableField("FMapName")
    private String FMapName;

    @TableField("FAuxPropID")
    private Integer FAuxPropID;

    @TableField("FBatchNo")
    private String FBatchNo;

    @TableField("FCheckDate")
    private Date FCheckDate;

    @TableField("FExplanation")
    private String FExplanation;

    @TableField("FFetchAdd")
    private String FFetchAdd;

    @TableField("FFetchDate")
    private Date FFetchDate;

    @TableField("FMultiCheckDate1")
    private Date FMultiCheckDate1;

    @TableField("FMultiCheckDate2")
    private Date FMultiCheckDate2;

    @TableField("FMultiCheckDate3")
    private Date FMultiCheckDate3;

    @TableField("FMultiCheckDate4")
    private Date FMultiCheckDate4;

    @TableField("FMultiCheckDate5")
    private Date FMultiCheckDate5;

    @TableField("FMultiCheckDate6")
    private Date FMultiCheckDate6;

    @TableField("FSecCoefficient")
    private BigDecimal FSecCoefficient;

    @TableField("FSecQty")
    private BigDecimal FSecQty;

    @TableField("FSecCommitQty")
    private BigDecimal FSecCommitQty;

    @TableField("FSourceTranType")
    private Integer FSourceTranType;

    @TableField("FSourceInterId")
    private Integer FSourceInterId;
    /*生产单号*/
    @TableField("FSourceBillNo")
    private String FSourceBillNo;

    @TableField("FContractInterID")
    private Integer FContractInterID;

    @TableField("FContractEntryID")
    private Integer FContractEntryID;

    @TableField("FContractBillNo")
    private String FContractBillNo;

    @TableField("FOrderEntryID")
    private Integer FOrderEntryID;

    @TableField("FOrderBillNo")
    private String FOrderBillNo;

    @TableField("FStockID")
    private Integer FStockID;

    @TableField("FBackQty")
    private BigDecimal FBackQty;

    @TableField("FAuxBackQty")
    private BigDecimal FAuxBackQty;

    @TableField("FSecBackQty")
    private BigDecimal FSecBackQty;

    @TableField("FStdAmount")
    private BigDecimal FStdAmount;

    @TableField("FPlanMode")
    private Integer FPlanMode;

    @TableField("FMTONo")
    private String FMTONo;

    @TableField("FDetailID")
    private Integer FDetailID;

    @TableField("FStockQtyOnlyForShow")
    private BigDecimal FStockQtyOnlyForShow;

    @TableField("FComplexQty")
    private String FComplexQty;

    @TableField("Fmodel")
    private String Fmodel;

    @TableField("Fname")
    private String Fname;
    /*物料编码(产品代码)*/
    private String FNumber;

    @TableField("Fnumber")
    private String Fnumber;
    @TableField("FBarCode")
    private String FBarCode;

    private String FBTPLCommitQty;

    private String FTPLCommitQty;

    private String fsecinvoiceqty;
    @TableField("FBTPLCommitQty")
    private BigDecimal FBTPLCommitQty;
    @TableField("FTPLCommitQty")
    private BigDecimal FTPLCommitQty;
    @TableField("fsecinvoiceqty")
    private BigDecimal fsecinvoiceqty;
}

 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<>();

@@ -192,11 +196,14 @@
     */
    @Scheduled(cron = "0/30 * * * * ? ")
    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同步失败");
                };
            }
        }
    }

@@ -205,11 +212,14 @@
     */
    @Scheduled(cron = "0/30 * * * * ? ")
    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同步失败");
                };
            }
        }
    }


 src/main/resources/mapper/OutStockMainMapper.xml

New file
@@ -0,0 +1,14 @@
<?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.zy.asrs.mapper.OutStockMainMapper">
    <!-- OutStockBill映射结果 -->
    <resultMap id="OutStockMainResultMap" type="com.zy.common.service.erp.entity.OutStockBill">
        <result column="FBrNo" property="FBrNo"/>
        <result column="FInterID" property="FInterID"/>
    </resultMap>


    <select id="queryOutStockMain" resultMap="OutStockMainResultMap">
        select * from OutStockBill
    </select>
</mapper>

 src/main/resources/mapper/OutStockMapper.xml

@@ -13,7 +13,7 @@
        <result column="FAuxPrice" property="FAuxPrice"/>
        <result column="FDate" property="FDate"/>
        <result column="FNote" property="FNote"/>
        <result column="Fnumber" property="FNumber"/>
        <result column="Fnumber" property="Fnumber"/>
        <result column="FSourceBillNo" property="FSourceBillNo"/>
        <result column="FBillNo" property="FBillNo"/>
        <result column="FAdd" property="FAdd"/>