Merge remote-tracking branch 'origin/dev' into dev

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

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -230,7 +230,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         this.save(dto);
 
         //如果是往来
-        if (1 == dto.getIsTransaction()) {
+        if (ObjectUtil.isNotEmpty(dto.getIsTransaction()) && 1 == dto.getIsTransaction()) {
             //创建往来数据
             Transaction transaction = new Transaction();
             transaction.setDepartmentId(dto.getTransactionDeptId());

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

@@ -31,7 +31,7 @@ import java.util.Map;
  * 单证PDF数据存放表 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-26
  */
 @Service
@@ -53,6 +53,7 @@ public class DocumentsPdfServiceImpl extends ServiceImpl<DocumentsPdfMapper, Doc
 
     /**
      * 查询详情
+     *
      * @param id 单证ID
      * @return
      */
@@ -65,26 +66,27 @@ public class DocumentsPdfServiceImpl extends ServiceImpl<DocumentsPdfMapper, Doc
 
     /**
      * 报关委托书详情
+     *
      * @param id
      * @return
      */
     @Override
-    public Map<String,Object> powerDetail(Long id) {
-        DocumentsPdf documentsPdf = this.getOne(Wrappers.<DocumentsPdf>query().lambda().eq(DocumentsPdf::getDocumentId,id).eq(DocumentsPdf::getDataType,1));
+    public Map<String, Object> powerDetail(Long id) {
+        DocumentsPdf documentsPdf = this.getOne(Wrappers.<DocumentsPdf>query().lambda().eq(DocumentsPdf::getDocumentId, id).eq(DocumentsPdf::getDataType, 1));
         DocumentsPdfVo result = BeanUtil.toBean(documentsPdf, DocumentsPdfVo.class);
-        if(ObjectUtil.isEmpty(result)){
-            Map<String,Object> map = documentsService.getContractDataById(id);
+        if (ObjectUtil.isEmpty(result)) {
+            Map<String, Object> map = documentsService.getContractDataById(id);
             //查询单证数据
             DocumentsProduct documentsProduct = documentsProductService.getMaxMoneyData(id);
-            if(MapUtils.isEmpty(map)||ObjectUtil.isEmpty(documentsProduct)){
+            if (MapUtils.isEmpty(map) || ObjectUtil.isEmpty(documentsProduct)) {
                 throw new ServiceException("数据异常,请联系管理员");
             }
-            map.put("customerCode",documentsProduct.getCustomsCode());
-            map.put("productName", StringUtils.equals(documentsProduct.getDescribes(),"无")?documentsProduct.getSubDescribe():documentsProduct.getDescribes());
-            map.put("productQuantity",documentsProduct.getQuantity());
+            map.put("customerCode", documentsProduct.getCustomsCode());
+            map.put("productName", StringUtils.equals(documentsProduct.getDescribes(), "无") ? documentsProduct.getSubDescribe() : documentsProduct.getDescribes());
+            map.put("productQuantity", documentsProduct.getQuantity());
             return map;
-        }else{
-            Map<String,Object> map = JSON.parseObject(result.getContent());
+        } else {
+            Map<String, Object> map = JSON.parseObject(result.getContent());
             return map;
         }
     }

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

@@ -22,16 +22,14 @@
     </select>
 
     <select id="getDpList" resultType="com.fjhx.sale.entity.documents.po.DocumentsProduct">
-        SELECT
-            t1.*,
-            t2.product_id AS productId,
-            t2.pack_detail_id
-        FROM
-            documents_product t1
-        LEFT JOIN pack_detail_product t2 ON t1.business_id = t2.id
-        WHERE
-              t2.pack_detail_id IS NOT NULL
-              AND t1.documents_id = #{documentId}
+        SELECT t1.*,
+               t2.product_id                                   productId,
+               IFNULL(t2.pack_detail_id, t3.pack_detail_id) AS packDetailId,
+               t3.unit                                      AS productUnit
+        FROM documents_product t1
+                 LEFT JOIN pack_detail_product t2 ON t1.business_id = t2.id
+                 LEFT JOIN pack_detail_goods t3 ON t1.business_id = t3.id
+        WHERE t1.documents_id = #{documentId}
     </select>
     <select id="getMaxMoneyData" resultType="com.fjhx.sale.entity.documents.po.DocumentsProduct">
         SELECT