报关委托书修改字段

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -11,6 +11,7 @@ import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.common.utils.ExchangeRateUtil;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
@@ -132,6 +133,7 @@ public class ContractUpdateFlow extends FlowDelegate {
         }
         contract.setCode(code + "(" + index + ")");
         contract.setIsShow(1);//隐藏当前数据
+        contract.setRate(ExchangeRateUtil.getCnyToCodeRate(contract.getCurrency()));//赋值新的合同汇率
         /**
          * 计算新合同的剩余数量
          */

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsPdfServiceImpl.java

@@ -3,6 +3,7 @@ package com.fjhx.sale.service.documents.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -80,9 +81,14 @@ public class DocumentsPdfServiceImpl extends ServiceImpl<DocumentsPdfMapper, Doc
             if (MapUtils.isEmpty(map) || ObjectUtil.isEmpty(documentsProduct)) {
                 throw new ServiceException("数据异常,请联系管理员");
             }
+            //查询报关单里的运输备注
+            DocumentsPdf data = this.getOne(Wrappers.<DocumentsPdf>query().lambda().eq(DocumentsPdf::getDocumentId, id).eq(DocumentsPdf::getDataType, 0));
+            String dataJson = ObjectUtil.isEmpty(data)?"":data.getContent();
+            JSONObject jsonObject = JSONObject.parseObject(dataJson);
             map.put("customerCode", documentsProduct.getCustomsCode());
-            map.put("productName", StringUtils.equals(documentsProduct.getDescribes(), "无") ? documentsProduct.getSubDescribe() : documentsProduct.getDescribes());
+            map.put("productName", StringUtils.equals(documentsProduct.getSubDescribe(), "无") ? documentsProduct.getDescribes() : documentsProduct.getSubDescribe());
             map.put("productQuantity", documentsProduct.getQuantity());
+            map.put("transport_method",jsonObject.getOrDefault("withinChinaSource",null));
             return map;
         } else {
             Map<String, Object> map = JSON.parseObject(result.getContent());

hx-sale/src/main/resources/mapper/documents/DocumentsMapper.xml

@@ -25,7 +25,6 @@
 
     <select id="getContractDataById" resultType="java.util.Map">
         SELECT
-            t2.transport_method,
             t2.trade_methods
         FROM
             documents t1

hx-sale/src/main/resources/mapper/documents/DocumentsProductMapper.xml

@@ -35,7 +35,7 @@
         SELECT
             *
         FROM
-                ( SELECT *, price * quantity AS sumAmount FROM documents_product ) t1
+                ( SELECT *, price * quantity AS sumAmount FROM documents_product  WHERE documents_id = #{documentId}) t1
         ORDER BY
             t1.sumAmount DESC
             LIMIT 1