2025年2月12日16:58:57

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/dto/WaitingBox.java

@@ -51,6 +51,11 @@ public class WaitingBox {
 	private String corpEnName;
 
 	/**
+	 * 客户简称
+	 */
+	private String shortName;
+
+	/**
 	 * 船名 id
 	 */
 	private Long vesselId;

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

@@ -89,8 +89,8 @@ public class Bills implements Serializable {
 	 * 创建时间
 	 */
 	@ApiModelProperty(value = "创建时间")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 	/**
 	 * 修改人 Id
@@ -106,8 +106,8 @@ public class Bills implements Serializable {
 	 * 修改时间
 	 */
 	@ApiModelProperty(value = "修改时间")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 	/**
 	 * 业务类型, SE=海运出口 SI=海运进口

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

@@ -109,7 +109,8 @@ public class BillsController extends BladeController {
 			Bills::getCreateUser, Bills::getTeu, Bills::getIssueType, Bills::getBookingNo, Bills::getQuantityCntrDescr,
 			Bills::getCreateDeptName, Bills::getLineCnName, Bills::getCarrierCnName, Bills::getCyCnName, Bills::getSrcType,
 			Bills::getSrcCnName, Bills::getBookingAgentCnName, Bills::getPodCnName, Bills::getPolCnName,Bills::getCorpSource,
-			Bills::getVesselEnName,Bills::getCarrierEnName);
+			Bills::getVesselEnName,Bills::getCarrierEnName,Bills::getCyEnName,Bills::getMpaymode,Bills::getHpaymode,
+			Bills::getShortName);
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(Bills::getMasterId).or()
@@ -133,8 +134,8 @@ public class BillsController extends BladeController {
 				.like(Bills::getPodEnName, bills.getPodCnName()).or().like(Bills::getPodCode, bills.getPodCnName()))
 			.and(ObjectUtils.isNotNull(bills.getLineCnName()), i -> i.like(Bills::getLineCnName, bills.getLineCnName()).or()
 				.like(Bills::getLineEnName, bills.getLineCnName()))
-			.and(ObjectUtils.isNotNull(bills.getCyCode()), i -> i.like(Bills::getCyCode, bills.getCyCode()).or()
-				.like(Bills::getCyCnName, bills.getCyCode()).or().like(Bills::getCyEnName, bills.getCyCode()))
+			.and(ObjectUtils.isNotNull(bills.getCyCnName()), i -> i.like(Bills::getCyCode, bills.getCyCnName()).or()
+				.like(Bills::getCyCnName, bills.getCyCnName()).or().like(Bills::getCyEnName, bills.getCyCnName()))
 			.apply(ObjectUtils.isNotNull(bills.getCreateDeptName()), "find_in_set('" + bills.getCreateDeptName() + "',create_dept_name)");
 		if (ObjectUtils.isNotNull(bills.getEtdList()) && !bills.getEtdList().isEmpty()) {
 			lambdaQueryWrapper.ge(Bills::getEtd, bills.getEtdList().get(0));
@@ -253,8 +254,8 @@ public class BillsController extends BladeController {
 				.like(Bills::getPodEnName, bills.getPodCnName()).or().like(Bills::getPodCode, bills.getPodCnName()))
 			.and(ObjectUtils.isNotNull(bills.getLineCnName()), i -> i.like(Bills::getLineCnName, bills.getLineCnName()).or()
 				.like(Bills::getLineEnName, bills.getLineCnName()))
-			.and(ObjectUtils.isNotNull(bills.getCyCode()), i -> i.like(Bills::getCyCode, bills.getCyCode()).or()
-				.like(Bills::getCyCnName, bills.getCyCode()).or().like(Bills::getCyEnName, bills.getCyCode()))
+			.and(ObjectUtils.isNotNull(bills.getCyCnName()), i -> i.like(Bills::getCyCode, bills.getCyCnName()).or()
+				.like(Bills::getCyCnName, bills.getCyCnName()).or().like(Bills::getCyEnName, bills.getCyCnName()))
 			.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())
 			.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
 				.like(Bills::getSrcEnName, bills.getSrcCnName()))
@@ -576,14 +577,16 @@ public class BillsController extends BladeController {
 			Bills::getMeasurement, Bills::getQuantityV20, Bills::getQuantityV40, Bills::getQuantityV40hc, Bills::getQuantityV45,
 			Bills::getQuantityV48, Bills::getIsNeedLand, Bills::getIsNeedDeclare, Bills::getIsNeedIq, Bills::getAmountDr,
 			Bills::getAmountCr, Bills::getAmountProfit, Bills::getAmountDrUsd, Bills::getAmountCrUsd, Bills::getAmountProfitUsd,
+			Bills::getCheckCrStatus, Bills::getCheckDrStatus, Bills::getStlCrStatus, Bills::getStlDrStatus, Bills::getInvoiceCrStatus,Bills::getInvoiceDrStatus,
 			Bills::getAmountDrLoc, Bills::getAmountCrLoc, Bills::getAmountProfitLoc, Bills::getCheckCrStatusDescr, Bills::getCheckDrStatusDescr,
 			Bills::getStlCrStatusDescr, Bills::getStlDrStatusDescr, Bills::getInvoiceCrStatusDescr, Bills::getInvoiceDrStatusDescr, Bills::getCreateUserName,
 			Bills::getCreateTime, Bills::getUpdateUserName, Bills::getUpdateTime, Bills::getStatus, Bills::getBillStatus,
 			Bills::getAccountStatus, Bills::getRemarks, Bills::getPackingUnit, Bills::getBillDate, Bills::getTeamName,
 			Bills::getCreateUser, Bills::getTeu, Bills::getIssueType, Bills::getBookingNo, Bills::getQuantityCntrDescr,
-			Bills::getCyCnName, Bills::getCarrierCnName, Bills::getSrcType, Bills::getSrcCnName, Bills::getBookingAgentCnName,
-			Bills::getCreateDeptName, Bills::getLineCnName, Bills::getCorpSource,
-			Bills::getVesselEnName,Bills::getCarrierEnName);
+			Bills::getCreateDeptName, Bills::getLineCnName, Bills::getCarrierCnName, Bills::getCyCnName, Bills::getSrcType,
+			Bills::getSrcCnName, Bills::getBookingAgentCnName, Bills::getPodCnName, Bills::getPolCnName,Bills::getCorpSource,
+			Bills::getVesselEnName,Bills::getCarrierEnName,Bills::getCyEnName,Bills::getMpaymode,Bills::getHpaymode,
+			Bills::getShortName);
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(Bills::getMasterId).or()
@@ -605,8 +608,8 @@ public class BillsController extends BladeController {
 				.like(Bills::getPodEnName, bills.getPodCnName()).or().like(Bills::getPodCode, bills.getPodCnName()))
 			.and(ObjectUtils.isNotNull(bills.getLineCnName()), i -> i.like(Bills::getLineCnName, bills.getLineCnName()).or()
 				.like(Bills::getLineEnName, bills.getLineCnName()))
-			.and(ObjectUtils.isNotNull(bills.getCyCode()), i -> i.like(Bills::getCyCode, bills.getCyCode()).or()
-				.like(Bills::getCyCnName, bills.getCyCode()).or().like(Bills::getCyEnName, bills.getCyCode()))
+			.and(ObjectUtils.isNotNull(bills.getCyCnName()), i -> i.like(Bills::getCyCode, bills.getCyCnName()).or()
+				.like(Bills::getCyCnName, bills.getCyCnName()).or().like(Bills::getCyEnName, bills.getCyCnName()))
 			.apply(ObjectUtils.isNotNull(bills.getCreateDeptName()), "find_in_set('" + bills.getCreateDeptName() + "',create_dept_name)");
 		if (ObjectUtils.isNotNull(bills.getEtdList()) && !bills.getEtdList().isEmpty()) {
 			lambdaQueryWrapper.ge(Bills::getEtd, bills.getEtdList().get(0));

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

@@ -151,7 +151,13 @@ public class TradeBillsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bills.getBillStatus()), Bills::getBillStatus, bills.getBillStatus())
 			.eq(ObjectUtils.isNotNull(bills.getAccountStatus()), Bills::getAccountStatus, bills.getAccountStatus())
 			.eq(ObjectUtils.isNotNull(bills.getStatus()), Bills::getStatus, bills.getStatus());
-		lambdaQueryWrapper.orderByDesc(Bills::getCreateTime);
+		if ("1".equals(bills.getBillSort())){
+			lambdaQueryWrapper.orderByDesc(Bills::getCreateTime);
+		}else if ("2".equals(bills.getBillSort())){
+			lambdaQueryWrapper.orderByDesc(Bills::getMblno);
+		}else{
+			lambdaQueryWrapper.orderByDesc(Bills::getCreateTime);
+		}
 		IPage<Bills> pages = billsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (!pages.getRecords().isEmpty()) {
 			List<Long> ids = pages.getRecords().stream().map(Bills::getId).collect(Collectors.toList());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -1371,7 +1371,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setFeeCnName(items.getFeeCnName());
 					feeCenter.setFeeEnName(items.getFeeEnName());
 					feeCenter.setUnitNo(items.getUnitNo());
-					feeCenter.setPrice(new BigDecimal("1"));
+					feeCenter.setPrice(items.getPrice());
 					feeCenter.setCurCode(items.getCurCode());
 					if (ObjectUtils.isNotNull(feeCenter.getCurCode())) {
 						BCurrency bCurrency = new BCurrency();
@@ -1439,7 +1439,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setFeeCnName(items.getFeeCnName());
 					feeCenter.setFeeEnName(items.getFeeEnName());
 					feeCenter.setUnitNo(items.getUnitNo());
-					feeCenter.setPrice(new BigDecimal("1"));
+					feeCenter.setPrice(items.getPrice());
 					feeCenter.setCurCode(items.getCurCode());
 					if (ObjectUtils.isNotNull(feeCenter.getCurCode())) {
 						BCurrency bCurrency = new BCurrency();

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

@@ -64,7 +64,7 @@ public class PJCorprClient implements IPJCorpClient {
 	@TenantIgnore
 	public R updateIntegral(List<PjOrder> orderList) {
 		List<PjIntegralDetail> integralDetailList = new ArrayList<>();
-		System.out.println("=========积分修改开始==========");
+		System.out.println("=========积分修改开始-获取==========");
 		if (!orderList.isEmpty()) {
 			System.out.println("=========订单数据==========" + orderList);
 			String tenantId = orderList.get(0).getTenantId();
@@ -128,6 +128,7 @@ public class PJCorprClient implements IPJCorpClient {
 						}
 						System.out.println("=========积分处理完成数据==========");
 						if (new BigDecimal("0.00").compareTo(integral) != 0){
+							System.out.println("=========产生积分明细==========");
 							corpsDescMapper.updateByIdPointsBalance(corpsDesc);
 							PjIntegralDetail integralDetail = new PjIntegralDetail();
 							integralDetail.setCreateTime(new Date());
@@ -159,7 +160,8 @@ public class PJCorprClient implements IPJCorpClient {
 			System.out.println("=========订单数据为空==========");
 		}
 		if (!integralDetailList.isEmpty()) {
-			integralDetailService.updateBatchById(integralDetailList);
+			integralDetailService.saveOrUpdateBatch(integralDetailList);
+			System.out.println("=========积分明细数据保存成功==========");
 		}
 		System.out.println("=========积分修改完成数据==========");
 		return R.success("操作成功");
@@ -170,7 +172,7 @@ public class PJCorprClient implements IPJCorpClient {
 	@TenantIgnore
 	public R updateRevokeIntegral(List<PjOrder> orderList) {
 		List<PjIntegralDetail> integralDetailList = new ArrayList<>();
-		System.out.println("=========积分修改开始==========");
+		System.out.println("=========积分修改开始-退款==========");
 		if (!orderList.isEmpty()) {
 			System.out.println("=========订单数据==========" + orderList);
 			String tenantId = orderList.get(0).getTenantId();
@@ -234,6 +236,7 @@ public class PJCorprClient implements IPJCorpClient {
 						}
 						System.out.println("=========积分处理完成数据==========");
 						if (new BigDecimal("0.00").compareTo(integral) != 0){
+							System.out.println("=========产生积分明细==========");
 							corpsDescMapper.updateByIdPointsBalance(corpsDesc);
 							PjIntegralDetail integralDetail = new PjIntegralDetail();
 							integralDetail.setCreateTime(new Date());
@@ -265,7 +268,8 @@ public class PJCorprClient implements IPJCorpClient {
 			System.out.println("=========订单数据为空==========");
 		}
 		if (!integralDetailList.isEmpty()) {
-			integralDetailService.updateBatchById(integralDetailList);
+			integralDetailService.saveOrUpdateBatch(integralDetailList);
+			System.out.println("=========积分明细保存成功==========");
 		}
 		System.out.println("=========积分修改完成数据==========");
 		return R.success("操作成功");

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

@@ -60,6 +60,8 @@ import org.springblade.salesPart.order.service.IOrderItemsService;
 import org.springblade.salesPart.order.service.IOrderRecordService;
 import org.springblade.salesPart.productLaunch.service.IProductLaunchService;
 import org.springblade.salesPart.serial.service.IPjpfSerialService;
+import org.springblade.salesPart.share.entity.SharePutOnShelves;
+import org.springblade.salesPart.share.service.ISharePutOnShelvesService;
 import org.springblade.salesPart.ship.mapper.ShipMapper;
 import org.springblade.salesPart.ship.service.IShipItemsRecordService;
 import org.springblade.salesPart.ship.service.IShipItemsService;
@@ -130,6 +132,8 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 
 	private final ITongLianPaymentClient parametersService;
 
+	private final ISharePutOnShelvesService sharePutOnShelvesService;
+
 	/**
 	 * 获取收发货订单详情
 	 *
@@ -774,7 +778,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			);
 			StringBuilder msg1 = new StringBuilder();
 			for (PjShipItems item : ship.getShipItemsList()) {
-				item.setCostprie(item.getSendNum().multiply(item.getCostpriePrice()));
 				number = number.add(item.getSendNum());
 				if (item.getId() == null) {
 					item.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
@@ -815,6 +818,11 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					if (stockOne.getBalanceQuantity().compareTo(item.getSendNum()) < 0) {
 						msg += goodsDesc.getCname() + ",";
 					} else {
+						item.setCostprie(item.getSendNum().multiply(stockOne.getInventoryCostPrice()));
+						item.setCostpriePrice(stockOne.getInventoryCostPrice());
+						item.setRebateCostprie(item.getSendNum().multiply(stockOne.getRebatePrice()));
+						item.setRebatePrice(stockOne.getRebatePrice());
+						item.setRebateProfit(item.getSubTotalMoney().subtract(item.getRebateCostprie()));
 						stockOne.setBalanceQuantity(stockOne.getBalanceQuantity().subtract(item.getSendNum()));
 						if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 							BigDecimal sendNum = item.getSendNum();
@@ -852,10 +860,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				PjOrderItems orderItems = pjOrderItems.stream().filter(e -> e.getId().equals(item.getSrcItemId())).findFirst().orElse(null);
 				if (orderItems != null) {
 					if (ObjectUtils.isNull(orderItems.getCostprie()) || new BigDecimal("0.00").compareTo(orderItems.getCostprie()) == 0) {
+						orderItems.setCostpriePrice(stockOne.getInventoryCostPrice());
 						orderItems.setCostprie(stockOne.getInventoryCostPrice().multiply(orderItems.getGoodsNum()));
 						orderItems.setGrossProfit(orderItems.getSubTotalMoney().subtract(orderItems.getCostprie()));
 					}
 					if (ObjectUtils.isNull(orderItems.getRebateCostprie()) || new BigDecimal("0.00").compareTo(orderItems.getRebateCostprie()) == 0) {
+						orderItems.setRebatePrice(stockOne.getRebatePrice());
 						orderItems.setRebateCostprie(stockOne.getRebatePrice().multiply(orderItems.getGoodsNum()));
 						orderItems.setRebateProfit(orderItems.getSubTotalMoney().subtract(orderItems.getRebateCostprie()));
 					}
@@ -4107,6 +4117,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			if (!res1.isSuccess()) {
 				throw new RuntimeException(res1.getMsg());
 			}
+			String stata = sysClient.getParamService("whether.open.share");
+			if (!pjProductLaunchList.isEmpty() && "1".equals(stata)){
+				sharePutOnShelvesService.updateShareInventory(pjProductLaunchList);
+			}
 			ship.setShipItemsList(ship.getShipItemsList());
 			ship.setNumberRows(ship.getShipItemsList().size());
 			//修改任务发货数量
@@ -4551,6 +4565,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			if (!res1.isSuccess()) {
 				throw new RuntimeException(res1.getMsg());
 			}
+			String stata = sysClient.getParamService("whether.open.share");
+			if (!pjProductLaunchList.isEmpty() && "1".equals(stata)){
+				sharePutOnShelvesService.updateShareInventory(pjProductLaunchList);
+			}
 			//修改任务发货数量
 			PjShip rwShip = baseMapper.selectById(ship.getTaskId());
 			if (ObjectUtils.isNotNull(rwShip)) {
@@ -5121,6 +5139,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			if (!res.isSuccess()) {
 				throw new RuntimeException(res.getMsg());
 			}
+			String stata = sysClient.getParamService("whether.open.share");
+			if (!pjProductLaunchList.isEmpty() && "1".equals(stata)){
+				sharePutOnShelvesService.updateShareInventory(pjProductLaunchList);
+			}
 			ship.setShipItemsList(ship.getShipItemsList());
 			ship.setNumberRows(ship.getShipItemsList().size());
 			ship.setGoodsTotalNum(ship.getShipItemsList().stream().map(PjShipItems::getGoodsNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -5443,6 +5465,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			if (!res.isSuccess()) {
 				throw new RuntimeException(res.getMsg());
 			}
+			String stata = sysClient.getParamService("whether.open.share");
+			if (!pjProductLaunchList.isEmpty() && "1".equals(stata)){
+				sharePutOnShelvesService.updateShareInventory(pjProductLaunchList);
+			}
 			ship.setShipItemsList(ship.getShipItemsList());
 			ship.setNumberRows(ship.getShipItemsList().size());
 		}