2024年7月9日17:34:57

blade-service-api/blade-los-api/src/main/java/org/springblade/los/feign/ILosClient.java

@@ -2,6 +2,7 @@ package org.springblade.los.feign;
 
 import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.business.entity.BusinessType;
+import org.springblade.los.basic.cur.entity.BCurrency;
 import org.springblade.los.basic.reports.entity.Reports;
 import org.springblade.los.billno.entity.BusinessBillNo;
 import org.springblade.los.check.entity.LosAuditPaths;
@@ -32,6 +33,8 @@ public interface ILosClient {
 
 	String ADD_REPORTS = API_PREFIX + "/addReports";
 	String GET_REPORTS = API_PREFIX + "/getReportsList";
+	String ADD_BCURRENCY = API_PREFIX + "/addBCurrency";
+	String GET_BCURRENCY = API_PREFIX + "/getBCurrencyList";
 
 
 	/**
@@ -93,4 +96,16 @@ public interface ILosClient {
 	 */
 	@PostMapping(ADD_REPORTS)
 	R addReportsList(@RequestBody List<Reports> reportsList);
+
+	/**
+	 * 获取汇率数据
+	 */
+	@PostMapping(ADD_BCURRENCY)
+	List<BCurrency> getBCurrency(@RequestBody BCurrency reports);
+
+	/**
+	 * 保存汇率数据
+	 */
+	@PostMapping(GET_BCURRENCY)
+	R addBCurrencyList(@RequestBody List<BCurrency> reportsList);
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/feign/DeliveryClient.java

@@ -152,6 +152,7 @@ public class DeliveryClient implements IDeliveryClient {
 			delivery1.setTripartiteInspection(order.getTripartiteInspection());
 			delivery1.setCreateUser(order.getDocumenterId());
 			delivery1.setTransportDescription(order.getTransportDescription());
+			delivery1.setDeliveryStatus(order.getOrderStatus());
 			deliveryService.updateById(delivery1);
 			deliveryNew = delivery1;
 		} else {
@@ -201,6 +202,7 @@ public class DeliveryClient implements IDeliveryClient {
 			delivery.setSigningMethod(order.getSigningMethod());
 			delivery.setTripartiteInspection(order.getTripartiteInspection());
 			delivery.setTransportDescription(order.getTransportDescription());
+			delivery.setDeliveryStatus(order.getOrderStatus());
 			deliveryService.save(delivery);
 			deliveryNew = delivery;
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/mapper/CurrencyMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.basic.cur.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.los.basic.cur.entity.BCurrency;
 import org.springblade.los.basic.cur.vo.BCurrencyVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,4 +40,5 @@ public interface CurrencyMapper extends BaseMapper<BCurrency> {
 	 */
 	List<BCurrencyVO> selectBCurrencyPage(IPage page, BCurrencyVO bCurrency);
 
+    List<BCurrency> getBCurrency(@Param("data")BCurrency reports);
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/mapper/CurrencyMapper.xml

@@ -36,5 +36,8 @@
     <select id="selectBCurrencyPage" resultMap="bCurrencyResultMap">
         select * from los_b_currency where is_deleted = 0
     </select>
+    <select id="getBCurrency" resultType="org.springblade.los.basic.cur.entity.BCurrency">
+        select * from los_b_currency where is_deleted = 0 and  tenant_id = #{data.tenantId}
+    </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/service/IBCurrencyService.java

@@ -93,4 +93,6 @@ public interface IBCurrencyService extends IService<BCurrency> {
 	BCurrency getExrateDetails(BCurrency bCurrency);
 
 	List<PeriodExchangeRate> getPeriodExchangeRate();
+
+	List<BCurrency> getBCurrency(BCurrency reports);
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/service/impl/BCurrencyServiceImpl.java

@@ -890,4 +890,9 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 		return periodExchangeRates;
 	}
 
+	@Override
+	public List<BCurrency> getBCurrency(BCurrency reports) {
+		return baseMapper.getBCurrency(reports);
+	}
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/mapper/ReportsMapper.xml

@@ -34,7 +34,7 @@
     </select>
     <select id="getReports" resultMap="reportsResultMap">
         select * from los_b_reports where is_deleted = 0 and  tenant_id = #{data.tenantId}
-                                      and branch_id = #{data.salesCompanyId}
+                                      and branch_id = #{data.branchId}
     </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/billno/mapper/BusinessBillNoMapper.xml

@@ -36,7 +36,7 @@
     <select id="getBusinessBillNo" resultMap="businessBillNoResultMap">
         select * from los_b_business_bill_no where is_deleted = 0
                                                and  tenant_id = #{data.tenantId}
-                                               and branch_id = #{data.salesCompanyId}
+                                               and branch_id = #{data.branchId}
     </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/BillsMapper.xml

@@ -358,14 +358,7 @@
                 and acc.is_checked = 2
             </if>
         </if>
-        <if test='acc.type != null and acc.type != "" and acc.type == "2"'>
-            and fee.amount > fee.stl_ttl_amount
-        </if>
-        <if test='acc.type != null and acc.type != "" and acc.type == "3"'>
-            AND fee.amount > fee.stl_ttl_amount + fee.applied_amount - fee.applied_amount_stl
-        </if>
         <if test='acc.type != null and acc.type != "" and acc.type == "4"'>
-            and fee.amount > fee.uninvoiced_amount + fee.applied_invoice_amount - fee.applied_invoice_amount_stl
             and acc.invoice_status != 3
         </if>
         <if test='acc.type != null and acc.type != "" and acc.type == "5"'>
@@ -468,6 +461,16 @@
         GROUP BY acc.bill_no
         ORDER BY acc.create_time
     </select>
+    <!-- <if test='acc.type != null and acc.type != "" and acc.type == "2"'>
+            and fee.amount > fee.stl_ttl_amount
+        </if>
+        <if test='acc.type != null and acc.type != "" and acc.type == "3"'>
+            AND fee.amount > fee.stl_ttl_amount + fee.applied_amount - fee.applied_amount_stl
+        </if>
+        <if test='acc.type != null and acc.type != "" and acc.type == "4"'>
+            and fee.amount > fee.uninvoiced_amount + fee.applied_invoice_amount - fee.applied_invoice_amount_stl
+            and acc.invoice_status != 3
+        </if>-->
     <select id="decisionAnalysis" resultType="org.springblade.los.statisticAnalysis.DecisionAnalysis">
         SELECT
         corp_cn_name AS customer,

blade-service/blade-los/src/main/java/org/springblade/los/check/mapper/AuditPathsActsMapper.xml

@@ -28,9 +28,8 @@
 	AND tenant_id = #{tenantId}
     </select>
     <select id="getLosAuditPathsActs" resultMap="auditPathsActsResultMap">
-        select * from los_audit_paths_acts where is_deleted = 0
-                                             and  tenant_id = #{data.tenantId}
-                                             and path_id = #{data.pathId}
+        select * from los_audit_paths_acts where  tenant_id = #{data.tenantId}
+                                             and sales_company_id = #{data.salesCompanyId}
     </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/feign/LosClient.java

@@ -7,6 +7,8 @@ import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.business.entity.BusinessType;
 import org.springblade.los.basic.business.service.IBusinessTypeService;
+import org.springblade.los.basic.cur.entity.BCurrency;
+import org.springblade.los.basic.cur.service.IBCurrencyService;
 import org.springblade.los.basic.reports.entity.Reports;
 import org.springblade.los.basic.reports.service.IReportsService;
 import org.springblade.los.billno.entity.BusinessBillNo;
@@ -37,6 +39,8 @@ public class LosClient implements ILosClient {
 
 	private final IReportsService reportsService;
 
+	private final IBCurrencyService bCurrencyService;
+
 
 	@Override
 	@TenantIgnore
@@ -103,4 +107,14 @@ public class LosClient implements ILosClient {
 	public R addReportsList(List<Reports> reportsList) {
 		return R.data(reportsService.saveOrUpdateBatch(reportsList));
 	}
+
+	@Override
+	public List<BCurrency> getBCurrency(BCurrency reports) {
+		return bCurrencyService.getBCurrency(reports);
+	}
+
+	@Override
+	public R addBCurrencyList(List<BCurrency> reportsList) {
+		return R.data(bCurrencyService.saveOrUpdateBatch(reportsList));
+	}
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -917,14 +917,14 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						finAccBills.setStlAmountCr(finAccBills.getStlAmountCr().add(item.getCurrentStlAmount()));
 						finAccBills.setStlAmountCrLoc(finAccBills.getStlAmountCrLoc().add(item.getCurrentStlAmount()));
 						if (!ids.isEmpty()) {
-							finAccBills.setAppliedAmountStl(finAccBills.getAppliedAmountStl().add(item.getCurrentStlDiscount()));
+							finAccBills.setAppliedAmountStl(finAccBills.getAppliedAmountStl().add(item.getCurrentStlAmount()));
 						}
 					} else {
 						finAccBills.setStlAmountCrUsd(finAccBills.getStlAmountCrUsd().add(item.getCurrentStlAmount()));
 						BigDecimal cny = bCurrencyService.converterCny(item.getCurCode(), item.getCurrentStlAmount(), "C", "2");
 						finAccBills.setStlAmountCrLoc(finAccBills.getStlAmountCrLoc().add(cny));
 						if (!ids.isEmpty()) {
-							finAccBills.setAppliedAmountStlUsd(finAccBills.getAppliedAmountStlUsd().add(item.getCurrentStlDiscount()));
+							finAccBills.setAppliedAmountStlUsd(finAccBills.getAppliedAmountStlUsd().add(item.getCurrentStlAmount()));
 						}
 					}
 					if (finAccBills.getAmountCr().compareTo(finAccBills.getStlAmountCr()) == 0 &&
@@ -993,15 +993,18 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 							if (e.getAmount().subtract(e.getStlTtlAmount()).compareTo(currentStlAmount) > 0) {
 								e.setUnsettledAmount(e.getAmount().subtract(e.getStlTtlAmount()).subtract(currentStlAmount));
 								e.setStlTtlAmount(e.getAmount().subtract(e.getUnsettledAmount()));
-								e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
+//								e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
+								e.setAppliedAmountStl(e.getAppliedAmountStl().add(currentStlAmount));
 								currentStlAmount = new BigDecimal("0.00");
 							} else if (e.getAmount().subtract(e.getStlTtlAmount()).compareTo(currentStlAmount) == 0) {
 								e.setUnsettledAmount(new BigDecimal("0.00"));
 								e.setStlTtlAmount(e.getAmount().subtract(e.getUnsettledAmount()));
-								e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
+//								e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
+								e.setAppliedAmountStl(e.getAppliedAmountStl().add(currentStlAmount));
 								currentStlAmount = new BigDecimal("0.00");
 							} else {
 								e.setUnsettledAmount(new BigDecimal("0.00"));
+								e.setAppliedAmountStl(e.getAppliedAmountStl().add((e.getAmount().subtract(e.getStlTtlAmount()))));
 								currentStlAmount = currentStlAmount.subtract((e.getAmount().subtract(e.getStlTtlAmount())));
 								e.setStlTtlAmount(e.getAmount().subtract(e.getUnsettledAmount()));
 								e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
@@ -1198,14 +1201,14 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						finAccBills.setStlAmountCr(finAccBills.getStlAmountCr().subtract(item.getCurrentStlAmount().subtract(item.getCurrentStlDiscount())));
 						finAccBills.setStlAmountCrLoc(finAccBills.getStlAmountCrLoc().subtract(item.getCurrentStlAmount().subtract(item.getCurrentStlDiscount())));
 						if (!ids.isEmpty()) {
-							finAccBills.setAppliedAmountStl(finAccBills.getAppliedAmountStl().subtract(item.getCurrentStlDiscount()));
+							finAccBills.setAppliedAmountStl(finAccBills.getAppliedAmountStl().subtract(item.getCurrentStlAmount()));
 						}
 					} else {
 						finAccBills.setStlAmountCrUsd(finAccBills.getStlAmountCrUsd().subtract(item.getCurrentStlAmount().subtract(item.getCurrentStlDiscount())));
 						BigDecimal cny = bCurrencyService.converterCny(item.getCurCode(), item.getCurrentStlAmount().subtract(item.getCurrentStlDiscount()), "C", "2");
 						finAccBills.setStlAmountCrLoc(finAccBills.getStlAmountCrLoc().subtract(cny));
 						if (!ids.isEmpty()) {
-							finAccBills.setAppliedAmountStlUsd(finAccBills.getAppliedAmountStlUsd().subtract(item.getCurrentStlDiscount()));
+							finAccBills.setAppliedAmountStlUsd(finAccBills.getAppliedAmountStlUsd().subtract(item.getCurrentStlAmount()));
 						}
 					}
 					if (finAccBills.getAmountCr().compareTo(new BigDecimal("0.00")) == 0 &&

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportEnquiryController.java

@@ -124,9 +124,10 @@ public class ExportEnquiryController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryStart()), Order::getPlannedDeliveryDate, order.getPlannedDeliveryStart());//计划交货开始
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryEnd()), Order::getPlannedDeliveryDate, order.getPlannedDeliveryEnd());//计划交货结束
 		if ("1".equals(order.getTabType())) {
-			lambdaQueryWrapper.apply("order_status != '已提交'");
+			lambdaQueryWrapper.apply("order_status = '已提交'");
 		} else if ("2".equals(order.getTabType())) {
-			lambdaQueryWrapper.eq(Order::getOrderStatus, OrderEnum.SUBMIT.getStatus());
+			lambdaQueryWrapper.apply("order_status != '已提交'");
+//			lambdaQueryWrapper.eq(Order::getOrderStatus, OrderEnum.SUBMIT.getStatus());
 		} else if ("3".equals(order.getTabType())) {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "已取消");
 		}else{

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

@@ -16,6 +16,8 @@
  */
 package org.springblade.system.mapper;
 
+import org.apache.ibatis.annotations.Param;
+import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.ParamService;
 import org.springblade.system.vo.ParamServiceVO;
@@ -39,4 +41,7 @@ public interface ParamServiceMapper extends BaseMapper<ParamService> {
 	 * @return
 	 */
 	List<ParamServiceVO> selectParamServicePage(IPage page, ParamServiceVO paramService);
+
+	@TenantIgnore
+    List<ParamService> selectParamService(@Param("tenantId") String tenantId, @Param("salesCompanyId")String salesCompanyId);
 }

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

@@ -22,5 +22,8 @@
     <select id="selectParamServicePage" resultMap="paramServiceResultMap">
         select * from blade_param_service where is_deleted = 0
     </select>
+    <select id="selectParamService" resultType="org.springblade.system.entity.ParamService">
+        select * from blade_param_service where is_deleted = 0 and tenant_id = #{param1} and sales_company_id = #{salesCompanyId}
+    </select>
 
 </mapper>

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

@@ -60,7 +60,7 @@
         and is_deleted = 0
     </select>
     <select id="selectListByTenantId" resultType="org.springblade.system.entity.Role">
-        select * from blade_role where is_deleted = 0  and tenant_id = #{param1}
+        select * from blade_role where is_deleted = 0  and tenant_id = #{param1} and role_name != '管理员'
     </select>
 
 </mapper>

blade-service/blade-system/src/main/java/org/springblade/system/service/IParamServiceService.java

@@ -22,6 +22,8 @@ import org.springblade.system.vo.ParamServiceVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 业务参数配置表 服务类
  *
@@ -42,4 +44,6 @@ public interface IParamServiceService extends IService<ParamService> {
 	String getValue(String paramKey);
 
 	String getValueNew(String paramKey);
+
+    List<ParamService> selectParamService(String tenantId, String salesCompanyId);
 }

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

@@ -31,6 +31,8 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springblade.system.vo.ParamServiceVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 业务参数配置表 服务实现类
  *
@@ -74,4 +76,9 @@ public class ParamServiceServiceImpl extends ServiceImpl<ParamServiceMapper, Par
 		return param.getParamValue();
 	}
 
+	@Override
+	public List<ParamService> selectParamService(String tenantId, String salesCompanyId) {
+		return baseMapper.selectParamService(tenantId,salesCompanyId);
+	}
+
 }

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

@@ -33,6 +33,7 @@ import org.springblade.core.tool.utils.DesUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.los.basic.business.entity.BusinessType;
+import org.springblade.los.basic.cur.entity.BCurrency;
 import org.springblade.los.basic.reports.entity.Reports;
 import org.springblade.los.billno.entity.BusinessBillNo;
 import org.springblade.los.check.entity.LosAuditPaths;
@@ -77,6 +78,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 	private final IUserClient userClient;
 	private final IOssClient ossClient;
 	private final ILosClient losClient;
+	private final IParamServiceService paramServiceService;
 
 	@Override
 	public IPage<Tenant> selectTenantPage(IPage<Tenant> page, Tenant tenant) {
@@ -252,6 +254,31 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 				recursionLosAuditPathsActs(tenantId, tenantIdCopy, oldParentId, newParentId, dept);
 			}
 			losClient.addLosAuditPathsList(losAuditPaths);
+		} else if (type.contains("8")) {
+			LosAuditPaths losAuditPath = new LosAuditPaths();
+			losAuditPath.setTenantId(tenantIdCopy);
+			losAuditPath.setSalesCompanyId(dept.getId());
+			List<LosAuditPaths> losAuditPathsList = losClient.getLosAuditPaths(losAuditPath);
+			// 业务审批配置
+			LosAuditPathsActs losAuditPathsActs = new LosAuditPathsActs();
+			losAuditPathsActs.setTenantId(tenantId);
+			losAuditPathsActs.setSalesCompanyId(1703929959275413506L);
+			List<LosAuditPathsActs> losAuditPathsActsList = new ArrayList<>();
+			List<LosAuditPathsActs> list = losClient.getLosAuditPathsActs(losAuditPathsActs);
+			for (LosAuditPathsActs item : list) {
+				item.setId(null);
+				item.setTenantId(tenantIdCopy);
+				LosAuditPaths losAuditPaths = losAuditPathsList.stream().filter(e -> e.getPathName().equals(item.getActName())).findFirst().orElse(null);
+				if (losAuditPaths != null) {
+					item.setPathId(losAuditPaths.getId());
+				} else {
+					item.setPathId(0L);
+				}
+				item.setSalesCompanyId(dept.getId());
+				item.setSalesCompanyName(dept.getDeptName());
+				losAuditPathsActsList.add(item);
+			}
+			losClient.addLosAuditPathsActsList(losAuditPathsActsList);
 		} else if (type.contains("4")) {
 			// 编号配置
 			List<BusinessBillNo> businessBillNos = new ArrayList<>();
@@ -310,6 +337,34 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 				reportsList.add(item);
 			}
 			losClient.addReportsList(reportsList);
