仓库修改

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java

@@ -145,6 +145,9 @@ public class OssEndpoint{
 	@PostMapping("/put-file")
 	public R<BladeFile> putFile(@RequestParam MultipartFile file) {
 		BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
+		String link = bladeFile.getLink();
+		String replace = link.replace("http://121.37.83.47:9000/", "https://trade.tubaosoft.com/file/");
+		bladeFile.setLink(replace);
 		return R.data(bladeFile);
 	}
 

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -337,4 +337,7 @@ public class Delivery implements Serializable {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "仓库中文名")
 	private String storageName;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "仓库中文名")
+	private Map<Object,Object> storageMap;
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderFreight.java

@@ -51,6 +51,11 @@ public class OrderFreight implements Serializable {
 		@ApiModelProperty(value = "主表id")
 		private Long pid;
 	/**
+	 * 箱型
+	 */
+		@ApiModelProperty(value = "箱型")
+		private String boxPile;
+	/**
 	* 船公司
 	*/
 		@ApiModelProperty(value = "船公司")

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -28,6 +28,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * User Feign接口类
  *
@@ -46,6 +49,7 @@ public interface IUserClient {
 	String USER_AUTH_INFO = API_PREFIX + "/user-auth-info";
 	String SAVE_USER = API_PREFIX + "/save-user";
 	String REMOVE_USER = API_PREFIX + "/remove-user";
+	String GAIN_USER = API_PREFIX + "/gainUser";
 
 	/**
 	 * 获取用户信息
@@ -114,5 +118,10 @@ public interface IUserClient {
 	 */
 	@PostMapping(REMOVE_USER)
 	R<Boolean> removeUser(@RequestParam("tenantIds") String tenantIds);
+	/**
+	 * 根据租户id获取用户信息
+	 */
+	@GetMapping(GAIN_USER)
+	R<List<Map<String,Object>>> gainUser();
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -22,10 +22,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.feign.ICorpsDescClient;
-import org.springblade.client.feign.IFeesDescClient;
-import org.springblade.client.feign.IGoodsDescClient;
-import org.springblade.client.feign.ISerialClient;
+import org.springblade.client.entity.StorageDesc;
+import org.springblade.client.feign.*;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -54,6 +52,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -74,6 +73,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private IStockGoodsClient stockGoodsClient;
 	private IOrderItemsClient iOrderItemsClient;
+	private IStorageClient iStorageClient;//库区信息
 
 	private final DeliveryItemsServiceImpl iDeliveryItemsService;
 
@@ -136,7 +136,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			selectById.setCreateUserName(createUser.getData().getName());
 		}
 		//获取客户中文名
-		//获取客户中文名
 		if (selectById.getCorpId() != null){
 			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(selectById.getCorpId().toString());
 			if (corpMessage.isSuccess() && corpMessage.getData() != null){
@@ -158,8 +157,18 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				selectById.setCompanyName(corpMessage.getData());
 			}
 		}
-
-		//获取销售客户中文名
+		//获取仓库信息
+		if (selectById.getStorageId() != null){
+			Map<Object,Object> map = new HashMap<>();
+			//仓库信息
+			StorageDesc storageDesc = iStorageClient.findById(selectById.getStorageId());
+			if(storageDesc!=null)
+			{
+				map.put(selectById.getStorageId(),storageDesc.getCname());
+				selectById.setStorageName(storageDesc.getCname());
+			}
+			selectById.setStorageMap(map);
+		}
 		//获取发货明细表数据
 		List<DeliveryItems> deliveryItemsList = deliveryItemsService.getDeliveryItems(delivery);
 		selectById.setDeliveryItemsList(deliveryItemsList);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderFreightMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="orderFreightResultMap" type="org.springblade.purchase.sales.entity.OrderFreight">
         <id column="id" property="id"/>
         <result column="pid" property="pid"/>
+        <result column="box_pile" property="boxPile"/>
         <result column="shipping_house" property="shippingHouse"/>
         <result column="sail_schedule" property="sailSchedule"/>
         <result column="ocean_freight" property="oceanFreight"/>

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -18,6 +18,7 @@ package org.springblade.system.user.feign;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -31,6 +32,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 用户服务Feign实现类
  *
@@ -85,4 +89,10 @@ public class UserClient implements IUserClient {
 		return R.data(service.remove(Wrappers.<User>query().lambda().in(User::getTenantId, Func.toStrList(tenantIds))));
 	}
 
+	@Override
+	@GetMapping(GAIN_USER)
+	public R<List<Map<String, Object>>> gainUser() {
+		return R.data(service.gainUser(SecureUtil.getTenantId()));
+	}
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -24,6 +24,7 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper 接口
@@ -60,4 +61,11 @@ public interface UserMapper extends BaseMapper<User> {
 	 */
 	List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
 
+	/**
+	 * 根据租户获取用户信息
+	 * @param tenantId
+	 * @return
+	 */
+	List<Map<String,Object>>  gainUser(@Param("tenantId")String tenantId);
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -72,5 +72,16 @@
     <select id="exportUser" resultType="org.springblade.system.user.excel.UserExcel">
         SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
     </select>
+    <select id="gainUser" resultType="map">
+         SELECT
+            id,
+            account
+        FROM
+            blade_user
+        WHERE
+            tenant_id = #{param1}
+            and is_deleted = 0
+            AND account IS NOT NULL
+    </select>
 
 </mapper>

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -29,6 +29,7 @@ import org.springblade.system.user.excel.UserExcel;
 import org.springblade.system.user.vo.UserVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -205,4 +206,11 @@ public interface IUserService extends BaseService<User> {
 	 * @return
 	 */
 	UserVO platformDetail(User user);
+
+	/**
+	 * 根据租户id获取用户信息
+	 * @param tenantId
+	 * @return
+	 */
+	List<Map<String,Object>> gainUser(String tenantId);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -54,10 +54,7 @@ import org.springblade.system.user.wrapper.UserWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
 
@@ -426,4 +423,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		return userVO;
 	}
 
+	@Override
+	public List<Map<String, Object>> gainUser(String tenantId) {
+		return baseMapper.gainUser(tenantId);
+	}
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/ShippingEnquiry.java

@@ -261,11 +261,11 @@ public class ShippingEnquiry extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 出口采购询价
+	 * 提交船务询价
 	 */
 	@PostMapping("/commit")
 	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入order")
+	@ApiOperation(value = "提交船务询价", notes = "传入order")
 	public R<OrderSubmitDto> commit(@Valid @RequestBody OrderSubmitDto submitDto) {
 		if (StringUtils.isNotBlank(submitDto.getIfShipping()) && submitDto.getIfShipping().equals("船务确认")){
 			throw new RuntimeException("请勿重复提交");