需求功能修改

hx-common/src/main/java/com/fjhx/common/entity/claim/vo/ClaimContractVo.java

@@ -30,5 +30,11 @@ public class ClaimContractVo extends ClaimContract {
      */
     private String contractCode;
 
+    /**
+     * 客户信息
+     */
+    private Long contractBuyCorporationId;
+    private String contractBuyCorporationName;
+
 
 }

hx-form/src/main/java/com/fjhx/form/entity/cost/vo/CostControlVo.java

@@ -79,5 +79,18 @@ public class CostControlVo extends CostControl {
 
     private String paymentAccountManagementName;
 
+    /**
+     * 流程当前审批人
+     */
+    private String flowHandleUserName;
+    /**
+     * 付款说明
+     */
+    private String paymentRemark;
+    /**
+     * 付款单位
+     */
+    private String paymentAccountName;
+
 
 }

hx-form/src/main/resources/mapper/cost/CostControlMapper.xml

@@ -3,10 +3,22 @@
 <mapper namespace="com.fjhx.form.mapper.cost.CostControlMapper">
     <select id="getPage" resultType="com.fjhx.form.entity.cost.vo.CostControlVo">
         SELECT cc.*,
-               ap.id       AS accountPaymentId,
-               ap.`status` AS accountPaymentStatus
+               ap.id                  AS accountPaymentId,
+               ap.`status`            AS accountPaymentStatus,
+               fec_1.handle_user_name AS flowHandleUserName,
+               ccd_1.payment_remark   AS paymentRemark,
+               am.`name`              AS paymentAccountName
         FROM cost_control cc
                  LEFT JOIN account_payment ap ON ap.cost_control_id = cc.id
+                 LEFT JOIN (SELECT fec.flow_example_id,
+                                   GROUP_CONCAT(su.nick_name) AS handle_user_name
+                            FROM flow_example_current fec
+                                     LEFT JOIN sys_user su ON su.user_id = fec.handle_user_id
+                            GROUP BY fec.flow_example_id) fec_1 ON fec_1.flow_example_id = cc.flow_id
+                 LEFT JOIN (SELECT ccd.cost_control_id, GROUP_CONCAT(ccd.remark) AS payment_remark
+                            FROM cost_control_detail ccd
+                            GROUP BY ccd.cost_control_id) ccd_1 ON ccd_1.cost_control_id = cc.id
+                 LEFT JOIN account_management am ON cc.payment_account_id = am.id
             ${ew.customSqlSegment}
     </select>
     <select id="detail" resultType="com.fjhx.form.entity.cost.vo.CostControlVo">

hx-sale/src/main/java/com/fjhx/sale/entity/arrival/vo/ArrivalDetailVo.java

