进销存-付款单

2025-11-24 10:36:14 +08:00 · 2025-11-24 10:36:14 +08:00 · c96145a77c
parent 3b42d2595d
commit c96145a77c
10 changed files with 225 additions and 158 deletions
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java
@ -12,6 +12,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import com.aliyun.core.utils.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
@ -188,6 +189,9 @@ public class NuInvoicingCgdInfoController extends JeecgController<NuInvoicingCgd
                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                HttpServletRequest req) {
+        if (StringUtils.isBlank(nuInvoicingCgdInfo.getCgdId())) {
+            return Result.ok(new Page<>());
+        }
        Page<NuInvoicingCgdInfo> page = new Page<NuInvoicingCgdInfo>(pageNo, pageSize);
        IPage<NuInvoicingCgdInfo> pageList = nuInvoicingCgdInfoService.pageList(page, nuInvoicingCgdInfo);
        return Result.OK(pageList);
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java
@ -73,15 +73,19 @@ public class NuInvoicingCgdMainController extends JeecgController<NuInvoicingCgd
                                                           HttpServletRequest req) {
        QueryWrapper<NuInvoicingCgdMain> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdMain, req.getParameterMap());
        Page<NuInvoicingCgdMain> page = new Page<NuInvoicingCgdMain>(pageNo, pageSize);
