Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -973,9 +973,9 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     finPaymentrecordDto.setCostTypeValue("垫款");
                     finPaymentrecordDto.setCostTitleKey("008");
                     finPaymentrecordDto.setCostTitleValue("月还");
-                    finPaymentrecordDto.setReceiveBank(loanBePadsincereVehDetailsVo.getBankCollectionAcc());
+                    finPaymentrecordDto.setReceiveBank("");
                     finPaymentrecordDto.setReceiveBankAccount(loanBePadsincereVehDetailsVo.getBankCollectionNum());
-                    finPaymentrecordDto.setReceiveCompany("");
+                    finPaymentrecordDto.setReceiveCompany(loanBePadsincereVehDetailsVo.getBankCollectionAcc());
                     finPaymentrecordDto.setCost(loanBePadsincereVehDetailsVo.getPadMoney());
                     finPaymentrecordDto.setAccountsReceive(loanBePadsincereVehDetailsVo.getPadMoney());
                     finPaymentrecordDto.setBusSid(loanBePadsincereApply.getSid());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillFeign.java

@@ -57,4 +57,8 @@ public interface AppInventoryCheckbillFeign {
     @GetMapping("/selectProvider")
     @ResponseBody
     public ResultBean<List<AppInventoryCheckbill>> selectProvider(@RequestParam(value = "name",required = false) String name,@RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("查看盘点报告")
+    @GetMapping("/viewReport")
+    public ResultBean<AppInventoryCheckbillReportDetailsVo> viewReport(@RequestParam("sid") String sid);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillReportDetailsVo.java

@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "盘点报告 视图数据详情", description = "盘点报告 视图数据详情")
+public class AppInventoryCheckbillReportDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("生成日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("监盘人姓名")
+    private String superviseName;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("pdf路径")
+    private String pdfUrl;
+
+    //总体盘点情况
+    @ApiModelProperty("应盘数量")
+    private BigDecimal bookCountTotal;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal bookAmountTotal;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCountTotal;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal realAmountTotal;
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal profitCountTotal;
+    @ApiModelProperty("盘盈金额")
+    private BigDecimal profitAmountTotal;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal loseCountTotal;
+    @ApiModelProperty("盘亏金额")
+    private BigDecimal loseAmountTotal;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCountTotal;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal lossAmountTotal;
+
+    //仓库盘点情况
+    List<AppInventoryCheckbillReportSumVo> ware = new ArrayList<>();
+
+    //库区盘点情况
+    List<AppInventoryCheckbillReportSumVo> area = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillReportSumVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-wms(盘点报告) <br/>
+ * File: WmsInventoryCheckbillReportVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReportVo <br/>
+ * Description: 盘点报告 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 09:52:51 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘点报告 视图数据详情", description = "盘点报告 视图数据详情")
+public class AppInventoryCheckbillReportSumVo implements Vo {
+
+    @ApiModelProperty("仓库名称（或仓库-库区名称）")
+    private String warehouseName;
+    @ApiModelProperty("应盘数量")
+    private BigDecimal bookCount;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal bookAmount;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal realAmount;
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal profitCount;
+    @ApiModelProperty("盘盈金额")
+    private BigDecimal profitAmount;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal loseCount;
+    @ApiModelProperty("盘亏金额")
+    private BigDecimal loseAmount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal lossAmount;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java

@@ -77,4 +77,9 @@ public class WmsInventoryCheckbillRest implements AppInventoryCheckbillFeign {
     public ResultBean<List<AppInventoryCheckbill>> selectProvider(String name, String orgPath) {
         return wmsInventoryCheckbillService.selectProvider(name, orgPath);
     }
+
+    @Override
+    public ResultBean<AppInventoryCheckbillReportDetailsVo> viewReport(String sid) {
+        return wmsInventoryCheckbillService.viewReport(sid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java

@@ -25,16 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.wms.inventorycheckbill;
 
-import com.yxt.anrui.fin.api.finbillapplication.PcSelBillVinNoPageVo;
 import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
 import com.yxt.anrui.terminal.fegin.basegoodssku.BaseGoodsSkuFeign;
 import com.yxt.anrui.terminal.fegin.basegoodssku.GoodsDeptVo;
 import com.yxt.anrui.terminal.fegin.basesupplierinfo.BaseSupplierInfoChoice;
 import com.yxt.anrui.terminal.fegin.basesupplierinfo.BaseSupplierInfoFeign;
-import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailFile;
-import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailRackGoodPageListQuery;
-import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailRackGoodPageListVo;
-import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillFeign;
+import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.*;
+import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -42,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -55,6 +53,8 @@ public class WmsInventoryCheckbillService {
     private BaseSupplierInfoFeign baseSupplierInfoFeign;
     @Autowired
     private BaseGoodsSkuFeign baseGoodsSkuFeign;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
 
     public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> pdlist(PagerQuery<WmsInventoryCheckbillPageQuery> pagerQuery) {
         return wmsInventoryCheckbillFeign.appDetailRackPageList(pagerQuery);
@@ -155,4 +155,61 @@ public class WmsInventoryCheckbillService {
         }
         return rb.success().setData(appInventoryCheckbills);
     }
+
+    public ResultBean<AppInventoryCheckbillReportDetailsVo> viewReport(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsInventoryCheckbillReportDetailsVo data = wmsInventoryCheckbillFeign.viewReport(sid).getData();
+        AppInventoryCheckbillReportDetailsVo appInventoryCheckbillReportDetailsVo = new AppInventoryCheckbillReportDetailsVo();
+        appInventoryCheckbillReportDetailsVo.setPdfUrl(docPdfComponent.getPrefixTemplateUrl() + data.getPdfUrl());
+        appInventoryCheckbillReportDetailsVo.setCreateByName(data.getCreateByName());
+        appInventoryCheckbillReportDetailsVo.setDeptName(data.getDeptName());
+        appInventoryCheckbillReportDetailsVo.setCreateTime(data.getCreateTime());
+        appInventoryCheckbillReportDetailsVo.setSuperviseName(data.getFinances());
+        appInventoryCheckbillReportDetailsVo.setRemarks(data.getRemarks());
+        appInventoryCheckbillReportDetailsVo.setBookCountTotal(data.getYpNum());
+        appInventoryCheckbillReportDetailsVo.setBookAmountTotal(data.getYpMoney().setScale(2, RoundingMode.HALF_UP));
+        appInventoryCheckbillReportDetailsVo.setRealCountTotal(data.getSpNum());
+        appInventoryCheckbillReportDetailsVo.setRealAmountTotal(data.getSpMoney().setScale(2, RoundingMode.HALF_UP));
+        appInventoryCheckbillReportDetailsVo.setProfitCountTotal(data.getPyNum());
+        appInventoryCheckbillReportDetailsVo.setProfitAmountTotal(data.getPyMoney().setScale(2, RoundingMode.HALF_UP));
+        appInventoryCheckbillReportDetailsVo.setLoseCountTotal(data.getPkNum());
+        appInventoryCheckbillReportDetailsVo.setLoseAmountTotal(data.getPkMoney().setScale(2, RoundingMode.HALF_UP));
+        appInventoryCheckbillReportDetailsVo.setLossCountTotal(data.getPsNum());
+        appInventoryCheckbillReportDetailsVo.setLossAmountTotal(data.getPsMoney().setScale(2, RoundingMode.HALF_UP));
+        List<AppInventoryCheckbillReportSumVo> ware = new ArrayList<>();
+        for (WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo : data.getWarehouseStocktakList()) {
+            AppInventoryCheckbillReportSumVo appInventoryCheckbillReportSumVo = new AppInventoryCheckbillReportSumVo();
+            appInventoryCheckbillReportSumVo.setWarehouseName(wmsInventoryCheckbillReportSumVo.getWarehouseName());
+            appInventoryCheckbillReportSumVo.setBookCount(wmsInventoryCheckbillReportSumVo.getYpNum());
+            appInventoryCheckbillReportSumVo.setBookAmount(wmsInventoryCheckbillReportSumVo.getYpMoney().setScale(2, RoundingMode.HALF_UP));
+            appInventoryCheckbillReportSumVo.setRealCount(wmsInventoryCheckbillReportSumVo.getSpNum());
+            appInventoryCheckbillReportSumVo.setRealAmount(wmsInventoryCheckbillReportSumVo.getSpMoney().setScale(2, RoundingMode.HALF_UP));
+            appInventoryCheckbillReportSumVo.setProfitCount(wmsInventoryCheckbillReportSumVo.getPyNum());
+            appInventoryCheckbillReportSumVo.setProfitAmount(wmsInventoryCheckbillReportSumVo.getPyMoney().setScale(2, RoundingMode.HALF_UP));
+            appInventoryCheckbillReportSumVo.setLoseCount(wmsInventoryCheckbillReportSumVo.getPkNum());
+            appInventoryCheckbillReportSumVo.setLoseAmount(wmsInventoryCheckbillReportSumVo.getPkMoney().setScale(2, RoundingMode.HALF_UP));
+            appInventoryCheckbillReportSumVo.setLossCount(wmsInventoryCheckbillReportSumVo.getPsNum());
+            appInventoryCheckbillReportSumVo.setLossAmount(wmsInventoryCheckbillReportSumVo.getPsMoney().setScale(2, RoundingMode.HALF_UP));
+            ware.add(appInventoryCheckbillReportSumVo);
+        }
+        appInventoryCheckbillReportDetailsVo.setWare(ware);
+        List<AppInventoryCheckbillReportSumVo> area = new ArrayList<>();
+        for (WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo : data.getArehouseAreaeStocktakList()) {
+            AppInventoryCheckbillReportSumVo appInventoryCheckbillReportSumVo = new AppInventoryCheckbillReportSumVo();
+            appInventoryCheckbillReportSumVo.setWarehouseName(wmsInventoryCheckbillReportSumVo.getWarehouseAreaeName());
+            appInventoryCheckbillReportSumVo.setBookCount(wmsInventoryCheckbillReportSumVo.getYpNum());
+            appInventoryCheckbillReportSumVo.setBookAmount(wmsInventoryCheckbillReportSumVo.getYpMoney().setScale(2, RoundingMode.HALF_UP));
+            appInventoryCheckbillReportSumVo.setRealCount(wmsInventoryCheckbillReportSumVo.getSpNum());
+            appInventoryCheckbillReportSumVo.setRealAmount(wmsInventoryCheckbillReportSumVo.getSpMoney().setScale(2, RoundingMode.HALF_UP));
+            appInventoryCheckbillReportSumVo.setProfitCount(wmsInventoryCheckbillReportSumVo.getPyNum());
+            appInventoryCheckbillReportSumVo.setProfitAmount(wmsInventoryCheckbillReportSumVo.getPyMoney().setScale(2, RoundingMode.HALF_UP));
+            appInventoryCheckbillReportSumVo.setLoseCount(wmsInventoryCheckbillReportSumVo.getPkNum());
+            appInventoryCheckbillReportSumVo.setLoseAmount(wmsInventoryCheckbillReportSumVo.getPkMoney().setScale(2, RoundingMode.HALF_UP));
+            appInventoryCheckbillReportSumVo.setLossCount(wmsInventoryCheckbillReportSumVo.getPsNum());
+            appInventoryCheckbillReportSumVo.setLossAmount(wmsInventoryCheckbillReportSumVo.getPsMoney().setScale(2, RoundingMode.HALF_UP));
+            area.add(appInventoryCheckbillReportSumVo);
+        }
+        appInventoryCheckbillReportDetailsVo.setArea(area);
+        return rb.success().setData(appInventoryCheckbillReportDetailsVo);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java

@@ -43,4 +43,8 @@ public interface WmsInventoryCheckbillFeign {
     @GetMapping("/scan")
     @ResponseBody
     public ResultBean<HandleBean> scan(@RequestParam("sid") String sid, @RequestParam("content") String content, @RequestParam("houseSid") String houseSid);
+
+    @ApiOperation("查看盘点报告")
+    @PostMapping("/viewReport")
+    public ResultBean<WmsInventoryCheckbillReportDetailsVo> viewReport(@RequestParam("sid") String sid);
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillReportDetailsVo.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: yxt-wms(盘点报告) <br/>
+ * File: WmsInventoryCheckbillReportVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReportVo <br/>
+ * Description: 盘点报告 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 09:52:51 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘点报告 视图数据详情", description = "盘点报告 视图数据详情")
+public class WmsInventoryCheckbillReportDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("生成日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("盘点人")
+    private String createName;
+    @ApiModelProperty("监盘人姓名")
+    private String finances;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("pdf路径")
+    private String pdfUrl;
+
+    //总体盘点情况
+    @ApiModelProperty("应盘数量")
+    private BigDecimal ypNum;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal ypMoney;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal spNum;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal spMoney;
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal pyNum;
+    @ApiModelProperty("盘盈金额")
+    private BigDecimal pyMoney;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal pkNum;
+    @ApiModelProperty("盘亏金额")
+    private BigDecimal pkMoney;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal psNum;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal psMoney;
+
+    //仓库盘点情况
+    List<WmsInventoryCheckbillReportSumVo> warehouseStocktakList = new ArrayList<>();
+
+    //库区盘点情况
+    List<WmsInventoryCheckbillReportSumVo> arehouseAreaeStocktakList = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillReportSumVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-wms(盘点报告) <br/>
+ * File: WmsInventoryCheckbillReportVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReportVo <br/>
+ * Description: 盘点报告 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 09:52:51 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘点报告 视图数据详情", description = "盘点报告 视图数据详情")
+public class WmsInventoryCheckbillReportSumVo implements Vo {
+
+    /*
+    * 盘点报告序号
+    * */
+    @ApiModelProperty("序号")
+    private Integer id;
+
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("仓库-库区")
+    private String warehouseAreaeName;
+    @ApiModelProperty("应盘数量")
+    private BigDecimal ypNum;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal ypMoney;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal spNum;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal spMoney;
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal pyNum;
+    @ApiModelProperty("盘盈金额")
+    private BigDecimal pyMoney;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal pkNum;
+    @ApiModelProperty("盘亏金额")
+    private BigDecimal pkMoney;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal psNum;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal psMoney;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java

@@ -95,6 +95,14 @@ public class WmsInventoryCheckbillRest {
         return rb.success().success().setData(wmsInventoryCheckbillReportDetailsVo);
     }
 
+    @ApiOperation("保存办理盘点报告")
+    @PostMapping("/saveReport")
+    public ResultBean saveReport(@RequestParam("sid") String sid,@RequestParam("remarks") String remarks) {
+        ResultBean rb = ResultBean.fireFail();
+        wmsInventoryCheckbillService.saveReport(sid,remarks);
+        return rb.success().success();
+    }
+
     @ApiOperation("生成盘点报告PDF")
     @PostMapping("/createPdf")
     public ResultBean<String> createPdf(@RequestParam("sid") String sid) {

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryProfitinRest.java

@@ -44,7 +44,7 @@ import java.util.List;
 
 @Api(tags = "盘盈入库申请")
 @RestController
-@RequestMapping("v1/wmsinventoryprofitin")
+@RequestMapping("v1/wmsinventorysurplus")
 public class WmsInventoryProfitinRest {
 
 	@Autowired
@@ -78,6 +78,14 @@ public class WmsInventoryProfitinRest {
 		return rb.success().setData(vo);
 	}
 
+	@ApiOperation("根据部门sid获取盘点单号")
+	@PostMapping("/getSourceBillNoBySid")
+	public ResultBean<InventoryBillVo> getSourceBillNoBySid(@RequestParam("deptSid") String deptSid){
+		ResultBean rb = ResultBean.fireFail();
+		InventoryBillVo vo = wmsInventoryProfitinService.getSourceBillNoBySid(deptSid);
+		return rb.success().setData(vo);
+	}
+
 	@ApiOperation("提交")
 	@PostMapping("/submitApply")
 	public ResultBean submitApply(@Valid @RequestBody SubmitInventoryProfitinDto dto) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java

@@ -75,7 +75,7 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
 
 	int selectBySid(String join);
 
-	@Update("update wms_inventory_checkbill set state = 0 where sid = #{sid}")
+	@Update("update wms_inventory_checkbill set state = 0,checkState = 2 where sid = #{sid}")
 	void createReport(String sid);
 
 	String checkState(String deptSid);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java

@@ -311,11 +311,11 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         if ("1".equals(dto.getCheckTypeKey())) {
             //查询本部门指定库位下，库存数量大0并且是新件的库存
             wmsInventories = wmsInventoryService.selByDeptSidAndRackSid(dto.getDeptSid(), dto.getRackSids());
-        } else if ("2".equals(dto.getCheckTypeKey())){
+        } else if ("2".equals(dto.getCheckTypeKey())) {
             //查询本部门下，库存数量大0并且是新件的库存
             wmsInventories = wmsInventoryService.selByDeptSid(dto.getDeptSid());
         }
-        if (wmsInventories.size() == 0){
+        if (wmsInventories.size() == 0) {
             return rb.setMsg("该库位下没有商品库存信息");
         }
         String sid = this.insertByDto(dto);
@@ -395,10 +395,12 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = new WmsInventoryCheckbillReportDetailsVo();
         //表头
         WmsInventoryCheckbill wmsInventoryCheckbill = fetchBySid(sid);
+        wmsInventoryCheckbillReportDetailsVo.setSid(sid);
         wmsInventoryCheckbillReportDetailsVo.setCreateByName(wmsInventoryCheckbill.getCreateByName());
+        wmsInventoryCheckbillReportDetailsVo.setCreateName(wmsInventoryCheckbill.getCreateByName());
         wmsInventoryCheckbillReportDetailsVo.setDeptName(wmsInventoryCheckbill.getDeptName());
         wmsInventoryCheckbillReportDetailsVo.setCreateTime(wmsInventoryCheckbill.getCreateTime());
-        wmsInventoryCheckbillReportDetailsVo.setSuperviseName(wmsInventoryCheckbill.getSuperviseName());
+        wmsInventoryCheckbillReportDetailsVo.setFinances(wmsInventoryCheckbill.getSuperviseName());
         //盘点报告备注
         WmsInventoryCheckbillReport wmsInventoryCheckbillReport = wmsInventoryCheckbillReportService.selByBillSid(sid);
         wmsInventoryCheckbillReportDetailsVo.setRemarks(wmsInventoryCheckbillReport.getRemarks());
@@ -407,21 +409,25 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         //总体盘点情况
         List<WmsInventoryCheckbillReportSumVo> total = wmsInventoryCheckbillDetailService.reportSum(sid, "total");
         for (WmsInventoryCheckbillReportSumVo totalSum : total) {
-            wmsInventoryCheckbillReportDetailsVo.setBookCountTotal(totalSum.getBookCount());
-            wmsInventoryCheckbillReportDetailsVo.setBookAmountTotal(totalSum.getBookAmount());
-            wmsInventoryCheckbillReportDetailsVo.setRealCountTotal(totalSum.getRealCount());
-            wmsInventoryCheckbillReportDetailsVo.setRealAmountTotal(totalSum.getRealAmount());
-            wmsInventoryCheckbillReportDetailsVo.setProfitCountTotal(totalSum.getProfitCount());
-            wmsInventoryCheckbillReportDetailsVo.setProfitAmountTotal(totalSum.getProfitAmount());
-            wmsInventoryCheckbillReportDetailsVo.setLoseCountTotal(totalSum.getLoseCount());
-            wmsInventoryCheckbillReportDetailsVo.setLoseAmountTotal(totalSum.getLoseAmount());
+            wmsInventoryCheckbillReportDetailsVo.setYpNum(totalSum.getYpNum());
+            wmsInventoryCheckbillReportDetailsVo.setYpMoney(totalSum.getYpMoney());
+            wmsInventoryCheckbillReportDetailsVo.setPyNum(totalSum.getPyNum());
+            wmsInventoryCheckbillReportDetailsVo.setPyMoney(totalSum.getPyMoney());
+            wmsInventoryCheckbillReportDetailsVo.setSpNum(totalSum.getSpNum());
+            wmsInventoryCheckbillReportDetailsVo.setSpMoney(totalSum.getSpMoney());
+            wmsInventoryCheckbillReportDetailsVo.setPyNum(totalSum.getPyNum());
+            wmsInventoryCheckbillReportDetailsVo.setPyMoney(totalSum.getPyMoney());
+            wmsInventoryCheckbillReportDetailsVo.setPkNum(totalSum.getPkNum());
+            wmsInventoryCheckbillReportDetailsVo.setPkMoney(totalSum.getPkMoney());
+            wmsInventoryCheckbillReportDetailsVo.setPsNum(totalSum.getPsNum());
+            wmsInventoryCheckbillReportDetailsVo.setPsMoney(totalSum.getPsMoney());
         }
         //仓库盘点情况
         List<WmsInventoryCheckbillReportSumVo> ware = wmsInventoryCheckbillDetailService.reportSum(sid, "ware");
-        wmsInventoryCheckbillReportDetailsVo.setWare(ware);
+        wmsInventoryCheckbillReportDetailsVo.setWarehouseStocktakList(ware);
         //库区盘点情况
         List<WmsInventoryCheckbillReportSumVo> area = wmsInventoryCheckbillDetailService.reportSum(sid, "area");
-        wmsInventoryCheckbillReportDetailsVo.setArea(area);
+        wmsInventoryCheckbillReportDetailsVo.setArehouseAreaeStocktakList(area);
         return wmsInventoryCheckbillReportDetailsVo;
     }
 
@@ -433,36 +439,44 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         //发起部门
         map.put("deptName", wmsInventoryCheckbillReportDetailsVo.getDeptName());
         //发起日期
-        map.put("createTime", wmsInventoryCheckbillReportDetailsVo.getCreateTime());
+        map.put("createTime", DateUtil.formatDate(wmsInventoryCheckbillReportDetailsVo.getCreateTime()));
         //盘点人
         map.put("pdrName", wmsInventoryCheckbillReportDetailsVo.getCreateByName());
         //监盘人
-        map.put("jprName", wmsInventoryCheckbillReportDetailsVo.getSuperviseName());
+        map.put("jprName", wmsInventoryCheckbillReportDetailsVo.getFinances());
         //备注
         map.put("remarks", wmsInventoryCheckbillReportDetailsVo.getRemarks());
         //总体应盘数量
-        map.put("ypsl", wmsInventoryCheckbillReportDetailsVo.getBookCountTotal());
+        map.put("ypsl", wmsInventoryCheckbillReportDetailsVo.getYpNum());
         //总体应盘金额
-        map.put("ypje", wmsInventoryCheckbillReportDetailsVo.getBookAmountTotal());
+        map.put("ypje", wmsInventoryCheckbillReportDetailsVo.getYpMoney());
         //总体实盘数量
-        map.put("spsl", wmsInventoryCheckbillReportDetailsVo.getRealCountTotal());
+        map.put("spsl", wmsInventoryCheckbillReportDetailsVo.getSpNum());
         //总体实盘金额
-        map.put("spje", wmsInventoryCheckbillReportDetailsVo.getRealAmountTotal());
+        map.put("spje", wmsInventoryCheckbillReportDetailsVo.getSpMoney());
         //总体盘盈数量
-        map.put("pysl", wmsInventoryCheckbillReportDetailsVo.getProfitCountTotal());
+        map.put("pysl", wmsInventoryCheckbillReportDetailsVo.getPyNum());
         //总体盘盈金额
-        map.put("pyje", wmsInventoryCheckbillReportDetailsVo.getProfitAmountTotal());
+        map.put("pyje", wmsInventoryCheckbillReportDetailsVo.getPyMoney());
         //总体盘亏数量
-        map.put("pksl", wmsInventoryCheckbillReportDetailsVo.getLoseCountTotal());
+        map.put("pksl", wmsInventoryCheckbillReportDetailsVo.getPkNum());
         //总体盘亏金额
-        map.put("pkje", wmsInventoryCheckbillReportDetailsVo.getLoseAmountTotal());
+        map.put("pkje", wmsInventoryCheckbillReportDetailsVo.getPkMoney());
         //总体盘损数量
-        map.put("pssl", wmsInventoryCheckbillReportDetailsVo.getLossCountTotal());
+        map.put("pssl", wmsInventoryCheckbillReportDetailsVo.getPsNum());
         //总体盘损金额
-        map.put("psje", wmsInventoryCheckbillReportDetailsVo.getLossAmountTotal());
-        List<WmsInventoryCheckbillReportSumVo> ware = wmsInventoryCheckbillReportDetailsVo.getWare();
+        map.put("psje", wmsInventoryCheckbillReportDetailsVo.getPsMoney());
+        List<WmsInventoryCheckbillReportSumVo> ware = wmsInventoryCheckbillReportDetailsVo.getWarehouseStocktakList();
+        for (int i = 0; i < ware.size(); i++) {
+            WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo = ware.get(i);
+            wmsInventoryCheckbillReportSumVo.setId(i + 1);
+        }
         map.put("ware", ware);
-        List<WmsInventoryCheckbillReportSumVo> area = wmsInventoryCheckbillReportDetailsVo.getArea();
+        List<WmsInventoryCheckbillReportSumVo> area = wmsInventoryCheckbillReportDetailsVo.getArehouseAreaeStocktakList();
+        for (int i = 0; i < area.size(); i++) {
+            WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo = area.get(i);
+            wmsInventoryCheckbillReportSumVo.setId(i + 1);
+        }
         map.put("area", area);
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "pdbg" + ".ftl");
         //生成word文件名
@@ -476,10 +490,11 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
-        //生成文件名
-        String pdfName = map.get("num").toString() + "盘点报告_" + dateStr + seconds + ".pdf";
+        //生成出门证文件名
+        String pdfName = "盘点报告_" + dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
-        return pdfName;
+        wmsInventoryCheckbillReportService.updatePdf(sid,pdfName);
+        return "/template/" + pdfName;
     }
 
     public ResultBean submitApply(SubmitInventoryCheckDto dto) {
@@ -830,7 +845,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("d.warehouseName", query.getName()).or().like("d.warehouseArea", query.getName()).or().like("d.warehouseRackName", query.getName()));
         }
-        qw.eq("c.checkState",'1');
+        qw.eq("c.checkState", '1');
         qw.groupBy("d.warehouseRackSid");
         IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryCheckbillPageVo> pagging = baseMapper.appDetailRackPageList(page, qw);
@@ -846,23 +861,23 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
 
     public ResultBean<HandleBean> scan(String sid, String content, String houseSid) {
         ResultBean rb = ResultBean.fireFail();
-        if (content.contains("#")){
+        if (content.contains("#")) {
             return rb.setMsg("请扫描商品码");
         }
-        HandleBean handleBean = wmsInventoryCheckbillDetailService.scan(sid,content,houseSid);
-        if (handleBean == null){
+        HandleBean handleBean = wmsInventoryCheckbillDetailService.scan(sid, content, houseSid);
+        if (handleBean == null) {
             List<WmsInventory> wmsInventories = wmsInventoryService.getListByGoodsID(content).getData();
-            if (!wmsInventories.isEmpty()){
+            if (!wmsInventories.isEmpty()) {
                 for (WmsInventory wmsInventory : wmsInventories) {
                     WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsInventory.getWarehouseRackSid());
                     WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid());
                     return rb.setMsg("本商品不属于本库位，属于" + wmsWarehouseArea.getAreaName() + "库区" + wmsWarehouseRack.getRackName() + "库位。");
                 }
-            }else {
+            } else {
                 String billNo = wmsInventoryRecordService.selByGoodsID(content);
-                if (StringUtils.isBlank(billNo)){
+                if (StringUtils.isBlank(billNo)) {
                     return rb.setMsg("商品码不正确");
-                }else {
+                } else {
                     return rb.setMsg("本商品已在" + billNo + "单据编号中出库。");
                 }
             }
@@ -875,4 +890,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         wmsInventoryCheckbillDetailService.saveInventoryInfo2(dto);
         return rb.success();
     }
+
+    public void saveReport(String billSid, String remarks) {
+        wmsInventoryCheckbillReportService.saveReport(billSid, remarks);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml

@@ -21,14 +21,16 @@
 	<select id="reportSumTotal"
             resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo">
 		SELECT
-				SUM(wicd.bookCount) AS bookCount,
-				SUM(wicd.bookCount) * cost AS bookAmount,
-				SUM(wicd.realCount) AS realCount,
-				SUM(wicd.realCount) * cost AS realAmount,
-				SUM(wicd.profitCount) AS profitCount,
-				SUM(wicd.profitCount) * cost AS profitAmount,
-				SUM(wicd.loseCount) AS loseCount,
-				SUM(wicd.loseCount) * cost AS loseAmount
+				SUM(wicd.bookCount) AS ypNum,
+				SUM(wicd.bookCount) * cost AS ypMoney,
+				SUM(wicd.realCount) AS spNum,
+				SUM(wicd.realCount) * cost AS spMoney,
+				SUM(wicd.profitCount) AS pyNum,
+				SUM(wicd.profitCount) * cost AS pyMoney,
+				SUM(wicd.loseCount) AS pkNum,
+				SUM(wicd.loseCount) * cost AS pkMoney,
+				SUM(lossCount) AS psNum,
+				SUM(lossCount) * cost AS psMoney
 		FROM
 				wms_inventory_checkbill_detail AS wicd
 		WHERE wicd.billSid = #{billSid}
@@ -39,16 +41,16 @@
 			resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo">
 		SELECT
 				wicd.warehouseName,
-				SUM(wicd.bookCount) AS bookCount,
-				SUM(wicd.bookCount) * cost AS bookAmount,
-				SUM(wicd.realCount) AS realCount,
-				SUM(wicd.realCount) * cost AS realAmount,
-				SUM(wicd.profitCount) AS profitCount,
-				SUM(wicd.profitCount) * cost AS profitAmount,
-				SUM(wicd.loseCount) AS loseCount,
-				SUM(wicd.loseCount) * cost AS loseAmount,
-				SUM(lossCount) AS lossCount,
-				SUM(lossCount) * cost AS lossAmount
+				SUM(wicd.bookCount) AS ypNum,
+				SUM(wicd.bookCount) * cost AS ypMoney,
+				SUM(wicd.realCount) AS spNum,
+				SUM(wicd.realCount) * cost AS spMoney,
+				SUM(wicd.profitCount) AS pyNum,
+				SUM(wicd.profitCount) * cost AS pyMoney,
+				SUM(wicd.loseCount) AS pkNum,
+				SUM(wicd.loseCount) * cost AS pkMoney,
+				SUM(lossCount) AS psNum,
+				SUM(lossCount) * cost AS psMoney
 		FROM
 				wms_inventory_checkbill_detail AS wicd
 		WHERE wicd.billSid = #{billSid}
@@ -62,17 +64,17 @@
 						wicd.warehouseName,
 						'-',
 						wicd.warehouseArea
-						) AS warehouseName,
-				SUM(wicd.bookCount) AS bookCount,
-				SUM(wicd.bookCount) * cost AS bookAmount,
-				SUM(wicd.realCount) AS realCount,
-				SUM(wicd.realCount) * cost AS realAmount,
-				SUM(wicd.profitCount) AS profitCount,
-				SUM(wicd.profitCount) * cost AS profitAmount,
-				SUM(wicd.loseCount) AS loseCount,
-				SUM(wicd.loseCount) * cost AS loseAmount,
-				SUM(lossCount) AS lossCount,
-				SUM(lossCount) * cost AS lossAmount
+						) AS warehouseAreaeName,
+				SUM(wicd.bookCount) AS ypNum,
+				SUM(wicd.bookCount) * cost AS ypMoney,
+				SUM(wicd.realCount) AS spNum,
+				SUM(wicd.realCount) * cost AS spMoney,
+				SUM(wicd.profitCount) AS pyNum,
+				SUM(wicd.profitCount) * cost AS pyMoney,
+				SUM(wicd.loseCount) AS pkNum,
+				SUM(wicd.loseCount) * cost AS pkMoney,
+				SUM(lossCount) AS psNum,
+				SUM(lossCount) * cost AS psMoney
 		FROM
 				wms_inventory_checkbill_detail AS wicd
 		WHERE wicd.billSid = #{billSid}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java

@@ -64,8 +64,10 @@ public class WmsInventoryCheckbillReportDetailsVo implements Vo {
     @ApiModelProperty("生成日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
+    @ApiModelProperty("盘点人")
+    private String createName;
     @ApiModelProperty("监盘人姓名")
-    private String superviseName;
+    private String finances;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("pdf路径")
@@ -73,29 +75,29 @@ public class WmsInventoryCheckbillReportDetailsVo implements Vo {
 
     //总体盘点情况
     @ApiModelProperty("应盘数量")
-    private BigDecimal bookCountTotal;
+    private BigDecimal ypNum;
     @ApiModelProperty("应盘金额")
-    private BigDecimal bookAmountTotal;
+    private BigDecimal ypMoney;
     @ApiModelProperty("实盘数量")
-    private BigDecimal realCountTotal;
+    private BigDecimal spNum;
     @ApiModelProperty("实盘金额")
-    private BigDecimal realAmountTotal;
+    private BigDecimal spMoney;
     @ApiModelProperty("盘盈数量")
-    private BigDecimal profitCountTotal;
+    private BigDecimal pyNum;
     @ApiModelProperty("盘盈金额")
-    private BigDecimal profitAmountTotal;
+    private BigDecimal pyMoney;
     @ApiModelProperty("盘亏数量")
-    private BigDecimal loseCountTotal;
+    private BigDecimal pkNum;
     @ApiModelProperty("盘亏金额")
-    private BigDecimal loseAmountTotal;
+    private BigDecimal pkMoney;
     @ApiModelProperty("盘损数量")
-    private BigDecimal lossCountTotal;
+    private BigDecimal psNum;
     @ApiModelProperty("盘损金额")
-    private BigDecimal lossAmountTotal;
+    private BigDecimal psMoney;
 
     //仓库盘点情况
-    List<WmsInventoryCheckbillReportSumVo> ware = new ArrayList<>();
+    List<WmsInventoryCheckbillReportSumVo> warehouseStocktakList = new ArrayList<>();
 
     //库区盘点情况
-    List<WmsInventoryCheckbillReportSumVo> area = new ArrayList<>();
+    List<WmsInventoryCheckbillReportSumVo> arehouseAreaeStocktakList = new ArrayList<>();
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.java

@@ -26,9 +26,7 @@
 package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 /**
  * Project: yxt-wms(盘点报告) <br/>
@@ -51,4 +49,10 @@ public interface WmsInventoryCheckbillReportMapper extends BaseMapper<WmsInvento
 
 	@Select("select * from wms_inventory_checkbill_report where billSid = #{billSid}")
 	WmsInventoryCheckbillReport selByBillSid(String billSid);
+
+	@Update("update wms_inventory_checkbill_report set remarks = #{remarks} where billSid = #{billSid}")
+    void saveReport(@Param("billSid") String billSid,@Param("remarks") String remarks);
+
+	@Update("update wms_inventory_checkbill_report set pdfUrl = #{pdfUrl} where billSid = #{billSid}")
+    void updatePdf(@Param("billSid") String billSid,@Param("pdfUrl") String pdfUrl);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportService.java

@@ -66,4 +66,12 @@ public class WmsInventoryCheckbillReportService extends MybatisBaseService<WmsIn
 	public WmsInventoryCheckbillReport selByBillSid(String billSid) {
 		return baseMapper.selByBillSid(billSid);
 	}
+
+	public void saveReport(String billSid, String remarks) {
+		baseMapper.saveReport(billSid,remarks);
+	}
+
+	public void updatePdf(String billSid, String pdfUrl) {
+		baseMapper.updatePdf(billSid,pdfUrl);
+	}
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportSumVo.java

@@ -52,26 +52,34 @@ import java.util.Date;
 @ApiModel(value = "盘点报告 视图数据详情", description = "盘点报告 视图数据详情")
 public class WmsInventoryCheckbillReportSumVo implements Vo {
 
-    @ApiModelProperty("仓库名称（或仓库-库区名称）")
+    /*
+    * 盘点报告序号
+    * */
+    @ApiModelProperty("序号")
+    private Integer id;
+
+    @ApiModelProperty("仓库名称")
     private String warehouseName;
+    @ApiModelProperty("仓库-库区")
+    private String warehouseAreaeName;
     @ApiModelProperty("应盘数量")
-    private BigDecimal bookCount;
+    private BigDecimal ypNum;
     @ApiModelProperty("应盘金额")
-    private BigDecimal bookAmount;
+    private BigDecimal ypMoney;
     @ApiModelProperty("实盘数量")
-    private BigDecimal realCount;
+    private BigDecimal spNum;
     @ApiModelProperty("实盘金额")
-    private BigDecimal realAmount;
+    private BigDecimal spMoney;
     @ApiModelProperty("盘盈数量")
-    private BigDecimal profitCount;
+    private BigDecimal pyNum;
     @ApiModelProperty("盘盈金额")
-    private BigDecimal profitAmount;
+    private BigDecimal pyMoney;
     @ApiModelProperty("盘亏数量")
-    private BigDecimal loseCount;
+    private BigDecimal pkNum;
     @ApiModelProperty("盘亏金额")
-    private BigDecimal loseAmount;
+    private BigDecimal pkMoney;
     @ApiModelProperty("盘损数量")
-    private BigDecimal lossCount;
+    private BigDecimal psNum;
     @ApiModelProperty("盘损金额")
-    private BigDecimal lossAmount;
+    private BigDecimal psMoney;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/InventoryBillVo.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsinventoryprofitin;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt-wms(盘库) <br/>
+ * File: WmsInventoryProfitinVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventoryprofitin.WmsInventoryProfitinVo <br/>
+ * Description: 盘盈入库申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-07 16:58:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class InventoryBillVo implements Vo {
+
+    @ApiModelProperty("单据sid")
+    private String billSid;
+	@ApiModelProperty("单据编号")
+    private String billNo;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinMapper.xml

@@ -4,7 +4,18 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitinVo">
-		SELECT * FROM wms_inventory_profitin wip
+		SELECT wip.sid,
+			   wip.nodeState,
+			   wip.billNo,
+		 	   wip.deptName,
+		       wip.createByName,
+			   wip.createTime,
+			   wip.finishTime,
+			   wip.checkBillNo as sourceBillNo,
+			   wip.busType as businessType,
+			   wip.procDefId,
+			   wip.procInstId
+		FROM wms_inventory_profitin wip
 		LEFT JOIN anrui_portal.sys_organization as s ON wip.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinQuery.java

@@ -58,13 +58,13 @@ public class WmsInventoryProfitinQuery implements Query {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("申请日期")
-    private String createTimeStart;
-    private String createTimeEnd;
+    private String createStartTime;
+    private String createEndTime;
     @ApiModelProperty("办结日期")
-    private String finishTimeStart;
-    private String finishTimeEnd;
+    private String finishStartTime;
+    private String finishEndTime;
     @ApiModelProperty("盘点单号")
-    private String checkBillNo;
+    private String sourceBillNo;
 
     private String orgPath;
     private String userSid;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java

@@ -154,16 +154,16 @@ public class WmsInventoryProfitinService extends MybatisBaseService<WmsInventory
 		if (StringUtils.isNotBlank(query.getBillNo())) {
 			qw.like("wip.billNo", query.getBillNo());
 		}
-		if (StringUtils.isNotBlank(query.getCheckBillNo())){
-			qw.like("wip.checkBillNo",query.getCheckBillNo());
+		if (StringUtils.isNotBlank(query.getSourceBillNo())){
+			qw.like("wip.checkBillNo",query.getSourceBillNo());
 		}
-		String createTimeStart = query.getCreateTimeStart();
-		String createTimeEnd = query.getCreateTimeEnd();
+		String createTimeStart = query.getCreateStartTime();
+		String createTimeEnd = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (wip.createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (wip.createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
 				);
-		String finishTimeStart = query.getFinishTimeStart();
-		String finishTimeEnd = query.getFinishTimeEnd();
+		String finishTimeStart = query.getFinishStartTime();
+		String finishTimeEnd = query.getFinishEndTime();
 		qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (wip.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (wip.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
 				);
@@ -554,4 +554,9 @@ public class WmsInventoryProfitinService extends MybatisBaseService<WmsInventory
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public InventoryBillVo getSourceBillNoBySid(String deptSid) {
+
+		return null;
+	}
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinVo.java

@@ -68,9 +68,9 @@ public class WmsInventoryProfitinVo implements Vo {
     @ApiModelProperty("办结日期")
     private Date finishTime;
     @ApiModelProperty("盘点单号")
-    private String checkBillNo;
+    private String sourceBillNo;
     @ApiModelProperty("业务类型")
-    private String busType;
+    private String businessType;
 	@ApiModelProperty("流程定义的id")
     private String procDefId;
 	@ApiModelProperty("流程实例的sid")