2022年12月12日 18:26

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/SalesDetailsVo.java

@@ -29,7 +29,7 @@ public class SalesDetailsVo implements Serializable {
 	//商品主键
 	private Long commodityId;
 	//客户主键
-	private Long corpid;
+	private Long corpId;
 	//客户名称
 	private String corpName;
 	//时间

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/extra/entity/Claim.java

@@ -242,12 +242,6 @@ public class Claim implements Serializable {
 	 */
 	@ApiModelProperty(value = "是否已删除（0-否、1-是）")
 	private Integer isDeleted;
-	/**
-	 * 总实报金额
-	 */
-	@ApiModelProperty(value = "总实报金额")
-	private BigDecimal totalActualAmount;
-
 
 	@TableField(exist = false)
 	private List<ClaimItem> itemList;

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -108,7 +108,6 @@ public class CorpsDescController extends BladeController {
 				}
 				if (item.getBelongtocompany() != null){
 					if (ObjectUtil.isNotEmpty(corpsDescList)) {
-						System.out.println(item.getBelongtocompany());
 						item.setBelongCompany(corpsDescList.stream().filter(e -> e.getId().toString().equals(item.getBelongtocompany())).findFirst().get().getCname());
 					}
 				}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -454,7 +454,8 @@
             bo.id,
             bo.order_no,
             bo.busines_date,
-            item.corp_id
+            item.corp_id,
+            item.order_quantity as orderQuantity
         FROM
             business_order bo
             LEFT JOIN business_order_items item ON bo.id = item.pid
@@ -538,7 +539,7 @@ ORDER BY
         SELECT DISTINCT
         BOI.id AS itemsId,
         BO.id AS orderId,
-        BO.Corp_id AS corpid,
+        BO.corp_id AS corpid,
         BCD.cname AS corpName,
         BO.create_time AS careteTime,
         BO.charge_member AS salesName,
@@ -575,8 +576,8 @@ ORDER BY
             BOI.is_deleted = 0
             AND BO.bill_type = 'XS'
             AND BO.tenant_id = #{detailsVo.tenantId}
-            <if test="detailsVo.corpName != null and detailsVo.corpName != ''">
-                AND BCD.cname like concat('%', #{detailsVo.corpName}, '%')
+            <if test="detailsVo.corpId != null and detailsVo.corpId != ''">
+                AND BO.corp_id like concat('%', #{detailsVo.corpId}, '%')
             </if>
             <if test="detailsVo.salesName != null and detailsVo.salesName != ''">
                 AND BO.charge_member like concat('%', #{detailsVo.salesName}, '%')
@@ -626,8 +627,8 @@ ORDER BY
             BOI.is_deleted = 0
             AND BO.bill_type = 'XS'
             AND BO.tenant_id = #{detailsVo.tenantId}
-            <if test="detailsVo.corpName != null and detailsVo.corpName != ''">
-                AND BCD.cname like concat('%', #{detailsVo.corpName}, '%')
+            <if test="detailsVo.corpId != null and detailsVo.corpId != ''">
+                AND BO.corp_id like concat('%', #{detailsVo.corpId}, '%')
             </if>
             <if test="detailsVo.salesName != null and detailsVo.salesName != ''">
                 AND BO.charge_member like concat('%', #{detailsVo.salesName}, '%')
@@ -969,7 +970,7 @@ ORDER BY
         SELECT DISTINCT
             BO.id AS orderId,
             BO.order_no AS orderNo,
-            BGD.Brand AS brand,
+            BGD.brand AS brand,
             BCD.cname AS corpName,
             BO.create_time AS careteTime,
             BO.charge_member AS salesName,
@@ -1050,10 +1051,10 @@ ORDER BY
                 and BO.create_time &lt;= #{detailsVo.endCreateTime}
             </if>
             <if test="detailsVo.salesName != null and detailsVo.salesName != ''">
-                AND BGD.charge_member like concat('%', #{detailsVo.salesName}, '%')
+                AND BO.charge_member like concat('%', #{detailsVo.salesName}, '%')
             </if>
-            <if test="detailsVo.corpid != null and detailsVo.corpid != ''">
-                AND BO.corp_id like concat('%', #{detailsVo.corpid}, '%')
+            <if test="detailsVo.corpName != null and detailsVo.corpName != ''">
+                AND BCD.cname like concat('%', #{detailsVo.corpName}, '%')
             </if>
         </where>
         order by BO.create_time desc
@@ -1141,10 +1142,10 @@ ORDER BY
                 and BO.create_time &lt;= #{detailsVo.endCreateTime}
             </if>
             <if test="detailsVo.salesName != null and detailsVo.salesName != ''">
-                AND BGD.charge_member like concat('%', #{detailsVo.salesName}, '%')
+                AND BO.charge_member like concat('%', #{detailsVo.salesName}, '%')
             </if>
-            <if test="detailsVo.corpid != null and detailsVo.corpid != ''">
-                AND BO.corp_id like concat('%', #{detailsVo.corpid}, '%')
+            <if test="detailsVo.corpName != null and detailsVo.corpName != ''">
+                AND BCD.cname like concat('%', #{detailsVo.corpName}, '%')
             </if>
         </where>
         order by BO.create_time desc

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

@@ -77,10 +77,10 @@
             id,
             name,
             real_name as realName,
-            bank_deposit as bankDeposit,
-            bank_account as bankAccount,
-            reimburse_number as reimburseNumber
-        FROM
+            COALESCE(bank_deposit,'') AS bankDeposit,
+            COALESCE(bank_account,'') AS bankAccount,
+            COALESCE(reimburse_number,'') AS reimburseNumber
+         FROM
             blade_user
         WHERE
             tenant_id = #{param1}

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/ClaimItemServiceImpl.java

@@ -87,7 +87,7 @@ public class ClaimItemServiceImpl extends ServiceImpl<ClaimItemMapper, ClaimItem
 
 		BigDecimal totalActualAmount = list.stream().map(ClaimItem::getActualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 		Claim claim = new Claim();
-		claim.setTotalActualAmount(totalActualAmount);
+		claim.setTotalAmount(totalActualAmount);
 		claim.setId(claimItem.getPid());
 		claimMapper.updateById(claim);
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -38,10 +38,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.CollectionUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.*;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -152,7 +149,7 @@ public class PurchaseOrderController extends BladeController {
 								 @RequestParam(value = "corpId",required = false) String corpId,//供应商id
 								 @RequestParam(value = "strPurchaserName",required = false) String strPurchaserName,//采购商名称
 								 @RequestParam(value = "salesName",required = false) String salesName,//业务员
-
+					  			 @RequestParam(value = "orgOrderNo",required = false) String orgOrderNo,//来源单号
 					             @RequestParam(value = "banksAccountName",required = false) String banksAccountName,//公司户头
 								  @RequestParam(value = "packageRemarks",required = false) String packageRemarks,//包装要求
 								  @RequestParam(value = "createUser",required = false) Long createUser,//制单人
@@ -221,6 +218,7 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.like(StringUtils.isNotBlank(salesName),"sales_name",salesName);
 		queryWrapper.like(StringUtils.isNotBlank(orderNo),"order_no",orderNo);
 		queryWrapper.like(StringUtils.isNotBlank(paymentType),"payment_type",paymentType);
+		queryWrapper.like(StringUtils.isNotBlank(orgOrderNo),"org_order_no", orgOrderNo);//来源单号
 		queryWrapper.eq(StringUtils.isNotBlank(corpId),"corp_id",corpId);
 		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
 		queryWrapper.eq(createUser!=null,"create_user",createUser);
@@ -364,7 +362,7 @@ public class PurchaseOrderController extends BladeController {
 					  @RequestParam(value = "corpId",required = false) String corpId,//供应商id
 					  @RequestParam(value = "strPurchaserName",required = false) String strPurchaserName,//采购商名称
 					  @RequestParam(value = "salesName",required = false) String salesName,//业务员
-
+					  @RequestParam(value = "orgOrderNo",required = false) String orgOrderNo,//来源单号
 					  @RequestParam(value = "banksAccountName",required = false) String banksAccountName,//公司户头
 					  @RequestParam(value = "packageRemarks",required = false) String packageRemarks,//包装要求
 					  @RequestParam(value = "createUser",required = false) Long createUser,//制单人
@@ -422,6 +420,7 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.like(StringUtils.isNotBlank(salesName),"sales_name",salesName);
 		queryWrapper.like(StringUtils.isNotBlank(orderNo),"order_no",orderNo);
 		queryWrapper.like(StringUtils.isNotBlank(paymentType),"payment_type",paymentType);
+		queryWrapper.like(StringUtils.isNotBlank(orgOrderNo),"org_order_no", orgOrderNo);//来源单号
 		queryWrapper.eq(StringUtils.isNotBlank(corpId),"corp_id",corpId);
 		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
 		queryWrapper.eq(createUser!=null,"create_user",createUser);