订单优化

sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuSpecVo.java

@@ -17,6 +17,11 @@ import java.util.List;
 public class SkuSpecVo extends SkuSpec {
 
     /**
+     * bom规格编码
+     */
+    private String bomSpecCode;
+
+    /**
      * bom规格名称
      */
     private String bomSpecName;

sd-business/src/main/java/com/sd/business/service/sku/impl/SkuServiceImpl.java

@@ -141,6 +141,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
             if (bomSpecId != null) {
                 BomSpec bomSpec = bomSpecMap.get(bomSpecId);
                 if (bomSpec != null) {
+                    item.setBomSpecCode(bomSpec.getCode());
                     item.setBomSpecName(bomSpec.getName());
                 }
             }

sd-wln/src/main/java/com/sd/wln/context/OrderContext.java

@@ -187,6 +187,7 @@ public class OrderContext {
     public Map<Long, Map<Integer, List<SkuSpecLink>>> getSkuSpecLinkBomSpecMap() {
 
         if (skuSpecLinkBomSpecMap == null) {
+
             if (department == null) {
                 skuSpecLinkBomSpecMap = Collections.emptyMap();
                 return skuSpecLinkBomSpecMap;

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -8,6 +8,7 @@ import com.fjhx.tenant.entity.dict.po.DictCommonData;
 import com.fjhx.tenant.service.dict.DictCommonDataService;
 import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.framework.mybatis.holder.LogicHolder;
 import com.sd.business.entity.bom.bo.BomSpecBo;
 import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.order.enums.OrderExceptionTypeEnum;
@@ -65,6 +66,8 @@ public class WlnOrderServiceImpl implements WlnOrderService {
     @Override
     public void syncOrder() {
 
+        LogicHolder.setLogicHolder(false);
+
         List<DictCommonData> warehouseCodeList = dictCommonDataService.list(q -> q.eq(DictCommonData::getDictCode, "warehouse_code"));
         if (warehouseCodeList.size() == 0) {
             log.error("订单同步失败，仓库字典:warehouse_code 为空");
@@ -129,6 +132,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
         }
 
+        LogicHolder.clear();
     }
 
     /**