+		} else if (type.contains("7")) {
+			// 汇率
+			List<BCurrency> reportsList = new ArrayList<>();
+			BCurrency reports = new BCurrency();
+			reports.setTenantId(tenantId);
+			List<BCurrency> losReportsList = losClient.getBCurrency(reports);
+			for (BCurrency item : losReportsList) {
+				Long newParentId = IdWorker.getId();
+				item.setCreateTime(new Date());
+				item.setCreateUser(AuthUtil.getUserId());
+				item.setCreateUserName(AuthUtil.getUserName());
+				item.setId(newParentId);
+				item.setTenantId(tenantIdCopy);
+				reportsList.add(item);
+			}
+			losClient.addBCurrencyList(reportsList);
+		}else if (type.contains("9")) {
+			// 业务参数
+			List<ParamService> roleLinkedList = new ArrayList<>();
+			List<ParamService> roleList = paramServiceService.selectParamService(tenantId,"1703929959275413506");
+			for (ParamService item : roleList) {
+				item.setId(null);
+				item.setTenantId(tenantIdCopy);
+				item.setSalesCompanyId(dept.getId());
+				item.setSalesCompanyName(dept.getDeptName());
+				roleLinkedList.add(item);
+			}
+			paramServiceService.saveBatch(roleLinkedList);
 		}
 		return R.data("操作成功");
 	}