diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/PaymentOrderEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/PaymentOrderEntity.java
index 949beba1..1bbd131b 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/PaymentOrderEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/PaymentOrderEntity.java
@@ -35,6 +35,16 @@ public class PaymentOrderEntity extends BaseEntity {
private String pushStatus;//推送状态
+ private String privateDescSeg1;//私有段 单号
+
+ public String getPrivateDescSeg1() {
+ return privateDescSeg1;
+ }
+
+ public void setPrivateDescSeg1(String privateDescSeg1) {
+ this.privateDescSeg1 = privateDescSeg1;
+ }
+
public String getPushStatus() {
return pushStatus;
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/PaymentOrderEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/PaymentOrderEntity.xml
index 1b251794..b7b754bc 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/PaymentOrderEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/PaymentOrderEntity.xml
@@ -23,6 +23,7 @@
+
@@ -34,7 +35,7 @@
main.id as id,
- main.field0021 as docNo,-- 单号
+ main.field0021 as privateDescSeg1,-- 单号
main.field0102 as pCCode, -- 币种
main.field0025 as payDate, -- 付款日期
main.field0104 as documentTypeCode, -- 单据类型
@@ -63,7 +64,7 @@ main.field0100 as transactorCode -- 业务员
left join col_summary summary on main.id = summary.form_recordid
and id = #{id}
- and field0021 = #{docNo}
+ and field0021 = #{privateDescSeg1}
and field0102 = #{pCCode}
and field0025 = #{payDate}
and field0104 = #{documentTypeCode}
@@ -85,7 +86,7 @@ main.field0100 as transactorCode -- 业务员
left join col_summary summary on main.id = summary.form_recordid
and id = #{id}
- and field0021 = #{docNo}
+ and field0021 = #{privateDescSeg1}
and field0102 = #{pCCode}
and field0025 = #{payDate}
and field0104 = #{documentTypeCode}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/SalesOrderDetailsEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/SalesOrderDetailsEntity.xml
index a127e534..b523e6b3 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/SalesOrderDetailsEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/SalesOrderDetailsEntity.xml
@@ -47,8 +47,8 @@ field0065 as privateDescSeg2, -- 项目明细编码
field0070 as privateDescSeg5, -- 厂区明细编码
field0023 as pubDescSeg1, -- 合同号明细
field0033 as requireDate, -- 交期
-field0056 as recTermCode, -- 收款条件
-field0066 as demandType -- 需求分类编码
+field0078 as recTermCode, -- 收款条件
+field0076 as demandType -- 需求分类枚举值
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/SalesOrderEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/SalesOrderEntity.xml
index 61ce256a..8f68ad6c 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/SalesOrderEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/entity/SalesOrderEntity.xml
@@ -38,7 +38,7 @@
main.field0059 as seller,-- 业务员编码
main.field0020 as memo,-- 备注
main.field0061 as confirmTermCode,-- 立账条件编码
- main.field0019 as recTermCode, -- 收款条件
+ main.field0077 as recTermCode, -- 收款条件
main.field0003 as pubDescSeg1,-- 合同号
main.field0069 as pubDescSeg5,-- 厂区编码
main.field0068 as pubDescSeg6,-- 贸易方式
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/service/impl/PaymentOrderServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/service/impl/PaymentOrderServiceImpl.java
index 5376045e..a0c8c9c6 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/service/impl/PaymentOrderServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/service/impl/PaymentOrderServiceImpl.java
@@ -70,7 +70,7 @@ public class PaymentOrderServiceImpl extends BaseService implements IPaymentOrde
for (PaymentOrderEntity orderEntity : query) {
orderEntity.setDataSourceCode(sourceCode);
JSONObject jsonMain=new JSONObject();
- jsonMain.put("DocNo",orderEntity.getDocNo());//单号
+ // jsonMain.put("DocNo",orderEntity.getDocNo());//单号 此字段不用了
jsonMain.put("PCCode",orderEntity.getpCCode()==null?"C001":orderEntity.getpCCode());//币种
jsonMain.put("PayDate",orderEntity.getPayDate());//付款日期
jsonMain.put("DocumentTypeCode",orderEntity.getDocumentTypeCode());//单据类型
@@ -94,6 +94,9 @@ public class PaymentOrderServiceImpl extends BaseService implements IPaymentOrde
jsonMain.put("SrcBillOrgCode",orderEntity.getSrcBillOrgCode());//来源组织
jsonMain.put("TransactorCode",orderEntity.getTransactorCode());//业务员
jsonMain.put("Note",orderEntity.getNote());//备注
+ JSONObject jsonDescFlexField=new JSONObject();
+ jsonDescFlexField.put("PrivateDescSeg1",orderEntity.getPrivateDescSeg1());//单号
+ jsonMain.put("DescFlexField",jsonDescFlexField);
JSONArray jsonArray=new JSONArray();
PaymentOrderDetailLinesEntity paymentOrderDetailLinesEntity=new PaymentOrderDetailLinesEntity();
paymentOrderDetailLinesEntity.setFormmainId(orderEntity.getId());
@@ -142,7 +145,7 @@ public class PaymentOrderServiceImpl extends BaseService implements IPaymentOrde
JSONObject jsonPayBillUse=new JSONObject();
jsonDetails.put("Maturity",orderDetailsUseLinesEntity.getMaturity());//到期日
String payProperty=null;
- if(orderDetailsUseLinesEntity.getPayProperty().equals("-4517840471053613598")){
+ if(StrUtil.isEmpty(orderDetailsUseLinesEntity.getPayProperty()) ||orderDetailsUseLinesEntity.getPayProperty().equals("-4517840471053613598")){
payProperty="0";//标准
}else if(orderDetailsUseLinesEntity.getPayProperty().equals("3562140919963140665")){
payProperty="1";//保证金
@@ -211,7 +214,7 @@ public class PaymentOrderServiceImpl extends BaseService implements IPaymentOrde
taskLivingDetail.setCreate_time(new Date());
taskLivingDetail.setModify_time(new Date());
taskLivingDetail.setRootAppPk(orderEntity.getId());
- taskLivingDetail.setRootAppBill(orderEntity.getDocNo());
+ taskLivingDetail.setRootAppBill(orderEntity.getDocNo()==null?orderEntity.getPrivateDescSeg1():orderEntity.getDocNo());
taskLivingDetail.setPluginId("PaymentOrderPluginInitializer");
taskLivingDetail.setId(json.getString("details_id"));
taskLivingDetail.setRootAppNewData(jsonStr);
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/service/impl/SalesOrderServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/service/impl/SalesOrderServiceImpl.java
index e7406192..faa37ee3 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/service/impl/SalesOrderServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/oa/service/impl/SalesOrderServiceImpl.java
@@ -104,28 +104,28 @@ public class SalesOrderServiceImpl extends BaseService
jsonDetails.put("DocLineNo",orderDetailsEntity.getDocLineNo());//行号
jsonDetails.put("ItemCode",orderDetailsEntity.getItemCode());//料号
String freeType=null;
- if(orderDetailsEntity.getFreeType().equals("-7818294496872217619")){
+ if(StrUtil.isEmpty(orderDetailsEntity.getFreeType())){
+ freeType="-1";
+ } else if(orderDetailsEntity.getFreeType().equals("-7818294496872217619")){
freeType="0";
}else if(orderDetailsEntity.getFreeType().equals("6443958972472642867")){
freeType="1";
- }else{
- freeType="-1";
}
jsonDetails.put("FreeType",freeType);//免费品类型
jsonDetails.put("Project",orderEntity.getProject());//项目
jsonDetails.put("OrderByQtyTU",orderDetailsEntity.getOrderByQtyTU());//数量
jsonDetails.put("TU",orderDetailsEntity.gettU());//销售单位编码
jsonDetails.put("FinallyPriceTC",orderDetailsEntity.getFinallyPriceTC());//最终价
- jsonDetails.put("TaxSchedule",orderDetailsEntity.getTaxSchedule()==null?"YZ08":orderDetailsEntity.getTaxSchedule());//税组合
+ jsonDetails.put("TaxSchedule",orderDetailsEntity.getTaxSchedule());//税组合
jsonDetails.put("ShipTogetherFlag","-1");//成套发货标志
jsonDetails.put("Memo",orderDetailsEntity.getMemo());//备注
jsonDetails.put("RecTermCode",orderDetailsEntity.getRecTermCode());//收款条件
JSONObject jsonDesc=new JSONObject();
boolean falg=true;
- if(orderDetailsEntity.getPrivateDescSeg1().equals("5634606992081569853")){
- falg=true;
- }else{
+ if(StrUtil.isEmpty(orderDetailsEntity.getPrivateDescSeg1()) || !orderDetailsEntity.getPrivateDescSeg1().equals("5634606992081569853")){
falg=false;
+ } else{
+ falg=true;
}
jsonDesc.put("PrivateDescSeg1",falg);//是否处理
jsonDesc.put("PrivateDescSeg2",orderDetailsEntity.getPrivateDescSeg2());//项目明细