Commit a6ae4a383b4946b7534b77f3777b18a91c3b7c6d
1 parent
ab2f00a3
金蝶收款单增加唯一标识符
Showing
3 changed files
with
14 additions
and
4 deletions
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractRecHandler.java
@@ -252,7 +252,7 @@ public abstract class AbstractRecHandler<T extends BaseRecCo> implements Handler | @@ -252,7 +252,7 @@ public abstract class AbstractRecHandler<T extends BaseRecCo> implements Handler | ||
252 | e.getFBillTypeID().setFNUMBER(fixedBusinessType); | 252 | e.getFBillTypeID().setFNUMBER(fixedBusinessType); |
253 | } | 253 | } |
254 | var util = new ReceiptsOrderApiUtils(identifyInfo); | 254 | var util = new ReceiptsOrderApiUtils(identifyInfo); |
255 | - boolean purchaseOrder = util.getReceiptsOrder(e.getFBillTypeID().getFNUMBER(), getAllAmountFor(e)); | 255 | + boolean purchaseOrder = util.getReceiptsOrder(e.getFBillTypeID().getFNUMBER(), e.getFREMARK()); |
256 | if (purchaseOrder) { | 256 | if (purchaseOrder) { |
257 | util.createOnePurchaseOrder(JsonUtils.toJsonString(e), BillType.RECEIPTS.value); | 257 | util.createOnePurchaseOrder(JsonUtils.toJsonString(e), BillType.RECEIPTS.value); |
258 | } | 258 | } |
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/rec/BaseRecCo.java
@@ -14,6 +14,7 @@ import java.util.List; | @@ -14,6 +14,7 @@ import java.util.List; | ||
14 | public class BaseRecCo implements Serializable { | 14 | public class BaseRecCo implements Serializable { |
15 | private String systemDynamicCode; | 15 | private String systemDynamicCode; |
16 | private String fixedBusinessType; | 16 | private String fixedBusinessType; |
17 | + private String FREMARK; | ||
17 | private String FDATE; | 18 | private String FDATE; |
18 | private FBillTypeID FBillTypeID; | 19 | private FBillTypeID FBillTypeID; |
19 | private FSETTLEMAINBOOKID FSETTLEMAINBOOKID; | 20 | private FSETTLEMAINBOOKID FSETTLEMAINBOOKID; |
@@ -46,6 +47,15 @@ public class BaseRecCo implements Serializable { | @@ -46,6 +47,15 @@ public class BaseRecCo implements Serializable { | ||
46 | this.fixedBusinessType = fixedBusinessType; | 47 | this.fixedBusinessType = fixedBusinessType; |
47 | } | 48 | } |
48 | 49 | ||
50 | + @JsonProperty("FREMARK") | ||
51 | + public String getFREMARK() { | ||
52 | + return FREMARK; | ||
53 | + } | ||
54 | + | ||
55 | + public void setFREMARK(String FREMARK) { | ||
56 | + this.FREMARK = FREMARK; | ||
57 | + } | ||
58 | + | ||
49 | @JsonProperty("FDATE") | 59 | @JsonProperty("FDATE") |
50 | public String getFDATE() { | 60 | public String getFDATE() { |
51 | return FDATE; | 61 | return FDATE; |
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/ReceiptsOrderApiUtils.java
@@ -24,10 +24,10 @@ public class ReceiptsOrderApiUtils extends BaseApiUtils { | @@ -24,10 +24,10 @@ public class ReceiptsOrderApiUtils extends BaseApiUtils { | ||
24 | super(identifyInfo); | 24 | super(identifyInfo); |
25 | } | 25 | } |
26 | 26 | ||
27 | - public boolean getReceiptsOrder(String FBillTypeID,String realRecAmountFor) throws Exception { | 27 | + public boolean getReceiptsOrder(String FBillTypeID,String remark) throws Exception { |
28 | String FilterString = """ | 28 | String FilterString = """ |
29 | - FBillTypeID.FNumber = '%s' and FREALRECAMOUNTFOR = '%s' | ||
30 | - """.formatted(FBillTypeID,realRecAmountFor); | 29 | + FBillTypeID.FNumber = '%s' FREMARK = '%s'; |
30 | + """.formatted(FBillTypeID,remark); | ||
31 | var query = new GeneralQueryMessage(); | 31 | var query = new GeneralQueryMessage(); |
32 | query.setFilterString(FilterString); | 32 | query.setFilterString(FilterString); |
33 | query.setFieldKeys("FID"); | 33 | query.setFieldKeys("FID"); |