From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/java/com/zy/common/service/erp/ErpService.java | 141 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 140 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/ErpService.java b/src/main/java/com/zy/common/service/erp/ErpService.java
index 0d0adc0..612fc92 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -281,8 +281,147 @@
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;
+ }
-
+ 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;
+ }
--
Gitblit v1.9.1