@@ -24,6 +24,7 @@ public class ArrivalDetailVo extends ArrivalDetail {
     private BigDecimal productWidth;
     private BigDecimal productHeight;
     private String productColor;
+    private String productUnit;
 
     private Date arrivalTime;
 
@@ -41,5 +42,4 @@ public class ArrivalDetailVo extends ArrivalDetail {
     private Long supplierId;
     private String supplierName;
     private String purchaseCode;
-
 }

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimContractServiceImpl.java

@@ -7,12 +7,14 @@ import com.fjhx.common.entity.claim.ClaimContract;
 import com.fjhx.common.entity.claim.dto.ClaimContractDto;
 import com.fjhx.common.entity.claim.dto.ClaimContractSelectDto;
 import com.fjhx.common.entity.claim.vo.ClaimContractVo;
+import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.sale.mapper.claim.ClaimContractMapper;
 import com.fjhx.sale.service.claim.ClaimContractService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -21,12 +23,15 @@ import java.util.List;
  * 到账认领-合同关联表 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @Service
 public class ClaimContractServiceImpl extends ServiceImpl<ClaimContractMapper, ClaimContract> implements ClaimContractService {
 
+    @Resource
+    private CustomerService customerService;
+
     @Override
     public Page<ClaimContractVo> getPage(ClaimContractSelectDto dto) {
         IWrapper<ClaimContract> wrapper = getWrapper();
@@ -37,8 +42,11 @@ public class ClaimContractServiceImpl extends ServiceImpl<ClaimContractMapper, C
 
     @Override
     public List<ClaimContractVo> getList(@Param("ew") IWrapper<ClaimContract> wrapper) {
-        List<ClaimContractVo> page = this.baseMapper.getList(wrapper);
-        return page;
+        List<ClaimContractVo> list = this.baseMapper.getList(wrapper);
+        customerService.attributeAssign(list, ClaimContractVo::getContractBuyCorporationId, (item, customer) -> {
+            item.setContractBuyCorporationName(customer.getName());
+        });
+        return list;
     }
 
     @Override
@@ -65,6 +73,7 @@ public class ClaimContractServiceImpl extends ServiceImpl<ClaimContractMapper, C
 
     /**
      * 通过合同ID集合查询列表
+     *
      * @param contractIds
      * @return
      */
@@ -77,6 +86,7 @@ public class ClaimContractServiceImpl extends ServiceImpl<ClaimContractMapper, C
 
     /**
      * 根据合同号查询流水ID
+     *
      * @param code
      * @return
      */

hx-sale/src/main/resources/mapper/arrival/ArrivalDetailMapper.xml

@@ -12,6 +12,7 @@
                pi.width               AS productWidth,
                pi.height              AS productHeight,
                pi.color               AS productColor,
+               pi.unit                AS productUnit,
                swd.receipt_quantity   AS receiptQuantity,
                sw.`status`            AS receiptStatus,
                ep.company_id,

hx-sale/src/main/resources/mapper/claim/ClaimContractMapper.xml

@@ -12,7 +12,8 @@
                cc.create_time,
                cc.update_user,
                cc.update_time,
-               c.`code` AS contractCode,
+               c.`code`             AS contractCode,
+               c.buy_corporation_id as contractBuyCorporationId,
                cl.business_id
         FROM claim_contract cc
                  left join claim cl on cc.claim_id = cl.id

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitDetailsVo.java

@@ -108,6 +108,8 @@ public class StockWaitDetailsVo extends StockWaitDetails {
      */
     private BigDecimal contractProductFactoryPrice;
 
+    private BigDecimal contractProductBusinessCostPrice;
+
     /**
      * 实际库存
      */

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitVo.java

@@ -79,4 +79,10 @@ public class StockWaitVo extends StockWait {
      * 合同出场总金额
      */
     private BigDecimal contractFactoryAmount;
+
+    /**
+     * 供应商名称
+     */
+    private Long supplierId;
+    private String supplierName;
 }

hx-wms/src/main/resources/mapper/stock/StockWaitDetailsMapper.xml

@@ -22,8 +22,9 @@
     </select>
     <select id="getList" resultType="com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo">
         SELECT swd.*,
-               cp.price         as contractProductPrice,
-               cp.factory_price as contractProductFactoryPrice
+               cp.price               as contractProductPrice,
+               cp.factory_price       as contractProductFactoryPrice,
+               cp.business_cost_price as contractProductBusinessCostPrice
         FROM stock_wait_details swd
                  LEFT JOIN contract_product cp ON swd.contract_detail_id = cp.id
             ${ew.customSqlSegment}

hx-wms/src/main/resources/mapper/stock/StockWaitMapper.xml

@@ -47,10 +47,13 @@
                c.merch_user_id                                                   as merchUserId,
                c.salesman_id                                                     as salesmanId,
                c.amount                                                          as contractAmount,
-               c.factory_amount                                                  as contractFactoryAmount
+               c.factory_amount                                                  as contractFactoryAmount,
+               si.id                                                             AS supplierId,
+               si.`name`                                                         AS supplierName
         FROM stock_wait sw
                  LEFT JOIN ehsd_purchase p ON sw.purchase_id = p.id
                  LEFT JOIN contract c ON sw.contract_id = c.id
+                 LEFT JOIN supplier_info si ON p.sell_corporation_id = si.id
             ${ew.customSqlSegment}
     </select>