feat:撤销出口报关单，金额数量修改

(cherry picked from commit 08fec93bc0)

src/main/java/com/yem/or/api/AssepcDynamic.java

@@ -416,7 +416,7 @@ public class AssepcDynamic {
             qFilter.and(new QFilter("yem_customer.yem_groupcustomers.number", QCP.equals, number));
         }
         String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles");
-        DynamicObjectCollection load = ORM.create().query("yem_em_devicefiles", selectfields + ",id", qFilter.toArray());
+        DynamicObjectCollection load = ORM.create().query("yem_em_devicefiles", selectfields + ",id,yem_ordercustomer.name yem_ordercustomer_name, yem_ordercustomer.number yem_ordercustomer_number", qFilter.toArray());
         for (DynamicObject dynamicObject : load) {
             Map<String, Object> map = new HashMap<>();
             map.put("id", dynamicObject.getPkValue());
@@ -480,7 +480,8 @@ public class AssepcDynamic {
             }
 
             map.put("yem_saledate", dynamicObject.getString("yem_saledate"));
-
+            map.put("yem_ordercustomer_name", dynamicObject.getString("yem_ordercustomer_name"));
+            map.put("yem_ordercustomer_number", dynamicObject.getString("yem_ordercustomer_number"));
             result.add(map);
         }
 

src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java

@@ -67,8 +67,6 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
                 .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(salesorder_info))
                 .finish();
 
-        dataSet = doAmountApportionment(dataSet);
-
         dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
                 //原币离岸价
                 "yem_amount - tmp_reightamtend - tmp_premiumamtcy yem_basefobamt");
@@ -142,14 +140,14 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
         selectfields.add("TO_CHAR(yem_exportdate, 'yyyy-MM-dd') yem_exportdate");//出口日期
         selectfields.add("yem_customer.group.id yem_customer_group");//买方所在国
         selectfields.add("yem_commcountry yem_destinationcount");//贸易国别-目的国
-//        selectfields.add("yem_es_declare_ec.yem_cusqty yem_qty");//数量
+        selectfields.add("yem_es_declare_ec.yem_cusqty yem_qty");//数量
         selectfields.add("yem_es_declare_ec.yem_cushscode yem_hscode");//海关商品编码-出口商品代码
         selectfields.add("yem_es_declare_ec.yem_decmatericalname yem_cncustomclass");//报关分类名称-商品名称中文
         selectfields.add("yem_settlement yem_settlementxt");//结算方式-付款方式
         selectfields.add("yem_currency yem_currency");//结算币别-币别
         selectfields.add("yem_priceitem yem_priceitem");//价格条款-贸易方式
         selectfields.add("yem_es_declare_ec.yem_cusconsalesprice yem_unitprice");//单价
-//        selectfields.add("yem_es_declare_ec.yem_cusamount yem_amount");//金额
+        selectfields.add("yem_es_declare_ec.yem_cusamount yem_amount");//金额
         selectfields.add("yem_realbringbillno yem_ladingno");//提单号
         selectfields.add("yem_sctcompnayname.id yem_sctcompnayname");//船公司
         selectfields.add("yem_cyreightamt yem_cyreightamt");//海运费币别
@@ -186,7 +184,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
                 .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(aggPort))
                 .finish();
 
-//        dataSet = doAmountApportionment(dataSet);
+        dataSet = doAmountApportionment(dataSet);
 
         return dataSet;
     }
@@ -527,8 +525,6 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
         ArrayList<String> selectfields = Lists.newArrayList();
         selectfields.add("billno exportinvoice_billno");
         selectfields.add("yem_exportinvoice_c.yem_customsdeclaration yem_unit");
-        selectfields.add("yem_exportinvoice_c.yem_cusqty yem_qty");
-        selectfields.add("yem_exportinvoice_c.yem_cusamount yem_amount");
         selectfields.add("yem_exportinvoice_c.yem_sourcebillentryid ddd_id_ei_entry_fk");
         selectfields.add("yem_exportinvoice_c.yem_localinvoicedamo yem_cnyinvoiced");//金额-人民币开票额
         selectfields.add("yem_exrate yem_baserate");//原币汇率

src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java

@@ -14,6 +14,8 @@ import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.PreparePropertysEventArgs;
 import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
 import kd.bos.exception.KDBizException;
+import kd.bos.logging.Log;
+import kd.bos.logging.LogFactory;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
@@ -35,6 +37,9 @@ import java.util.Map;
  * @description 生成贷记单
  */
 public class SaleOrdeAddGenerateOp extends AbstractOperationServicePlugIn {
+
+    private final static Log log = LogFactory.getLog(SaleOrdeAddGenerateOp.class);
+
     @Override
     public void onPreparePropertys(PreparePropertysEventArgs e) {
         e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet());
@@ -76,6 +81,7 @@ public class SaleOrdeAddGenerateOp extends AbstractOperationServicePlugIn {
             if (yem_debcreditid == 0) {
                 DynamicObject debcrednote = BusinessDataServiceHelper.newDynamicObject("yem_debcrednote");
                 debcrednote.set("billstatus", "A");
+                debcrednote.set("yem_financialcon_status", "B");
                 debcrednote.set("yem_billtype", seelctDyn("bos_billtype", "number", "yem_debcrednote_d"));
                 debcrednote.set("yem_customer", dataEntitie.getDynamicObject("yem_customer"));
                 debcrednote.set("yem_bizdate", new Date());
@@ -171,12 +177,14 @@ public class SaleOrdeAddGenerateOp extends AbstractOperationServicePlugIn {
                         } else {
                             List<IOperateInfo> allErrorOrValidateInfo = auditResult.getAllErrorOrValidateInfo();
                             String message = auditResult.getMessage();
-                            throw new KDBizException("贷记单审核失败，" + message + "，" + allErrorOrValidateInfo);
+//                            throw new KDBizException("贷记单审核失败，" + message + "，" + allErrorOrValidateInfo);
+                            log.error("贷记单审核失败，" + message + "，" + allErrorOrValidateInfo);
                         }
                     } else {
                         List<IOperateInfo> allErrorOrValidateInfo = submitResult.getAllErrorOrValidateInfo();
                         String message = submitResult.getMessage();
-                        throw new KDBizException("贷记单提交失败，" + message + "，" + allErrorOrValidateInfo);
+//                        throw new KDBizException("贷记单提交失败，" + message + "，" + allErrorOrValidateInfo);
+                        log.error("贷记单提交失败，" + message + "，" + allErrorOrValidateInfo);
                     }
                 } else {
                     List<IOperateInfo> allErrorOrValidateInfo = Operate.getAllErrorOrValidateInfo();

src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java

@@ -126,7 +126,11 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn
         if (yemMilltype != null) {
             dynamicObject.set("group", seelctDyn("yem_em_electronicgroup", "number", yemMilltype.getString("number")));
         }
-        dynamicObject.set("yem_customer", dataEntitie.getDynamicObject("yem_customer"));
+        DynamicObject customer = dataEntitie.getDynamicObject("yem_customer");
+        dynamicObject.set("yem_customer", customer);
+        if (YEM.isNotEmpty(customer)) {
+            dynamicObject.set("yem_groupcustomer", customer.getDynamicObject("yem_groupcustomers"));
+        }
         dynamicObject.set("yem_salesorderno", materialinfo.getString("yem_conbillnumber"));
         String yemSourcebilltypeE = materialinfo.getString("yem_sourcebilltype_e");
         if (yemSourcebilltypeE.equals("yem_shippingdetails")) {