Revert "手动添加租户id"

This reverts commit 9479f81b1d1f31293f8e19dd00b956b4df7958d7.

code/src/test/java/MesDataSource.java

@@ -4,9 +4,9 @@ public class MesDataSource {
 
     public static void main(String[] args) {
         GeneratorApplication.builder()
-				.url(DataSourceInfo.URL)
-				.username(DataSourceInfo.USER_NAME)
-				.password(DataSourceInfo.PASSWORD)
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
                 .port(9989)
                 .module("hx-mes")
                 .parent("com.fjhx.mes")

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/po/Subscribe.java

@@ -90,10 +90,5 @@ public class Subscribe extends BasePo {
      */
     private Long corporationId;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
 
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/po/SubscribeDetail.java

@@ -70,11 +70,6 @@ public class SubscribeDetail extends BasePo {
     private Integer dataType;
 
     /**
-     * 租户id
-     */
-    private String tenantId;
-
-    /**
      * 货品类型
      */
     @TableField(exist = false)

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -55,13 +55,11 @@ public class SubscribeFlow extends FlowDelegate {
      */
     @Override
     public Long start(Long flowId, JSONObject submitData) {
-        String tenantId = SecurityUtils.getTenantId();
 
         SubscribeDto subscribe = submitData.toJavaObject(SubscribeDto.class);
         subscribe.setCode(codingRuleService.createCode(CodingRuleEnum.SUBSCRIBE.getKey(),null));
         subscribe.setSubcribeStatus(SubscribeStatusEnum.UNDER_REVIEW.getKey());
         subscribe.setFlowId(flowId);
-        subscribe.setTenantId(tenantId);
         subscribeService.save(subscribe);
 
         List<SubscribeDetail> SubscribeDetails = subscribe.getSubscribeDetailList();
@@ -69,7 +67,6 @@ public class SubscribeFlow extends FlowDelegate {
             SubscribeDetails.forEach(item -> {
                 item.setSubscribeId(subscribe.getId());
                 item.setDataType(0);
-                item.setTenantId(tenantId);
             });
             subscribeDetailService.saveBatch(SubscribeDetails);
         }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -429,14 +429,4 @@ public class Contract extends BasePo {
      */
     private Long companyId;
 
-    /**
-     * 订单下发状态
-     */
-    private Integer orderDistributeStatus;
-
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractProduct.java

@@ -73,30 +73,25 @@ public class ContractProduct extends BasePo {
      */
     private String packMethod;
     /**
-	 * 贸易方式
-	 */
-	private String tradeMethod;
-
-
-	/**
-	 * 生产源文件地址
-	 */
-	private String prodFilePath;
-
-	/**
-	 * 租户id
-	 */
-	private String tenantId;
-
-	/**
-	 * 附件列表
-	 */
-	@TableField(exist = false)
-	private List<ObsFile> fileList;
-
-	/**
-	 * 时间
-	 */
+     * 贸易方式
+     */
+    private String tradeMethod;
+
+
+    /**
+     * 生产源文件地址
+     */
+    private String prodFilePath;
+
+    /**
+     * 附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
+
+    /**
+     * 时间
+     */
     @TableField(exist = false)
     private String time;
 

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractProject.java

@@ -1,18 +1,18 @@
 package com.fjhx.sale.entity.contract.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import java.math.BigDecimal;
-
 /**
  * <p>
  * 外销合同-收费项目
  * </p>
  *
- * @author
+ * @author 
  * @since 2023-04-17
  */
 @Getter
@@ -41,9 +41,4 @@ public class ContractProject extends BasePo {
      */
     private String remark;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
 }

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchase.java

@@ -258,11 +258,6 @@ public class EhsdPurchase extends BasePo {
     private String sellPostalCode;
 
     /**
-     * 租户id
-     */
-    private String tenantId;
-
-    /**
      * 采购到货列表
      */
     @TableField(exist = false)

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchaseProduct.java

@@ -84,11 +84,6 @@ public class EhsdPurchaseProduct extends BasePo {
     private Long subscribeDetailId;
 
     /**
-     * 租户id
-     */
-    private String tenantId;
-
-    /**
      * 产品配件列表
      */
     @TableField(exist = false)

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

@@ -154,16 +154,14 @@ public class ContractFlow extends FlowDelegate {
         if (ObjectUtil.isEmpty(country)) {
             throw new ServiceException("归属公司不存在");
         }
-        String tenantId = country.getTenantId();
-        contract.setTenantId(tenantId);
+        SecurityUtils.setTenantId(country.getTenantId());
         contractService.saveOrUpdate(contract);
+        SecurityUtils.clearTenantId();
 
         // 保存合同产品
         List<ContractProduct> contractProductList = contract.getContractProductList();
         contractProductList = ObjectUtil.isEmpty(contractProductList) ? new ArrayList<>() : contractProductList;
         for (ContractProduct c : contractProductList) {
-            c.setTenantId(tenantId);
-
             //对新数据创建id
             c.setId(ObjectUtil.isEmpty(c.getId()) ? IdWorker.getId() : c.getId());
             //赋值合同Id
@@ -185,7 +183,6 @@ public class ContractFlow extends FlowDelegate {
         contractProjectList = ObjectUtil.isEmpty(contractProjectList) ? new ArrayList<>() : contractProjectList;
         for (ContractProject c : contractProjectList) {
             c.setContractId(contract.getId());
-            c.setTenantId(tenantId);
         }
         contractProjectService.editLinked(contractProjectList, ContractProject::getContractId, contract.getId());
 

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

@@ -103,7 +103,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 	 */
 	@Override
 	public Long start(Long flowId, JSONObject submitData) {
-
 		EhsdPurchaseDto purchase = submitData.toJavaObject(EhsdPurchaseDto.class);
 		purchase.setId(null);//清空id防止前端误传
 		purchase.setFlowId(flowId);//赋值流程id
@@ -145,9 +144,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 	 * 公共代码块--发起
 	 */
 	public EhsdPurchaseDto connStart(EhsdPurchaseDto purchase) {
-		String tenantId = SecurityUtils.getTenantId();
-		purchase.setTenantId(tenantId);
-
 		//赋值城市省份信息
 		CustomizeAreaUtil.setAreaId(purchase);
 		purchase.setSellCityId(purchase.getCityId());
@@ -171,7 +167,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 		for (EhsdPurchaseProduct s : purchaseProductList) {
 			s.setId(ObjectUtils.isNotEmpty(s.getId()) ? s.getId() : IdWorker.getId());
 			s.setPurchaseId(purchase.getId());
-			s.setTenantId(tenantId);
 		}
 		//修改或删除数据
 		purchaseProductService.editLinked(purchaseProductList, EhsdPurchaseProduct::getPurchaseId, purchase.getId());
@@ -257,7 +252,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 
 
 		//采购审批通过 生成待入库数据
-		String tenantId = SecurityUtils.getTenantId();
 		StockWait stockWait = new StockWait();
 		stockWait.setType(1);
 		stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());
@@ -265,7 +259,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 		stockWait.setBusinessCode(purchase.getCode());
 		stockWait.setStatus(0);
 		stockWait.setPurchaseId(purchase.getId());
-		stockWait.setTenantId(tenantId);
 		stockWaitService.save(stockWait);
 		List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
 		for (EhsdPurchaseProduct purchaseProduct : purchaseProductList) {
@@ -278,8 +271,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 			stockWaitDetails.setQuantity(purchaseProduct.getQuantity());
 			stockWaitDetails.setStatus(0);
 
-			stockWaitDetails.setTenantId(tenantId);
-
 			stockWaitDetailsList.add(stockWaitDetails);
 		}
 		stockWaitDetailsService.saveBatch(stockWaitDetailsList);

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWait.java

@@ -48,9 +48,4 @@ public class StockWait extends BasePo {
      */
     private Long purchaseId;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWaitDetails.java

@@ -60,9 +60,4 @@ public class StockWaitDetails extends BasePo {
      */
     private Long purchaseDetailId;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
 }