+        if (nuInvoicingCgdMain.getJhTime_() != null) {
+
+        }
        //付款单-生成采购单
        if ("fukuandan".equals(nuInvoicingCgdMain.getResourceFrontView())) {
            //没选择供应商时不应返回结果
            if (StringUtils.isBlank(nuInvoicingCgdMain.getGysId())) {
                Page<NuInvoicingCgdMain> emptyPage = new Page<>(pageNo, pageSize);
                return Result.OK(emptyPage);
-            }else{
+            } else {
                //生成付款单只查询“已完结”采购单
-                queryWrapper.eq("cgd_type","2");
+                queryWrapper.eq("cgd_type", "2");
+                queryWrapper.eq("iz_fkd", "N");
            }
        }
        IPage<NuInvoicingCgdMain> pageList = nuInvoicingCgdMainService.page(page, queryWrapper);
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java
@ -154,6 +154,8 @@ public class NuInvoicingCgdMain implements Serializable {
    private String shareBy;
    private String shareTel;

+    /**是否已生成有效付款单 Y是 N否*/
+    private String izFkd;



@ -167,4 +169,34 @@ public class NuInvoicingCgdMain implements Serializable {
    /**来源于哪个前端界面*/
    @TableField(exist = false)
    private String resourceFrontView;
+
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date jhTime_;
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date jhTimevBegin;
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date jhTime_end;
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date jhTime__end;
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date jhTime__End;
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date jhTimevEnd;
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date wjTime_;
 }
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java
@ -23,8 +23,6 @@ public interface NuInvoicingCgdInfoMapper extends BaseMapper<NuInvoicingCgdInfo>

    List<NuInvoicingCgdInfo> selectWlNumList(@Param("params") NuInvoicingCgdInfo nuInvoicingCgdInfo);

-    IPage<NuInvoicingCgdMain> getWjcgdByGys(IPage<NuInvoicingCgdMain> page, @Param("dto") NuInvoicingCgdMain dto);
-
    List<NuInvoicingCgdInfo> totalPrice(@Param("dto") NuInvoicingCgdInfo nuInvoicingCgdInfo);

    IPage<NuInvoicingCgdInfo> pageList(IPage<NuInvoicingCgdInfo> page, @Param("dto") NuInvoicingCgdInfo nuInvoicingCgdInfo);
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml
@ -23,13 +23,6 @@
        GROUP BY b.nu_id, b.wl_id, b.dhbl
    </select>

-    <select id="getWjcgdByGys" resultType="com.nu.modules.cgd.entity.NuInvoicingCgdMain">
-        select info.*
-        from nu_invoicing_cgd_info info
-                 left join nu_invoicing_cgd_main main on info.cgd_id = main.id
-        where main.id = #{dto.id}
-    </select>
-
    <select id="totalPrice" resultType="com.nu.modules.cgd.entity.NuInvoicingCgdInfo">
        select crk.new_price AS crkje,crk.crk_num AS crksl
        from nu_invoicing_cgd_info info
@ -52,7 +45,10 @@
        <where>
            crk.crk_status = 1 and crk.crk_type = 1
            <if test="dto.cgdId != null and dto.cgdId != ''">
-                and crk.cgd_id = #{dto.cgdId}
+                and crk.cgd_id in
+                <foreach collection="dto.cgdId.split(',')" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
            </if>
        </where>
        order by crk.create_by desc
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java
@ -17,7 +17,6 @@ import java.math.BigDecimal;
 */
 public interface INuInvoicingCgdInfoService extends IService<NuInvoicingCgdInfo> {

-    IPage<NuInvoicingCgdMain> getWjcgdByGys(NuInvoicingCgdMain dto, Integer pageNo, Integer pageSize);

    IPage<NuInvoicingCgdInfo> pageList(Page<NuInvoicingCgdInfo> page, NuInvoicingCgdInfo nuInvoicingCgdInfo);

--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java
@ -23,12 +23,6 @@ import java.util.List;
@Service
 public class NuInvoicingCgdInfoServiceImpl extends ServiceImpl<NuInvoicingCgdInfoMapper, NuInvoicingCgdInfo> implements INuInvoicingCgdInfoService {

-    @Override
-    public IPage<NuInvoicingCgdMain> getWjcgdByGys(NuInvoicingCgdMain dto, Integer pageNo, Integer pageSize) {
-        IPage<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
-        return baseMapper.getWjcgdByGys(page, dto);
-    }
-
    @Override
    public IPage<NuInvoicingCgdInfo> pageList(Page<NuInvoicingCgdInfo> page, NuInvoicingCgdInfo dto) {
        //计算总金额
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/fkd/controller/NuInvoicingFkdInfoController.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/fkd/controller/NuInvoicingFkdInfoController.java
@ -10,6 +10,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
@ -39,125 +40,145 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

- /**
+/**
 * @Description: 进销存-付款单详细信息
 * @Author: jeecg-boot
- * @Date:   2025-11-21
+ * @Date: 2025-11-21
 * @Version: V1.0
 */
-@Api(tags="进销存-付款单详细信息")
+@Api(tags = "进销存-付款单详细信息")
@RestController
@RequestMapping("/fkd/nuInvoicingFkdInfo")
@Slf4j
 public class NuInvoicingFkdInfoController extends JeecgController<NuInvoicingFkdInfo, INuInvoicingFkdInfoService> {
-	@Autowired
-	private INuInvoicingFkdInfoService nuInvoicingFkdInfoService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param nuInvoicingFkdInfo
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "进销存-付款单详细信息-分页列表查询")
-	@ApiOperation(value="进销存-付款单详细信息-分页列表查询", notes="进销存-付款单详细信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<NuInvoicingFkdInfo>> queryPageList(NuInvoicingFkdInfo nuInvoicingFkdInfo,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-        QueryWrapper<NuInvoicingFkdInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingFkdInfo, req.getParameterMap());
-		Page<NuInvoicingFkdInfo> page = new Page<NuInvoicingFkdInfo>(pageNo, pageSize);
-		IPage<NuInvoicingFkdInfo> pageList = nuInvoicingFkdInfoService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param nuInvoicingFkdInfo
-	 * @return
-	 */
-	@AutoLog(value = "进销存-付款单详细信息-添加")
-	@ApiOperation(value="进销存-付款单详细信息-添加", notes="进销存-付款单详细信息-添加")
-	@RequiresPermissions("fkd:nu_invoicing_fkd_info:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody NuInvoicingFkdInfo nuInvoicingFkdInfo) {
-		nuInvoicingFkdInfoService.save(nuInvoicingFkdInfo);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param nuInvoicingFkdInfo
-	 * @return
-	 */
-	@AutoLog(value = "进销存-付款单详细信息-编辑")
-	@ApiOperation(value="进销存-付款单详细信息-编辑", notes="进销存-付款单详细信息-编辑")
-	@RequiresPermissions("fkd:nu_invoicing_fkd_info:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody NuInvoicingFkdInfo nuInvoicingFkdInfo) {
-		nuInvoicingFkdInfoService.updateById(nuInvoicingFkdInfo);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "进销存-付款单详细信息-通过id删除")
-	@ApiOperation(value="进销存-付款单详细信息-通过id删除", notes="进销存-付款单详细信息-通过id删除")
-	@RequiresPermissions("fkd:nu_invoicing_fkd_info:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		nuInvoicingFkdInfoService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "进销存-付款单详细信息-批量删除")
-	@ApiOperation(value="进销存-付款单详细信息-批量删除", notes="进销存-付款单详细信息-批量删除")
-	@RequiresPermissions("fkd:nu_invoicing_fkd_info:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.nuInvoicingFkdInfoService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "进销存-付款单详细信息-通过id查询")
-	@ApiOperation(value="进销存-付款单详细信息-通过id查询", notes="进销存-付款单详细信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<NuInvoicingFkdInfo> queryById(@RequestParam(name="id",required=true) String id) {
-		NuInvoicingFkdInfo nuInvoicingFkdInfo = nuInvoicingFkdInfoService.getById(id);
-		if(nuInvoicingFkdInfo==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(nuInvoicingFkdInfo);
-	}
+    @Autowired
+    private INuInvoicingFkdInfoService nuInvoicingFkdInfoService;

    /**
-    * 导出excel
-    *
-    * @param request
-    * @param nuInvoicingFkdInfo
-    */
+     * 分页列表查询
+     *
+     * @param nuInvoicingFkdInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "进销存-付款单详细信息-分页列表查询")
+    @ApiOperation(value = "进销存-付款单详细信息-分页列表查询", notes = "进销存-付款单详细信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<NuInvoicingFkdInfo>> queryPageList(NuInvoicingFkdInfo nuInvoicingFkdInfo,
+                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                           HttpServletRequest req) {
+        QueryWrapper<NuInvoicingFkdInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingFkdInfo, req.getParameterMap());
+        Page<NuInvoicingFkdInfo> page = new Page<NuInvoicingFkdInfo>(pageNo, pageSize);
+        IPage<NuInvoicingFkdInfo> pageList = nuInvoicingFkdInfoService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 查询付款单id 逗号拼接
+     *
+     * @param nuInvoicingFkdInfo
+     * @return
+     */
+    @ApiOperation(value = "进销存-付款单详细信息-查询付款单id,逗号拼接", notes = "进销存-付款单详细信息-查询付款单id,逗号拼接")
+    @GetMapping(value = "/queryCgdIds")
+    public Result<String> queryCgdIds(NuInvoicingFkdInfo nuInvoicingFkdInfo) {
+        QueryWrapper<NuInvoicingFkdInfo> qw = new QueryWrapper<>();
+        qw.eq("pk_id", nuInvoicingFkdInfo.getPkId());
+        qw.select("cgd_id");
+        List<NuInvoicingFkdInfo> list = nuInvoicingFkdInfoService.list(qw);
+        if (list != null && list.size() > 0) {
+            return Result.OK(list.stream().map(NuInvoicingFkdInfo::getCgdId).collect(Collectors.joining(",")));
+        } else {
+            return Result.OK(null);
+        }
+    }
+
+    /**
+     * 添加
+     *
+     * @param nuInvoicingFkdInfo
+     * @return
+     */
+    @AutoLog(value = "进销存-付款单详细信息-添加")
+    @ApiOperation(value = "进销存-付款单详细信息-添加", notes = "进销存-付款单详细信息-添加")
+    @RequiresPermissions("fkd:nu_invoicing_fkd_info:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody NuInvoicingFkdInfo nuInvoicingFkdInfo) {
+        nuInvoicingFkdInfoService.save(nuInvoicingFkdInfo);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param nuInvoicingFkdInfo
+     * @return
+     */
+    @AutoLog(value = "进销存-付款单详细信息-编辑")
+    @ApiOperation(value = "进销存-付款单详细信息-编辑", notes = "进销存-付款单详细信息-编辑")
+    @RequiresPermissions("fkd:nu_invoicing_fkd_info:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody NuInvoicingFkdInfo nuInvoicingFkdInfo) {
+        nuInvoicingFkdInfoService.updateById(nuInvoicingFkdInfo);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "进销存-付款单详细信息-通过id删除")
+    @ApiOperation(value = "进销存-付款单详细信息-通过id删除", notes = "进销存-付款单详细信息-通过id删除")
+    @RequiresPermissions("fkd:nu_invoicing_fkd_info:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        nuInvoicingFkdInfoService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "进销存-付款单详细信息-批量删除")
+    @ApiOperation(value = "进销存-付款单详细信息-批量删除", notes = "进销存-付款单详细信息-批量删除")
+    @RequiresPermissions("fkd:nu_invoicing_fkd_info:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.nuInvoicingFkdInfoService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "进销存-付款单详细信息-通过id查询")
+    @ApiOperation(value = "进销存-付款单详细信息-通过id查询", notes = "进销存-付款单详细信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<NuInvoicingFkdInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        NuInvoicingFkdInfo nuInvoicingFkdInfo = nuInvoicingFkdInfoService.getById(id);
+        if (nuInvoicingFkdInfo == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(nuInvoicingFkdInfo);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param nuInvoicingFkdInfo
+     */
    @RequiresPermissions("fkd:nu_invoicing_fkd_info:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, NuInvoicingFkdInfo nuInvoicingFkdInfo) {
@ -165,12 +186,12 @@ public class NuInvoicingFkdInfoController extends JeecgController<NuInvoicingFkd
    }

    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
    @RequiresPermissions("fkd:nu_invoicing_fkd_info:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/fkd/controller/NuInvoicingFkdMainController.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/fkd/controller/NuInvoicingFkdMainController.java
@ -2,10 +2,7 @@ package com.nu.modules.fkd.controller;

 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@ -15,8 +12,10 @@ import javax.servlet.http.HttpServletResponse;

 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.nu.modules.cgd.entity.NuInvoicingCgdMain;
 import com.nu.modules.cgd.service.INuInvoicingCgdInfoService;
+import com.nu.modules.cgd.service.INuInvoicingCgdMainService;
 import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo;
 import com.nu.modules.configSuppliersInfo.service.IConfigSuppliersInfoService;
 import com.nu.modules.fkd.entity.NuInvoicingFkdInfo;
@ -70,6 +69,8 @@ public class NuInvoicingFkdMainController extends JeecgController<NuInvoicingFkd
    private IConfigSuppliersInfoService suppliersInfoService;
    @Autowired
    private INuInvoicingFkdInfoService invoicingFkdInfoService;
+    @Autowired
+    private INuInvoicingCgdMainService invoicingCgdMainService;

    /**
     * 分页列表查询
@ -154,6 +155,12 @@ public class NuInvoicingFkdMainController extends JeecgController<NuInvoicingFkd
            invoicingFkdInfoService.save(fkdInfo);
        }

+        //将对应采购单izFkd设置为Y
+        NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
+        cgdMain.setIzFkd("Y");
+        UpdateWrapper<NuInvoicingCgdMain> cgdUw = new UpdateWrapper<>();
+        cgdUw.in("id", cgdIds.split(","));
+        invoicingCgdMainService.update(cgdMain, cgdUw);
        return Result.OK("添加成功！");
    }

@ -168,8 +175,10 @@ public class NuInvoicingFkdMainController extends JeecgController<NuInvoicingFkd
    @RequiresPermissions("fkd:nu_invoicing_fkd_main:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody NuInvoicingFkdMain nuInvoicingFkdMain) {
+        nuInvoicingFkdMain.setStatus("2");
+        nuInvoicingFkdMain.setFksj(new Date());
        nuInvoicingFkdMainService.updateById(nuInvoicingFkdMain);
-        return Result.OK("编辑成功!");
+        return Result.OK("付款成功!");
    }

    /**
@ -244,22 +253,32 @@ public class NuInvoicingFkdMainController extends JeecgController<NuInvoicingFkd
        return super.importExcel(request, response, NuInvoicingFkdMain.class);
    }

-//    /**
-//     * 根据供应商查询已完结付款单
-//     *
-//     * @param dto
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    //@AutoLog(value = "进销存-根据供应商查询已完结付款单")
-//    @ApiOperation(value = "进销存-付款单主信息-分页列表查询", notes = "进销存-根据供应商查询已完结付款单")
-//    @GetMapping(value = "/getWjcgdByGys")
-//    public Result<IPage<NuInvoicingCgdMain>> getWjcgdByGys(NuInvoicingCgdMain dto,
-//                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                           HttpServletRequest req) {
-//        return Result.OK(invoicingCgdInfoService.getWjcgdByGys(dto, pageNo, pageSize));
-//    }
+    /**
+     * 作废
+     *
+     * @param nuInvoicingFkdMain
+     * @return
+     */
+    @AutoLog(value = "进销存-付款单主信息-作废")
+    @ApiOperation(value = "进销存-付款单主信息-作废", notes = "进销存-付款单主信息-作废")
+    @RequestMapping(value = "/cancellation", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> cancellation(@RequestBody NuInvoicingFkdMain nuInvoicingFkdMain) {
+        NuInvoicingFkdMain upData = new NuInvoicingFkdMain();
+        upData.setId(nuInvoicingFkdMain.getId());
+        upData.setStatus("1");
+        nuInvoicingFkdMainService.updateById(upData);
+
+        //将采购单主表的iz_fkd设置为"N"
+        QueryWrapper<NuInvoicingFkdInfo> qw = new QueryWrapper<>();
+        qw.eq("pk_id", nuInvoicingFkdMain.getId());
+        List<NuInvoicingFkdInfo> infoList = invoicingFkdInfoService.list(qw);
+        List<String> cgdIds = infoList.stream().map(NuInvoicingFkdInfo::getCgdId).collect(Collectors.toList());
+        NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
+        cgdMain.setIzFkd("N");
+        UpdateWrapper<NuInvoicingCgdMain> cgdUw = new UpdateWrapper<>();
+        cgdUw.in("id", cgdIds);
+        invoicingCgdMainService.update(cgdMain, cgdUw);
+
+        return Result.OK("操作成功!");
+    }
 }
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/fkd/entity/NuInvoicingFkdMain.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/fkd/entity/NuInvoicingFkdMain.java
@ -101,7 +101,7 @@ public class NuInvoicingFkdMain implements Serializable {
    @ApiModelProperty(value = "备注")
    private java.lang.String bz;
    /**编号*/
-    private int fkdNoOrder;
+    private Integer fkdNoOrder;

    @TableField(exist = false)
    private String cgdIds;