2023年9月25日17:34:01

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

@@ -134,4 +134,16 @@ public class PjGoodsType implements Serializable {
 	@ApiModelProperty(value = "父级名称")
 	@TableField(exist = false)
 	private String parentName;
+
+	/**
+	 * 所属公司id
+	 */
+	@ApiModelProperty(value = "所属公司id")
+	private Long salesCompanyId;
+
+	/**
+	 * 所属公司名称
+	 */
+	@ApiModelProperty(value = "所属公司名称")
+	private String salesCompanyName;
 }

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

@@ -774,9 +774,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			.eq(DeliveryItems::getPid, deliveryId)
 			.eq(DeliveryItems::getIsDeleted, 0);
 		List<DeliveryItems> deliveryItems = deliveryItemsMapper.selectList(deliveryItemsLambdaQueryWrapper);
-
 		select.setDeliveryItemsList(deliveryItems);
-		delivery.setDeliveryItemsList(deliveryItems);
 		String corpName = null;
 		String corpNumber = null;
 		String orderNo = select.getOrderNo();
@@ -1069,6 +1067,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				throw new RuntimeException(res.getMsg());
 			}
 			stockGoodsClient.saveOrUpdateBatchListLog(stockGoodsLogList);
+			//计算明细的入库金额(明细的总采购价)
+			LambdaQueryWrapper<DeliveryItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			itemsLambdaQueryWrapper
+				.eq(DeliveryItems::getPid, deliveryId)
+				.eq(DeliveryItems::getIsDeleted, 0);
+			List<DeliveryItems> itemsList = deliveryItemsMapper.selectList(itemsLambdaQueryWrapper);
+
+			if(ObjectUtils.isNull(delivery.getDeliveryItemsList())){
+				delivery.setDeliveryItemsList(itemsList);
+			}
 			delivery.getDeliveryItemsList().forEach(e -> {
 				//更新item已发数量
 				R r = iOrderItemsClient.updateActualQuantity(e.getSrcId(), e.getActualQuantity(), 1);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/accountManagement/controller/AccountManagementController.java

@@ -85,8 +85,7 @@ public class AccountManagementController extends BladeController {
 			.eq(StringUtils.isNotBlank(accountManagement.getStatus()), PjAccountManagement::getStatus, accountManagement.getStatus())//状态
 			.eq(ObjectUtils.isNotNull(accountManagement.getEnableOrNot()), PjAccountManagement::getEnableOrNot, accountManagement.getEnableOrNot());//状态
 		if (!AuthUtil.getUserRole().contains("admin")) {
-			lambdaQueryWrapper.eq(PjAccountManagement::getSalesCompanyId, AuthUtil.getDeptId())
-				.eq(PjAccountManagement::getCorporateName, AuthUtil.getDeptId());//公司
+			lambdaQueryWrapper.eq(PjAccountManagement::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		IPage<PjAccountManagement> pages = accountManagementService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsTypeController.java

@@ -167,6 +167,7 @@ public class GoodsTypeController extends BladeController {
 		}
 
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
+		goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		return R.data(goodsTypeService.saveMessage(goodsType));
 	}