修改付款单流程

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java

@@ -209,4 +209,16 @@ public class NuInvoicingCgdInfoController extends JeecgController<NuInvoicingCgd
         return Result.OK(nuInvoicingCgdInfoService.calcTotalPrice(nuInvoicingCgdInfo));
     }
 
+
+    /**
+     * 获取付款单对应单据信息
+     * @param nuInvoicingCgdInfo
+     * @return
+     */
+    @GetMapping(value = "/getFkdList")
+    public Result<List<NuInvoicingCgdInfo>> getFkdList(NuInvoicingCgdInfo nuInvoicingCgdInfo) {
+        List<NuInvoicingCgdInfo> pageList = nuInvoicingCgdInfoService.getFkdList(nuInvoicingCgdInfo);
+        return Result.OK(pageList);
+    }
+
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java

@@ -225,6 +225,14 @@ public class NuInvoicingCgdInfo implements Serializable {
     private BigDecimal xiaoJi;
     @TableField(exist = false)
     private BigDecimal zongJinE;
+    @TableField(exist = false)
+    private String brandType;
+    @TableField(exist = false)
+    private String manufacturer;
+    @TableField(exist = false)
+    private String pkId;
+    @TableField(exist = false)
+    private String cgdNo;
 
 //    // 格式化getter方法
 //    public BigDecimal getProcurementPrice() {

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java

@@ -26,4 +26,6 @@ public interface NuInvoicingCgdInfoMapper extends BaseMapper<NuInvoicingCgdInfo>
     List<NuInvoicingCgdInfo> totalPrice(@Param("dto") NuInvoicingCgdInfo nuInvoicingCgdInfo);
 
     IPage<NuInvoicingCgdInfo> pageList(IPage<NuInvoicingCgdInfo> page, @Param("dto") NuInvoicingCgdInfo nuInvoicingCgdInfo);
+
+    List<NuInvoicingCgdInfo> getFkdList(@Param("params") NuInvoicingCgdInfo nuInvoicingCgdInfo);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml

@@ -39,9 +39,10 @@
     </select>
 
     <select id="pageList" resultType="com.nu.modules.cgd.entity.NuInvoicingCgdInfo">
-        select info.*,crk.new_price AS crkje,crk.crk_num AS crksl
+        select info.*,crk.new_price AS crkje,crk.crk_num AS crksl,mat.brand_type,mat.manufacturer
         from nu_invoicing_cgd_info info
         left join nu_warehouse_material_crk_info crk on crk.cgd_id = info.cgd_id and crk.wl_id = info.wl_id
+        left join nu_config_material_info mat on info.wl_id = mat.id
         <where>
             crk.crk_status = 1 and crk.crk_type = 1
             <if test="dto.cgdId != null and dto.cgdId != ''">
@@ -53,5 +54,17 @@
         </where>
         order by crk.create_by desc
     </select>
+    <select id="getFkdList" resultType="com.nu.modules.cgd.entity.NuInvoicingCgdInfo">
+        SELECT * from nu_invoicing_cgd_main
+         <where>
+             <if test="params.pkId != null and params.pkId != ''">
+                 and id in
+                 <foreach collection="params.pkId.split(',')" item="id" open="(" separator="," close=")">
+                     #{id}
+                 </foreach>
+             </if>
+
+         </where>
+    </select>
 
 </mapper>

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.nu.modules.cgd.entity.NuInvoicingCgdMain;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description: nu_invoicing_cgd_info
@@ -21,4 +22,6 @@ public interface INuInvoicingCgdInfoService extends IService<NuInvoicingCgdInfo>
     IPage<NuInvoicingCgdInfo> pageList(Page<NuInvoicingCgdInfo> page, NuInvoicingCgdInfo nuInvoicingCgdInfo);
 
     BigDecimal calcTotalPrice(NuInvoicingCgdInfo nuInvoicingCgdInfo);
+
+    List<NuInvoicingCgdInfo> getFkdList(NuInvoicingCgdInfo nuInvoicingCgdInfo);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java

@@ -71,4 +71,9 @@ public class NuInvoicingCgdInfoServiceImpl extends ServiceImpl<NuInvoicingCgdInf
         }
         return totalSum;
     }
+
+    @Override
+    public List<NuInvoicingCgdInfo> getFkdList(NuInvoicingCgdInfo nuInvoicingCgdInfo) {
+        return baseMapper.getFkdList(nuInvoicingCgdInfo);
+    }
 }