产品名称升序

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

@@ -1137,6 +1137,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             if (notArr.size() != 0) {
                 throw new ServiceException("以下产品不存在：" + notArr.stream().collect(Collectors.joining(",")));
             }
+
+            //名称升序
+            Collections.sort(excelBoList, Comparator.comparing(IssueImportExcelBo::getProductName));
         }
         return excelBoList;
     }

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -21,6 +21,7 @@ import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.item.entity.product.IssueImportExcelBo;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.item.util.excel.util.ExcelUtil;
@@ -479,6 +480,10 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
                 }
             }
         }
+
+        //名称升序
+        Collections.sort(purchaseDetailList, Comparator.comparing(PurchaseDetail::getProductName));
+
         result.setPurchaseDetailList(purchaseDetailList);
         return result;
     }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
+import com.fjhx.item.entity.product.IssueImportExcelBo;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -37,9 +38,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -114,6 +113,11 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
                 }
             }
         }
+
+
+        //名称升序
+        Collections.sort(subscribeDetailList, Comparator.comparing(SubscribeDetail::getProductName));
+
         subscribe.setSubscribeDetailList(subscribeDetailList);
         return subscribe;
     }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -66,9 +66,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -476,6 +474,9 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
             purchaseDetailVo.setReceiptList(stockJournalDetailsVos);
         }
 
+        //名称升序
+        Collections.sort(purchaseDetailList, Comparator.comparing(PurchaseDetail::getProductName));
+
         result.setPurchaseDetailVoList(purchaseDetailVoList);
         return result;
     }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/group/impl/GroupRecordDetailsServiceImpl.java

@@ -112,6 +112,10 @@ public class GroupRecordDetailsServiceImpl extends ServiceImpl<GroupRecordDetail
             item.setProductName(product.getName());
             item.setProductSpec(product.getSpec());
         });
+
+        //名称升序
+        Collections.sort(groupRecordDetails, Comparator.comparing(GroupRecordDetailsVo::getProductName));
+
         return groupRecordDetails;
     }
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/initializers/JdInitializer.java

@@ -1,5 +1,6 @@
 package com.fjhx.victoriatourist.service.jd.initializers;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.fjhx.victoriatourist.service.jd.JdApiService;
 import org.springframework.stereotype.Component;
 
@@ -8,6 +9,7 @@ import javax.annotation.Resource;
 
 /**
  * 京东初始化类
+ *
  * @author hj
  * @date 2023/12/21 9:11
  */
@@ -17,25 +19,28 @@ public class JdInitializer {
     private JdApiService jdApiService;
 
 
-
     /**
      * 数据初始化
+     *
      * @author hj
      * @date 2023/12/19 21:15
      */
     @PostConstruct
     public void dataInitializer() {
         // 初始化数据的代码
+        if (!"prod".equals(SpringUtil.getActiveProfile())) {
+            return;
+        }
         //收集京东采购单
-//        jdApiService.startJdOrder();
+        jdApiService.startJdOrder();
         //收集京东退货单
-//        jdApiService.startJdBackOrder();
+        jdApiService.startJdBackOrder();
         //刷新京东订单状态与信息
-//        jdApiService.refreshJdState();
+        jdApiService.refreshJdState();
         //初始化字典
-//        jdApiService.initTenantDict();
+        jdApiService.initTenantDict();
         //补偿商品id为空
-//        jdApiService.compensatingProductNon();
+        jdApiService.compensatingProductNon();
 
     }
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -46,9 +46,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -231,6 +229,9 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
                 stockWaitDetails.setProductCustomCode(productInfo.getCustomCode());
                 stockWaitDetails.setProductSpec(productInfo.getSpec());
             }
+
+            //名称升序
+            Collections.sort(stockWaitDetailsVos, Comparator.comparing(StockWaitDetailsVo::getProductName));
         }
         result.setStockWaitDetailsList(stockWaitDetailsVos);
         //如果是采购退货 赋值采购退货信息