装箱列表BUG修复

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -94,7 +94,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         wrapper.like("pi", ProductInfo::getBarCode, dto.getBarCode());
         wrapper.like("json_unquote(standard_json->'$.englishName')", dto.getEnglishName());
         wrapper.like("json_unquote(standard_json->'$.customsCode')", dto.getCustomsCode());
-        wrapper.keyword(dto,
+        wrapper.keyword(dto.getKeyword(),
                 new SqlField("pi", ProductInfo::getName),
                 new SqlField("pi", ProductInfo::getCode),
                 new SqlField("pi", ProductInfo::getCustomCode),

hx-sale/src/main/java/com/fjhx/sale/entity/statement/vo/ProfitSettlementVo.java

@@ -106,4 +106,8 @@ public class ProfitSettlementVo {
      */
     private Integer settlementStatus;
 
+    /**
+     * 税率
+     */
+    private BigDecimal rate;
 }

hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -121,6 +121,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
 
             } else {
                 map = new HashMap<>(defaultRateMap);
+//                map = new HashMap<>();
+//                map.put(record.getCurrency(),record.getRate());
             }
 
             result.put(record.getId(), map);
@@ -155,6 +157,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
             profitSettlementVo.setUserId(item.getCreateUser());
             profitSettlementVo.setContractAmount(item.getAmount());
             profitSettlementVo.setCurrency(item.getCurrency());
+            profitSettlementVo.setRate(item.getRate());
             profitSettlementVo.setCurrencyRateJson(item.getCurrencyRateJson());
             profitSettlementVo.setSettlementStatus(item.getSettlementStatus());
 

hx-sale/src/main/resources/mapper/pack/PackDetailMapper.xml

@@ -15,15 +15,10 @@
                      (SELECT GROUP_CONCAT(CONCAT(t3.`code`, "_", t2.product_name)) AS codeAPName
                       FROM pack_detail_product t2
                                LEFT JOIN contract t3 ON t2.contract_id = t3.id
-                      WHERE t2.pack_detail_id IN (GROUP_CONCAT(t1.id))) AS codeAPName,
-                     (SELECT GROUP_CONCAT(CONCAT(
-                             "{\"bomVolume\":",bom_volume,",",
-                             "\"boxLong\":",box_long,",",
-                             "\"boxWide\":",box_wide,",",
-                             "\"boxHigh\":",box_high,",",
-                             "\"roughWeight\":",rough_weight,",",
-                             "\"netWeight\":",net_weight,"}"
-                     )) FROM pack_detail WHERE id IN (	GROUP_CONCAT(t1.id)))AS dataJsonList,
+                      WHERE FIND_IN_SET(t2.pack_detail_id,GROUP_CONCAT( t1.id )) AS codeAPName,
+                     (SELECT GROUP_CONCAT( CONCAT(
+                        "{",  bom_volume,  ",", box_long, ",", box_wide, ",", box_high, ",", rough_weight, ",", net_weight",",pack_quantity,"}"
+                                         )) FROM pack_detail WHERE 	FIND_IN_SET(id,GROUP_CONCAT( t1.id )) ) AS dataJsonList,
                      sum(t1.pack_quantity)                                 packQuantity,
                      sum(t1.net_weight)                                    netWeight,
                      sum(t1.rough_weight)                                  roughWeight,