2024年3月29日17:48:51

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/vessels/entity/BVessels.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.los.basic.utils.ExtendedData;
+import org.springblade.los.utils.LosSpecialHandle;
 
 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
@@ -99,6 +100,7 @@ public class BVessels implements Serializable {
 	 */
 	@ApiModelProperty(value = "中文船名")
 	@NotEmpty(message = "中文船名不能为空")
+	@LosSpecialHandle(massage = "中文船名", space = true, conversion = true)
 	private String cnName;
 	/**
 	 * 英文船名
@@ -184,7 +186,7 @@ public class BVessels implements Serializable {
 	/**
 	 * 是否已删除（0 否 1是）
 	 */
-	@TableLogic(value = "0",delval = "1")
+	@TableLogic(value = "0", delval = "1")
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
 	private Integer isDeleted;
 	/**

blade-service/blade-los/src/main/java/org/springblade/los/Util/LosSpecialHandle.java → blade-service-api/blade-los-api/src/main/java/org/springblade/los/utils/LosSpecialHandle.java

@@ -1,4 +1,4 @@
-package org.springblade.los.Util;
+package org.springblade.los.utils;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

blade-service/blade-los/src/main/java/org/springblade/los/Util/Regular_INTTRA.java

@@ -1129,7 +1129,7 @@ public class Regular_INTTRA {
 						msg += "箱量,";
 					}
 					//冷藏通风量
-					if (ObjectUtils.isNotNull(map1.get("ventilation").toString())) {
+					if (ObjectUtils.isNotNull(map1.get("ventilation"))) {
 						Map<String, String> mapString = RegularUtils.regularEn(map1.get("ventilation").toString(), true);
 						if ("200".equals(mapString.get("code"))) {
 							if (RegularUtils.regularLength(mapString.get("susscess"), 18)) {

blade-service/blade-los/src/main/java/org/springblade/los/Util/StringTools.java

@@ -2,6 +2,7 @@ package org.springblade.los.Util;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import org.apache.poi.ss.formula.functions.T;
+import org.springblade.los.utils.LosSpecialHandle;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -12,24 +13,14 @@ import java.lang.reflect.Field;
  */
 public class StringTools {
 
-
 	/**
 	 * 字符串英文字母转换成大写并去除前后空格
 	 *
 	 * @param data 字符串
 	 * @return 结果
 	 */
-	public static String handle(String data) {
-		if (ObjectUtils.isNotNull(data)) {
-			return data.trim().toLowerCase();
-		} else {
-			return data;
-		}
-	}
-
-	public static T a(T data) throws Exception {
-		Class<?> inttraSoDtoClass = data.getClass();
-
+	public static Object handle(Object data) throws Exception {
+		Class<?> inttraSoDtoClass = Object.class;
 		Field[] fileds = inttraSoDtoClass.getDeclaredFields();
 		for (Field field : fileds) {
 			String name = field.getName();

blade-service/blade-los/src/main/java/org/springblade/los/basic/vessels/controller/BVesselsController.java

@@ -163,7 +163,7 @@ public class BVesselsController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入bVessels")
-	public R submit(@Valid @RequestBody BVessels bVessels) {
+	public R submit(@Valid @RequestBody BVessels bVessels) throws Exception{
 		return bVesselsService.submit(bVessels);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/basic/vessels/service/IBVesselsService.java

@@ -47,7 +47,7 @@ public interface IBVesselsService extends IService<BVessels> {
 	 * @param bVessels
 	 * @return
 	 */
-	R submit(BVessels bVessels);
+	R submit(BVessels bVessels)throws Exception;
 
 	/**
 	 * 导入 基础资料-船名

blade-service/blade-los/src/main/java/org/springblade/los/basic/vessels/service/impl/BVesselsServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.basic.vessels.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -29,12 +30,11 @@ import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.Util.StringTools;
 import org.springblade.los.basic.corps.entity.BCorps;
 import org.springblade.los.basic.corps.service.IBCorpsService;
-import org.springblade.los.basic.units.entity.BUnits;
-import org.springblade.los.excel.BVesselsExcel;
 import org.springblade.los.basic.vessels.entity.BVessels;
 import org.springblade.los.basic.vessels.mapper.VesselsMapper;
 import org.springblade.los.basic.vessels.service.IBVesselsService;
 import org.springblade.los.basic.vessels.vo.BVesselsVO;
+import org.springblade.los.excel.BVesselsExcel;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,12 +66,43 @@ public class BVesselsServiceImpl extends ServiceImpl<VesselsMapper, BVessels> im
 	}
 
 	@Override
-	public R submit(BVessels bVessels) {
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	public R submit(BVessels bVessels) throws Exception {
+		/*System.out.println("中文船名:" + bVessels.getCnName());
+		Object object = StringTools.handle(bVessels);
+		BVessels detail = JSONObject.parseObject(JSONObject.toJSONString(object), BVessels.class);
+		System.out.println("中文船名:" + detail.getCnName());
+		if (detail.getId() == null) {
+			detail.setCreateTime(new Date());
+			detail.setCreateUser(AuthUtil.getUserId());
+			detail.setCreateUserName(AuthUtil.getUserName());
+			if (baseMapper.selectCount(new LambdaQueryWrapper<BVessels>()
+				.eq(BVessels::getTenantId, AuthUtil.getTenantId())
+				.eq(BVessels::getIsDeleted, 0)
+
+				.eq(BVessels::getCnName, detail.getCnName())) > 0) {
+				throw new RuntimeException("船名已存在");
+			}
+			//获取部门ids对应中文名
+			if (ObjectUtils.isNotNull(deptUtils.getDeptPid() + "")) {
+				detail.setCreateDept(AuthUtil.getDeptId());
+				R<List<String>> res = sysClient.getDeptNames(AuthUtil.getDeptId());
+				if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+					detail.setCreateDeptName(String.join(",", res.getData()));
+				}
+			}
+		} else {
+			detail.setUpdateUser(AuthUtil.getUserId());
+			detail.setUpdateTime(new Date());
+			detail.setUpdateUserName(AuthUtil.getUserName());
+		}
+		this.saveOrUpdate(detail);
+		return R.data(detail);*/
 		if (bVessels.getId() == null) {
 			bVessels.setCreateTime(new Date());
 			bVessels.setCreateUser(AuthUtil.getUserId());
 			bVessels.setCreateUserName(AuthUtil.getUserName());
-			bVessels.setCnName(StringTools.handle(bVessels.getCnName()));
 			if (baseMapper.selectCount(new LambdaQueryWrapper<BVessels>()
 				.eq(BVessels::getTenantId, AuthUtil.getTenantId())
 				.eq(BVessels::getIsDeleted, 0)
@@ -80,7 +111,7 @@ public class BVesselsServiceImpl extends ServiceImpl<VesselsMapper, BVessels> im
 				throw new RuntimeException("船名已存在");
 			}
 			//获取部门ids对应中文名
-			if (ObjectUtils.isNotNull(deptUtils.getDeptPid()+"")) {
+			if (ObjectUtils.isNotNull(deptUtils.getDeptPid() + "")) {
 				bVessels.setCreateDept(AuthUtil.getDeptId());
 				R<List<String>> res = sysClient.getDeptNames(AuthUtil.getDeptId());
 				if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {

blade-service/blade-los/src/main/java/org/springblade/los/edi/service/impl/EdiTypesServiceImpl.java

@@ -430,12 +430,12 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				map.put("cntrQty", item.getQuantity());
 				map.put("isSoc", item.getIsSoc());
 				map.put("rawTemperature", item.getTemperature());
-				map.put("temperature", RegularUtils.formatTempNumber(item.getTemperature(), 3));
+//				map.put("temperature", RegularUtils.formatTempNumber(item.getTemperature(), 3));
 				map.put("temperatureUnit", item.getTemperatureUnit());
 				map.put("rawVentilation", item.getVentilation());
-				map.put("ventilation", RegularUtils.formatTempNumber(item.getVentilation(), 3));
+//				map.put("ventilation", RegularUtils.formatTempNumber(item.getVentilation(), 3));
 				map.put("rawHumidity", item.getHumidity());
-				map.put("humidity", RegularUtils.formatTempNumber(item.getHumidity(), 3));
+//				map.put("humidity", RegularUtils.formatTempNumber(item.getHumidity(), 3));
 
 				map.put("pkgs", item.getNumber());
 				map.put("grossWeight", item.getGrossWeight());
@@ -495,10 +495,10 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				map.put("isSoc", item.getIsSoc());
 				PreContainers preContainers = preContainersList.stream().filter(e -> e.getCntrTypeCode().equals(item.getCntrTypeCode())).findFirst().orElse(null);
 				if (preContainers != null) {
-					map.put("temperature", RegularUtils.formatTempNumber(preContainers.getTemperature(), 3));
+//					map.put("temperature", RegularUtils.formatTempNumber(preContainers.getTemperature(), 3));
 					map.put("temperatureUnit", preContainers.getTemperatureUnit());
-					map.put("ventilation", RegularUtils.formatTempNumber(preContainers.getVentilation(), 3));
-					map.put("humidity", RegularUtils.formatTempNumber(preContainers.getHumidity(), 3));
+//					map.put("ventilation", RegularUtils.formatTempNumber(preContainers.getVentilation(), 3));
+//					map.put("humidity", RegularUtils.formatTempNumber(preContainers.getHumidity(), 3));
 				}else{
 					map.put("temperature", "");
 					map.put("temperatureUnit", "");

blade-service/blade-los/src/main/java/org/springblade/los/ftp/utils/ftp/FTPUtil.java

@@ -426,7 +426,6 @@ public class FTPUtil {
 	public UploadStatus uploadFile(String remoteFile, File localFile, FTPClient ftpClient, long remoteSize) {
 		if (null == ftpClient) {
 			ftpClient = ftpPoolService.borrowObject();
-			;
 		}
 		if (null == ftpClient) {
 			return null;

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsDescController.java

@@ -431,6 +431,14 @@ public class CorpsDescController extends BladeController {
 	}
 
 	/**
+	 * app客户详情
+	 */
+	@GetMapping("/appDetailsV1")
+	public R appDetailsV1(Long id) {
+		return corpsDescService.appDetailsV1(id);
+	}
+
+	/**
 	 * 是否存在
 	 */
 	@GetMapping("/whetherExistence")

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/ICorpsDescService.java

@@ -118,4 +118,6 @@ public interface ICorpsDescService extends IService<PjCorpsDesc> {
 	List<PjCorpsDesc> selectPartsCorpsDesc(PjCorpsDesc corpsDescDto);
 
 	R saveCorpsDescApp(PjCorpsDesc corpsDesc);
+
+	R appDetailsV1(Long id);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -47,14 +46,10 @@ import org.springblade.system.user.entity.UserInfo;
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.feign.IUserClient;
 import org.springblade.weChat.feign.IWechatClient;
-import org.springblade.weChat.message.dto.WxMpTemplateDto;
-import org.springblade.weChat.message.entity.WechatMessageConfigurationItem;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -840,6 +835,44 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		return R.data(corpsDesc);
 	}
 
+	@Override
+	public R appDetailsV1(Long id) {
+		PjCorpsDesc corpsDesc = baseMapper.selectById(id);
+		if (ObjectUtils.isNotNull(corpsDesc)) {
+			PjCorpsAddr corpsAddr = corpsAddrService.getOne(new LambdaQueryWrapper<PjCorpsAddr>().eq(PjCorpsAddr::getIsDeleted, 0)
+				.eq(PjCorpsAddr::getTenantId, AuthUtil.getTenantId())
+				.eq(PjCorpsAddr::getPid, corpsDesc.getId())
+				.eq(PjCorpsAddr::getDefaultAddres, "1"));
+			if (ObjectUtils.isNotNull(corpsAddr)) {
+				corpsDesc.setAddr(corpsAddr.getBelongtoarea());
+				corpsDesc.setDetails(corpsAddr.getDetailedAddress());
+			}
+			PjCorpsAttn pjCorpsAttn = corpsAttnService.getOne(new LambdaQueryWrapper<PjCorpsAttn>().eq(PjCorpsAttn::getIsDeleted, 0)
+				.eq(PjCorpsAttn::getTenantId, AuthUtil.getTenantId())
+				.eq(PjCorpsAttn::getPid, corpsDesc.getId())
+				.eq(PjCorpsAttn::getTel, corpsDesc.getTel()));
+			if (ObjectUtils.isNotNull(pjCorpsAttn)) {
+				corpsDesc.setAttn(pjCorpsAttn.getCname());
+				corpsDesc.setTel(pjCorpsAttn.getTel());
+			}
+			//获取客户类别
+			List<String> longs = corpsTypeDescMapper.selectTypeId(corpsDesc.getId());
+			corpsDesc.setCorpsTypeId(String.join(",", longs));
+			StringBuilder corpsTypeName = new StringBuilder();
+			if (ObjectUtils.isNotNull(longs)) {
+				for (String item : longs) {
+					String name = corpsTypeMapper.selectById(Long.parseLong(item)) == null ? "" : corpsTypeMapper.selectById(Long.parseLong(item)).getCname();
+					corpsTypeName.append(name).append(",");
+				}
+				String corpsName = corpsTypeName.substring(0, corpsTypeName.length() - 1);
+				corpsDesc.setCorpsTypeName(corpsName);
+			} else {
+				corpsDesc.setCorpsTypeName("");
+			}
+		}
+		return R.data(corpsDesc);
+	}
+
 	/**
 	 * 小程序新增或修改 客户详情
 	 *

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -689,13 +689,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						stockDesc.setGoodsTypeName(goodsType.getCname());
 					}
 				}
-				//获得仓库
-				if (ObjectUtil.isNotEmpty(storageDesc)) {
-					stockDesc.setStorageId(storageDesc.getId());
-					stockDesc.setStorageName(storageDesc.getCname());
-				} else {
-					throw new RuntimeException("仓库数据异常");
-				}
 				stockDesc.setGoodsId(goodsDesc.getId());
 				stockDesc.setCode(e.getGoodsNo());
 				stockDesc.setCname(goodsDesc.getCname());
@@ -714,17 +707,24 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					}
 					if (!finalPjStockDescList.isEmpty()) {
 						stockOne = finalPjStockDescList.stream().filter(i -> i.getGoodsId().equals(goodsDesc.getId())
-							&& i.getStorageId().equals(gdShip.getStorageId())
+							&& i.getStorageId().equals(pjOrder.getStorageId())
 							&& ObjectUtils.isNotNull(i.getDot()) && i.getDot().equals(e.getDot())).findFirst().orElse(null);
 					}
 				} else {
 					if (!finalPjStockDescList.isEmpty()) {
 						stockOne = finalPjStockDescList.stream().filter(i -> i.getGoodsId().equals(goodsDesc.getId())
-							&& i.getStorageId().equals(gdShip.getStorageId())
+							&& i.getStorageId().equals(pjOrder.getStorageId())
 							&& "".equals(i.getDot()) || i.getDot() == null).findFirst().orElse(null);
 					}
 				}
 				if (ObjectUtil.isEmpty(stockOne)) {
+					//获得仓库
+					if (ObjectUtil.isNotEmpty(storageDesc)) {
+						stockDesc.setStorageId(storageDesc.getId());
+						stockDesc.setStorageName(storageDesc.getCname());
+					} else {
+						throw new RuntimeException("仓库数据异常");
+					}
 					stockDesc.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 					stockDesc.setCreateTime(new Date());
 					stockDesc.setCreateUser(AuthUtil.getUserId());
@@ -751,7 +751,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				}
 				pjStockDescListAll.add(stockDesc);
 				/* ----------------------修改上架库存---------------------- */
-				BigDecimal balanceQuantity = new BigDecimal("0.00");
+				/*BigDecimal balanceQuantity = new BigDecimal("0.00");
 				if (!finalPjStockDescList.isEmpty()) {
 					//查询所有该商品的库存
 					List<PjStockDesc> stockDescList = finalPjStockDescList.stream().filter(i -> i.getGoodsId().equals(e.getGoodsId())).collect(Collectors.toList());
@@ -772,8 +772,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						item.setInventory(finalBalanceQuantity);
 						pjProductLaunchList.add(item);
 					});
+				}*/
+				PjProductLaunch productLaunch = finalPjProductLaunch.stream()
+					.filter(i -> i.getGoodsId().equals(e.getGoodsId())).findFirst().orElse(null);
+				//修改上架数量
+				if (productLaunch != null) {
+					productLaunch.setInventory(productLaunch.getInventory().add(e.getGoodsNum()));
+					pjProductLaunchList.add(productLaunch);
 				}
-
 				/* ----------------------修改上架库存---------------------- */
 			});
 			R res = productLaunchService.updateBatchById(pjProductLaunchList);
@@ -1122,7 +1128,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				}
 				StringBuilder goodsName = new StringBuilder();
 				StringBuilder retrieval = new StringBuilder();
-				List<Long> goodsId = order.getOrderItemsList().stream().map(PjOrderItems::getGoodsId).collect(Collectors.toList());
+				List<Long> goodsId = order.getOrderItemsList().stream().map(PjOrderItems::getGoodsId).distinct().collect(Collectors.toList());
+				if (goodsId.size() != order.getOrderItemsList().size()) {
+					throw new RuntimeException("明细存在重复商品，请修改明细数据");
+				}
 				List<PjStockDesc> pjStockDescList = stockDescService.list(new LambdaQueryWrapper<PjStockDesc>()
 					.eq(ObjectUtils.isNotNull(order.getStorageId()), PjStockDesc::getStorageId, order.getStorageId())
 					.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -378,7 +378,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				//给角色为派工的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), item.getSalesCompanyId()+"");
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), item.getSalesCompanyId() + "");
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -409,7 +409,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "客服");
 			StringBuilder openIds = new StringBuilder();
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), rwShip.getSalesCompanyId()+"");
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), rwShip.getSalesCompanyId() + "");
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
@@ -914,7 +914,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				//给角色为派工的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), item.getSalesCompanyId()+"");
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), item.getSalesCompanyId() + "");
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -1044,12 +1044,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						stockDesc.setGoodsTypeName(goodsType.getCname());
 					}
 				}
-				if (ObjectUtil.isNotEmpty(storageDesc)) {
-					stockDesc.setStorageId(storageDesc.getId());
-					stockDesc.setStorageName(storageDesc.getCname());
-				} else {
-					throw new RuntimeException("仓库数据异常");
-				}
 				stockDesc.setGoodsId(goodsDesc.getId());
 				stockDesc.setCode(item.getGoodsNo());
 				stockDesc.setCname(goodsDesc.getCname());
@@ -1076,6 +1070,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 							&& ObjectUtils.isNull(e.getDot())).findFirst().orElse(null);
 				}
 				if (stockOne == null) {
+					if (ObjectUtil.isNotEmpty(storageDesc)) {
+						stockDesc.setStorageId(storageDesc.getId());
+						stockDesc.setStorageName(storageDesc.getCname());
+					} else {
+						throw new RuntimeException("仓库数据异常");
+					}
 					stockDesc.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 					stockDesc.setCreateTime(new Date());
 					stockDesc.setCreateUser(AuthUtil.getUserId());
@@ -1125,7 +1125,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					throw new RuntimeException("商品数据异常");
 				}
 				/* ----------------------修改上架库存---------------------- */
-				List<PjStockDesc> stockDescList = pjStockDescList.stream().filter(e -> e.getGoodsId().equals(goodsDesc.getId())).collect(Collectors.toList());
+			/*	List<PjStockDesc> stockDescList = pjStockDescList.stream().filter(e -> e.getGoodsId().equals(goodsDesc.getId())).collect(Collectors.toList());
 
 				//库存总数量
 				BigDecimal balanceQuantity = stockDescList.stream().map(PjStockDesc::getBalanceQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1138,8 +1138,14 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						e.setInventory(balanceQuantity);
 						pjProductLaunchList.add(e);
 					}
+				}*/
+				PjProductLaunch pjProductLaunches = productLaunch.stream()
+					.filter(i -> i.getGoodsId().equals(goodsDesc.getId())).findFirst().orElse(null);
+				//修改上架数量
+				if (pjProductLaunches != null) {
+					pjProductLaunches.setInventory(pjProductLaunches.getInventory().add(item.getSendNum()));
+					pjProductLaunchList.add(pjProductLaunches);
 				}
-
 				/* ----------------------修改上架库存---------------------- */
 			}
 			R res = productLaunchService.updateBatchById(pjProductLaunchList);
@@ -1476,7 +1482,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 
 			for (PjShipItems item : ship.getShipItemsList()) {
 				/* ----------------------修改上架库存---------------------- */
-				List<PjStockDesc> stockDescList = pjStockDescList.stream().filter(e -> e.getGoodsId().equals(item.getGoodsId())).collect(Collectors.toList());
+//				List<PjStockDesc> stockDescList = pjStockDescList.stream().filter(e -> e.getGoodsId().equals(item.getGoodsId())).collect(Collectors.toList());
 				PjOrderItems orderItems = pjOrderItems.stream().filter(e -> e.getId().equals(item.getSrcItemId())).findFirst().orElse(null);
 				if (orderItems != null) {
 					orderItems.setSendNum(orderItems.getSendNum().subtract(item.getSendNum()));
@@ -1485,7 +1491,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					throw new RuntimeException("数据异常请联系管理员");
 				}
 
-				//库存总数量
+				/*//库存总数量
 				BigDecimal balanceQuantity = stockDescList.stream().map(PjStockDesc::getBalanceQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 
 				List<PjProductLaunch> pjProductLaunches = productLaunch.stream().filter(e -> e.getGoodsId().equals(item.getGoodsId())).collect(Collectors.toList());
@@ -1495,6 +1501,13 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						e.setInventory(balanceQuantity);
 						pjProductLaunchList.add(e);
 					}
+				}*/
+				PjProductLaunch pjProductLaunches = productLaunch.stream()
+					.filter(i -> i.getGoodsId().equals(item.getId())).findFirst().orElse(null);
+				//修改上架数量
+				if (pjProductLaunches != null) {
+					pjProductLaunches.setInventory(pjProductLaunches.getInventory().subtract(item.getSendNum()));
+					pjProductLaunchList.add(pjProductLaunches);
 				}
 				/* ----------------------修改上架库存---------------------- */
 			}

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

@@ -65,7 +65,7 @@ public class UserClient implements IUserClient {
 		userLambdaQueryWrapper
 			.eq(User::getIsDeleted, 0)
 			.apply("find_in_set('" + roleId + "',role_id)");
-		String status = sysClient.getParamServiceDWT("mall.data", tenantId);
+		String status = sysClient.getParamServiceByDept("mall.data", tenantId,salesCompanyId);
 		if (ObjectUtils.isNotNull(tenantId) && ObjectUtils.isNotNull(salesCompanyId)) {
 			if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 				userLambdaQueryWrapper.eq(User::getDeptId, salesCompanyId);