2024年12月6日17:03:52

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java

@@ -551,6 +551,12 @@ public class BCorps implements Serializable {
 	private BigDecimal maximumOutstandingDebt;
 
 	/**
+	 * 客户来源
+	 */
+	@ApiModelProperty(value = "客户来源")
+	private String corpSource;
+
+	/**
 	 * 客户更改授信等级记录
 	 */
 	@TableField(exist = false)

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1876,5 +1876,11 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private String hlclBoxenvoy;
 
+	/**
+	 * 排序类型
+	 */
+	@TableField(exist = false)
+	private String billSort;
+
 
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/feign/IPriceBankClient.java

@@ -5,6 +5,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.mocha.entity.PriceBank;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
@@ -20,6 +22,7 @@ import java.util.List;
 public interface IPriceBankClient {
 	String API_PREFIX = "/client";
 	String UPDATE_PRICE = API_PREFIX + "/updatePrice";
+	String UPDATE_PRICE_BANK = API_PREFIX + "/updatePriceBank";
 	String SELECT_BY_ID = API_PREFIX + "/selectById";
 	String SELECT_LIST = API_PREFIX + "/selectList";
 	String SELECT_BY_GOODS_ID = API_PREFIX + "/selectByGoodsId";
@@ -88,4 +91,11 @@ public interface IPriceBankClient {
 	@GetMapping(SELECT_BY_GOODS_ID)
 	List<PriceBank> selectByGoodsId(@RequestParam("goodsId") Long goodsId,@RequestParam("tenantId") String tenantId);
 
+	/**
+	 * 获得所有数据
+	 * @return
+	 */
+	@PostMapping(UPDATE_PRICE_BANK)
+	List<PriceBank> updatePriceBank(@RequestBody List<PriceBank> priceBank);
+
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -494,6 +494,11 @@ public class PjOrder implements Serializable {
 	 */
 	@ApiModelProperty(value = "保证金")
 	private BigDecimal bondAmount;
+	/**
+	 * 原保证金
+	 */
+	@ApiModelProperty(value = "原保证金")
+	private BigDecimal primaryBondAmount;
 
 	/**
 	 * 使用预付款

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.springblade.client.corps.excel.GoodsImportExcel;
 import org.springblade.client.corps.mapper.CorpsDescMapper;
@@ -44,6 +43,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.mocha.entity.PriceBank;
+import org.springblade.mocha.feign.IPriceBankClient;
 import org.springblade.salesPart.entity.PjBrandDesc;
 import org.springblade.salesPart.feign.IBrandClient;
 import org.springblade.system.user.entity.User;
@@ -84,6 +85,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	private final CorpsDescMapper corpsDescMapper;
 	private final IBrandClient brandClient;
 	private final IUserClient userClient;
+	private final IPriceBankClient priceBankClient;
 
 
 	@Override
@@ -387,6 +389,20 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			}
 
 		}
+		List<PriceBank> priceBankList = priceBankClient.selectByGoodsId(goodsDesc.getId(), AuthUtil.getTenantId());
+		if (!priceBankList.isEmpty()) {
+			for (PriceBank item : priceBankList) {
+				item.setCname(goodsDesc.getCname());//商品名
+				item.setEname(goodsDesc.getEname());
+				item.setItemId(goodsDesc.getId());//商品id
+				item.setCode(goodsDesc.getCode());//商品编码
+				item.setSpecs(goodsDesc.getTypeno());//商品中文规格
+				item.setCnameDescription(goodsDesc.getCnameDescription());//英文描述
+				item.setSupervisorUserIdGroup(goodsDesc.getSupervisorUserIdGroup());//分管员id组
+				item.setSupervisorUserNameGroup(goodsDesc.getSupervisorUserNameGroup());//分管员名组
+			}
+			priceBankClient.updatePriceBank(priceBankList);
+		}
 	}
 
 	@Override

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -125,6 +125,7 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getEnAddr()), BCorps::getEnAddr, bCorps.getEnAddr())
 			.like(ObjectUtils.isNotNull(bCorps.getCntyCode()), BCorps::getCntyCode, bCorps.getCntyCode())
 			.like(ObjectUtils.isNotNull(bCorps.getCntyName()), BCorps::getCntyName, bCorps.getCntyName())
+			.like(ObjectUtils.isNotNull(bCorps.getCorpSource()), BCorps::getCorpSource, bCorps.getCorpSource())
 			.like(ObjectUtils.isNotNull(bCorps.getTel()), BCorps::getTel, bCorps.getTel())
 			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles());
 		LambdaQueryWrapper<BCorpsTypeDefine> typeDefineLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -314,6 +315,7 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getEnAddr()), BCorps::getEnAddr, bCorps.getEnAddr())
 			.like(ObjectUtils.isNotNull(bCorps.getCntyCode()), BCorps::getCntyCode, bCorps.getCntyCode())
 			.like(ObjectUtils.isNotNull(bCorps.getCntyName()), BCorps::getCntyName, bCorps.getCntyName())
+			.like(ObjectUtils.isNotNull(bCorps.getCorpSource()), BCorps::getCorpSource, bCorps.getCorpSource())
 			.like(ObjectUtils.isNotNull(bCorps.getTel()), BCorps::getTel, bCorps.getTel())
 			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles())
 			.apply(ObjectUtils.isNotNull(bCorps.getCorpType()), "find_in_set('" + bCorps.getCorpType() + "',corp_type)");
@@ -390,6 +392,7 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getEnAddr()), BCorps::getEnAddr, bCorps.getEnAddr())
 			.like(ObjectUtils.isNotNull(bCorps.getCntyCode()), BCorps::getCntyCode, bCorps.getCntyCode())
 			.like(ObjectUtils.isNotNull(bCorps.getCntyName()), BCorps::getCntyName, bCorps.getCntyName())
+			.like(ObjectUtils.isNotNull(bCorps.getCorpSource()), BCorps::getCorpSource, bCorps.getCorpSource())
 			.and(ObjectUtils.isNotNull(bCorps.getShortName()), i -> i.like(BCorps::getCnName, bCorps.getShortName()).or()
 				.like(BCorps::getEnName, bCorps.getShortName()).or().like(BCorps::getCode, bCorps.getShortName())
 				.or().like(BCorps::getShortName, bCorps.getShortName()))

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -122,6 +122,8 @@ public class BillsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bills.getVoyageNo()), Bills::getVoyageNo, bills.getVoyageNo())
 			.and(ObjectUtils.isNotNull(bills.getCorpCnName()), i -> i.like(Bills::getCorpCnName, bills.getCorpCnName()).or()
 				.like(Bills::getCorpEnName, bills.getCorpCnName()))
+			.and(ObjectUtils.isNotNull(bills.getCorpAttnName()), i -> i.like(Bills::getCorpAttnName, bills.getCorpAttnName()).or()
+				.like(Bills::getCorpAttnTel, bills.getCorpAttnName()))
 			.and(ObjectUtils.isNotNull(bills.getCarrierCnName()), i -> i.like(Bills::getCarrierCnName, bills.getCarrierCnName()).or()
 				.like(Bills::getCarrierEnName, bills.getCarrierCnName()).or().like(Bills::getCarrierArgreementNo, bills.getCarrierCnName()))
 			.and(ObjectUtils.isNotNull(bills.getPodCnName()), i -> i.like(Bills::getPodCnName, bills.getPodCnName()).or()
@@ -175,9 +177,6 @@ public class BillsController extends BladeController {
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 				.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))
 			.eq(ObjectUtils.isNotNull(bills.getIssueType()), Bills::getIssueType, bills.getIssueType())
-//			.and(ObjectUtils.isNotNull(bills.getHconsigneeCnName()), i -> i.like(Bills::getHconsigneeCnName, bills.getHconsigneeCnName()).or()
-//				.like(Bills::getHconsigneeCode, bills.getHconsigneeCnName()).or().like(Bills::getHconsigneeEnName, bills.getHconsigneeCnName()))
-
 			.eq(ObjectUtils.isNotNull(bills.getBillType()), Bills::getBillType, bills.getBillType())
 			.eq(ObjectUtils.isNotNull(bills.getBusinessType()), Bills::getBusinessType, bills.getBusinessType())
 			.eq(ObjectUtils.isNotNull(bills.getSeaType()), Bills::getSeaType, bills.getSeaType())
@@ -185,9 +184,21 @@ public class BillsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bills.getAccountStatus()), Bills::getAccountStatus, bills.getAccountStatus())
 			.eq(ObjectUtils.isNotNull(bills.getStatus()), Bills::getStatus, bills.getStatus());
 		if ("SE".equals(bills.getBusinessType())) {
-			lambdaQueryWrapper.orderByDesc(Bills::getEtd);
+			if ("1".equals(bills.getBillSort())){
+				lambdaQueryWrapper.orderByDesc(Bills::getEtd);
+			}else if ("2".equals(bills.getBillSort())){
+				lambdaQueryWrapper.orderByDesc(Bills::getMblno);
+			}else{
+				lambdaQueryWrapper.orderByDesc(Bills::getEtd);
+			}
 		} else {
-			lambdaQueryWrapper.orderByDesc(Bills::getEta);
+			if ("1".equals(bills.getBillSort())){
+				lambdaQueryWrapper.orderByDesc(Bills::getEta);
+			}else if ("2".equals(bills.getBillSort())){
+				lambdaQueryWrapper.orderByDesc(Bills::getMblno);
+			}else{
+				lambdaQueryWrapper.orderByDesc(Bills::getEta);
+			}
 		}
 		IPage<Bills> pages = billsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (!pages.getRecords().isEmpty()){
@@ -296,8 +307,24 @@ public class BillsController extends BladeController {
 
 			.eq(ObjectUtils.isNotNull(bills.getMasterBillNo()), Bills::getMasterBillNo, bills.getMasterBillNo())
 			.eq(ObjectUtils.isNotNull(bills.getMasterId()), Bills::getMasterId, bills.getMasterId())
-			.eq(ObjectUtils.isNotNull(bills.getBillStatus()), Bills::getBillStatus, bills.getBillStatus())
-			.orderByDesc(Bills::getCreateTime);
+			.eq(ObjectUtils.isNotNull(bills.getBillStatus()), Bills::getBillStatus, bills.getBillStatus());
+		if ("SE".equals(bills.getBusinessType())) {
+			if ("1".equals(bills.getBillSort())){
+				lambdaQueryWrapper.orderByDesc(Bills::getEtd);
+			}else if ("2".equals(bills.getBillSort())){
+				lambdaQueryWrapper.orderByDesc(Bills::getMblno);
+			}else{
+				lambdaQueryWrapper.orderByDesc(Bills::getEtd);
+			}
+		} else {
+			if ("1".equals(bills.getBillSort())){
+				lambdaQueryWrapper.orderByDesc(Bills::getEta);
+			}else if ("2".equals(bills.getBillSort())){
+				lambdaQueryWrapper.orderByDesc(Bills::getMblno);
+			}else{
+				lambdaQueryWrapper.orderByDesc(Bills::getEta);
+			}
+		}
 		List<Bills> pages = billsService.list(lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/excel/BCorpsExcel.java

@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -140,6 +141,11 @@ public class BCorpsExcel implements Serializable {
 	@ExcelProperty(value = "业务员姓名")
 	private String salesName;
 	/**
+	 * 客户来源
+	 */
+	@ExcelProperty(value = "客户来源")
+	private String corpSource;
+	/**
 	 * 所属单位名称
 	 */
 	@ExcelProperty(value = "所属单位名称")

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/feign/PriceBankClient.java

@@ -174,4 +174,12 @@ public class PriceBankClient implements IPriceBankClient {
 		.eq(PriceBank::getItemId,goodsId);
 		return priceBankMapper.selectList(lambdaQueryWrapper);
 	}
+
+	@Override
+	public List<PriceBank> updatePriceBank(List<PriceBank> priceBank) {
+		for (PriceBank item : priceBank){
+			priceBankMapper.updateById(item);
+		}
+		return priceBank;
+	}
 }

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

@@ -833,19 +833,21 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						msg += goodsDesc.getCname() + ",";
 					}
 					stockOne.setBalanceQuantity(stockOne.getBalanceQuantity().subtract(item.getSendNum()));
-					BigDecimal sendNum = item.getSendNum();
-					if (stockOne.getBalanceQuantityHave().compareTo(sendNum) >= 0) {
-						stockOne.setBalanceQuantityHave(stockOne.getBalanceQuantityHave().subtract(item.getSendNum()));
-						item.setSendNumHave(item.getSendNum());
-					} else {
-						item.setSendNumHave(stockOne.getBalanceQuantityHave());
-						sendNum = sendNum.subtract(stockOne.getBalanceQuantityHave());
-						item.setSendNumFinancing(sendNum);
-						if (stockOne.getBalanceQuantityFinancing().compareTo(sendNum) < 0) {
-							throw new RuntimeException("商品：" + goodsDesc.getCname() + "融资库存不足，出库失败");
+					if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
+						BigDecimal sendNum = item.getSendNum();
+						if (stockOne.getBalanceQuantityHave().compareTo(sendNum) >= 0) {
+							stockOne.setBalanceQuantityHave(stockOne.getBalanceQuantityHave().subtract(item.getSendNum()));
+							item.setSendNumHave(item.getSendNum());
+						} else {
+							item.setSendNumHave(stockOne.getBalanceQuantityHave());
+							sendNum = sendNum.subtract(stockOne.getBalanceQuantityHave());
+							item.setSendNumFinancing(sendNum);
+							if (stockOne.getBalanceQuantityFinancing().compareTo(sendNum) < 0) {
+								throw new RuntimeException("商品：" + goodsDesc.getCname() + "融资库存不足，出库失败");
+							}
+							stockOne.setBalanceQuantityHave(new BigDecimal("0"));
+							stockOne.setBalanceQuantityFinancing(stockOne.getBalanceQuantityFinancing().subtract(sendNum));
 						}
-						stockOne.setBalanceQuantityHave(new BigDecimal("0"));
-						stockOne.setBalanceQuantityFinancing(stockOne.getBalanceQuantityFinancing().subtract(sendNum));
 					}
 					stockOne.setStoreInventory(stockOne.getBalanceQuantity());
 					stockOne.setInventoryAmount(stockOne.getInventoryAmount().subtract(item.getSendNum().multiply(stockOne.getInventoryCostPrice())));
@@ -1224,7 +1226,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 		if (storageDesc == null) {
 			throw new RuntimeException("未找到仓库信息");
 		}
-		if (ObjectUtils.isNotNull(status) && "1".equals(status) && "1".equals(storageDesc.getWhetherFinancing())) {
+		if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 			String firstProportion = sysClient.getParamService("first.month.proportion");
 			String secondProportion = sysClient.getParamService("second.month.proportion");
 			PjpfFunding pjpfFunding = pjpfFundingService.getOne(new LambdaQueryWrapper<PjpfFunding>()

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

@@ -158,13 +158,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		/*if (!AuthUtil.getUserRole().contains("admin")) {
 			if (ObjectUtils.isNull(deptId)) {
 				deptId = Long.parseLong(AuthUtil.getDeptId().split(",")[0]);
 			}
 		} else {
 			deptId = null;
-		}
+		}*/
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		R<String> res = sysClient.getRoleIds(AuthUtil.getTenantId(), user.getRoleId());
 		String roleId = "";