Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1468,10 +1468,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String orgPath = params.getOrgPath();
         String userSid = params.getUserSid();
         String useOrgSid = "";
+        String staffDeptSid = "";
         QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
         if (params != null) {
             if (StringUtils.isNotBlank(orgPath)) {
                 useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                staffDeptSid =orgPath.substring(orgPath.lastIndexOf("/") + 1);
             } else {
                 useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
             }
@@ -1481,6 +1483,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             if (StringUtils.isNotBlank(userSid)) {
                 qw.eq("furd.createBySid", userSid);
             }
+            if(StringUtils.isNotBlank(staffDeptSid)){
+                qw.eq("furd.staffDeptSid",staffDeptSid);
+            }
             if (params.getSidList().size() > 0) {
                 qw.notIn("furd.sid", params.getSidList());
             }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-scm(回款返利) <br/>
  * File: ScmCollectionrebateCheckapply.java <br/>
@@ -78,4 +80,6 @@ public class ScmCollectionrebateCheckapply extends BaseEntity {
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;
+
+    private Date finishTime;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml

@@ -36,6 +36,9 @@
     <update id="updateFlowFiled">
         UPDATE scm_collectionrebate_checkapply
         SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        <if test="nodeState == '已办结' or nodeState == '终止'">
+            , finishTime = NOW()
+        </if>
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java

@@ -368,7 +368,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
     public void pusCollectionRebateCheckVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmCollectionrebateCheckapply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

@@ -386,7 +386,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
     public void pushCollectionRebateWithVoucher(String sid) {
         String  summaryTag = "";//摘要前缀
         ScmCollectionRebateWithApply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCollectionApply())) {
                 summaryTag = entity.getCollectionApply();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java

@@ -713,7 +713,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
         ScmFinanceAdjustApply adjustApply = fetchBySid(sid);
         String adjustWay = adjustApply.getAdjustWay();
         List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(adjustApply.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(adjustApply.getClosingDate());
         if (!details.isEmpty() && details.size() > 0) {
             if (adjustWay.equals("客户交纳")) {
                 //按照采购系统分组

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -441,7 +441,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
     public void pushSpecialRebateCheckVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmSpecialrebateCheckapply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -445,7 +445,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
     public void pushSpecialRebateWithVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmSpecialRebateWithApply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getWithApply())) {
                 summaryTag = entity.getWithApply();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -537,7 +537,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
     public void pushVehRebateWithVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmVehrebateCheckapply entity = fetchBySid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -499,7 +499,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
     public void pushVehRebateWithVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmVehRebateWithApply entity = fetchBySid(sid);
-        String format = returnBusDate(entity.getCreateTime());
+        String format = returnBusDate(entity.getFinishTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getWithApply())) {
                 summaryTag = entity.getWithApply();

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.fegin.wmsinventorycheckbill;
 
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateQuery;
 import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;

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

@@ -26,6 +26,7 @@
 package com.yxt.wms.apiadmin.inventroy;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -42,7 +43,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.List;
 
 @Api(tags = "库存盘点")
@@ -52,6 +56,8 @@ public class WmsInventoryCheckbillRest {
 
     @Autowired
     private WmsInventoryCheckbillService wmsInventoryCheckbillService;
+    @Autowired
+    HttpServletResponse response;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
@@ -137,6 +143,22 @@ public class WmsInventoryCheckbillRest {
         return rb.success().setData(count);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/downloadExcel")
+    public void excelList(@RequestParam("sid") String sid){
+        //得到所有要导出的数据
+        List<WmsInventoryCheckbillDetailGoodExcel> exportVoList = wmsInventoryCheckbillService.excelList(sid);
+        //定义导出的excel名字
+        String excelName = "盘点明细";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryCheckbillDetailGoodExcel.class, response);
+    }
+
     /*********************************************************移动端************************************************************/
 
     @ApiOperation("app-盘点-查看库位盘点列表")

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

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodExcel;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo;
@@ -75,4 +76,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
 
     @Select("SELECT COUNT(*) FROM wms_inventory_checkbill WHERE deptSid = #{deptSid} AND checkState = 1")
     Integer selPdByDeptSid(String deptSid);
+
+    List<WmsInventoryCheckbillDetailGoodExcel> excelList(String sid);
 }

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

@@ -54,7 +54,7 @@
         z.zoneName,
         d.warehouseArea,
         d.warehouseRackSid,
-        d.warehouseRackName,
+        d.warehouseRackCode,
         SUM(d.bookCount) AS bookCount,
         SUM(d.bookCount * d.cost) AS bookAmount,
         SUM(d.realCount) AS realCount,
@@ -79,20 +79,21 @@
     <select id="detailGoodPageList"
             resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo">
         SELECT
-        goodsID,
+        d.goodsID,
-        goodsSkuTitle,
+        d.goodsSkuTitle,
-        goodsSkuCode,
+        d.goodsSkuCode,
-        warehouseName,
+        d.warehouseName,
-        warehouseArea,
+        z.zoneName AS warehouseZoneName,
-        warehouseRackName,
+        d.warehouseArea,
-        unit,
+        d.warehouseRackCode,
-        cost,
+        d.unit,
-        bookCount,
+        d.cost,
-        bookCount * cost AS bookAmount,
+        d.bookCount,
-        realCount,
+        d.bookCount * cost AS bookAmount,
-        realCount * cost AS realAmount,
+        d.realCount,
+        d.realCount * cost AS realAmount,
         CASE
-        state
+        d.state
         WHEN 2
         THEN '正常'
         WHEN 3
@@ -101,7 +102,7 @@
         THEN '盘亏'
         END AS state,
         CASE
-        state
+        d.state
         WHEN 2
         THEN 0
         WHEN 3
@@ -110,7 +111,7 @@
         THEN loseCount
         END AS profitAndLoseCount,
         CASE
-        state
+        d.state
         WHEN 2
         THEN 0
         WHEN 3
@@ -118,11 +119,13 @@
         WHEN 4
         THEN loseCount * cost
         END AS profitAndLoseAmount,
-        lossCount,
+        d.lossCount,
-        lossCount * cost AS lossAmount,
+        d.lossCount * cost AS lossAmount,
-        remarks
+        d.remarks
         FROM
-        wms_inventory_checkbill_detail
+        wms_inventory_checkbill_detail d
+        LEFT JOIN wms_warehouse_zone z
+        ON d.warehouseSid = z.warehouseSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -138,7 +141,7 @@
         d.warehouseName,
         z.zoneName,
         d.warehouseArea,
-        d.warehouseRackName,
+        d.warehouseRackCode,
         d.unit,
         d.cost,
         d.bookCount,
@@ -325,4 +328,56 @@
                        )
              GROUP BY d.warehouseRackSid) TOTAL
     </select>
+
+    <select id="excelList"
+            resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodExcel">
+        SELECT
+            d.goodsID,
+            d.goodsSkuTitle,
+            d.goodsSkuCode,
+            d.warehouseName,
+            d.warehouseArea,
+            d.warehouseRackCode,
+            d.unit,
+            d.cost,
+            d.bookCount,
+            d.bookCount * cost AS bookAmount,
+            d.realCount,
+            d.realCount * cost AS realAmount,
+            CASE
+                d.state
+                WHEN 2
+                    THEN '正常'
+                WHEN 3
+                    THEN '盘盈'
+                WHEN 4
+                    THEN '盘亏'
+                END AS state,
+            CASE
+                d.state
+                WHEN 2
+                    THEN 0
+                WHEN 3
+                    THEN profitCount
+                WHEN 4
+                    THEN loseCount
+                END AS profitAndLoseCount,
+            CASE
+                d.state
+                WHEN 2
+                    THEN 0
+                WHEN 3
+                    THEN profitCount * cost
+                WHEN 4
+                    THEN loseCount * cost
+                END AS profitAndLoseAmount,
+            d.lossCount,
+            d.lossCount * cost AS lossAmount,
+            d.remarks
+        FROM
+            wms_inventory_checkbill_detail d
+                LEFT JOIN wms_warehouse_zone z
+                          ON d.warehouseSid = z.warehouseSid
+        WHERE d.billSid = #{sid}
+    </select>
 </mapper>

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

@@ -221,24 +221,27 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     public PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> detailGoodPageList(PagerQuery<WmsInventoryCheckbillDetailGoodPageListQuery> pq) {
         WmsInventoryCheckbillDetailGoodPageListQuery query = pq.getParams();
         QueryWrapper<WmsInventoryCheckbill> qw = new QueryWrapper<>();
-        qw.eq("billSid", query.getBillSid());
+        qw.eq("d.billSid", query.getBillSid());
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
-            qw.eq("warehouseSid", query.getWarehouseSid());
+            qw.eq("d.warehouseSid", query.getWarehouseSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseZoneSid())) {
+            qw.eq("z.zoneName", query.getWarehouseZoneSid());
         }
         if (StringUtils.isNotBlank(query.getWarehouseAreaSid())) {
-            qw.eq("warehouseAreaSid", query.getWarehouseAreaSid());
+            qw.eq("d.warehouseAreaSid", query.getWarehouseAreaSid());
         }
         if (StringUtils.isNotBlank(query.getWarehouseRackSid())) {
-            qw.eq("warehouseRackSid", query.getWarehouseRackSid());
+            qw.eq("d.warehouseRackSid", query.getWarehouseRackSid());
         }
         if (StringUtils.isNotBlank(query.getGoodsID())) {
-            qw.like("goodsID", query.getGoodsID());
+            qw.like("d.goodsID", query.getGoodsID());
         }
         if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) {
-            qw.like("goodsSkuTitle", query.getGoodsSkuTitle());
+            qw.like("d.goodsSkuTitle", query.getGoodsSkuTitle());
         }
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("goodsSkuCode", query.getGoodsSkuCode());
+            qw.like("d.goodsSkuCode", query.getGoodsSkuCode());
         }
         IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryCheckbillDetailGoodPageListVo> pagging = baseMapper.detailGoodPageList(page, qw);
@@ -973,4 +976,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     public Integer selPdByDeptSid(String deptSid) {
         return baseMapper.selPdByDeptSid(deptSid);
     }
+
+    public List<WmsInventoryCheckbillDetailGoodExcel> excelList(String sid) {
+        return baseMapper.excelList(sid);
+    }
 }

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

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+public class WmsInventoryCheckbillDetailGoodExcel implements Vo {
+
+    @ExportEntityMap(CnName = "商品ID", EnName = "goodsID")
+    private String goodsID;
+    @ExportEntityMap(CnName = "商品名称", EnName = "goodsSkuTitle")
+    private String goodsSkuTitle;
+    @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode")
+    private String goodsSkuCode;
+    @ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName")
+    private String warehouseName;
+    @ExportEntityMap(CnName = "区域名称", EnName = "warehouseZoneName")
+    private String warehouseZoneName;
+    @ExportEntityMap(CnName = "库区名称", EnName = "warehouseArea")
+    private String warehouseArea;
+    @ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode")
+    private String warehouseRackCode;
+    @ExportEntityMap(CnName = "单位", EnName = "unit")
+    private String unit;
+    @ExportEntityMap(CnName = "成本单价", EnName = "cost")
+    private BigDecimal cost;
+    @ExportEntityMap(CnName = "应盘数量", EnName = "bookCount")
+    private BigDecimal bookCount;
+    @ExportEntityMap(CnName = "应盘金额", EnName = "bookAmount")
+    private BigDecimal bookAmount;
+    @ExportEntityMap(CnName = "实盘数量", EnName = "realCount")
+    private BigDecimal realCount;
+    @ExportEntityMap(CnName = "实盘金额", EnName = "realAmount")
+    private BigDecimal realAmount;
+    @ExportEntityMap(CnName = "状态", EnName = "state")
+    private String state;
+    @ExportEntityMap(CnName = "盈亏数量", EnName = "profitAndLoseCount")
+    private BigDecimal profitAndLoseCount;
+    @ExportEntityMap(CnName = "盈亏金额", EnName = "profitAndLoseAmount")
+    private BigDecimal profitAndLoseAmount;
+    @ExportEntityMap(CnName = "盘损数量", EnName = "lossCount")
+    private BigDecimal lossCount;
+    @ExportEntityMap(CnName = "盘损金额", EnName = "lossAmount")
+    private BigDecimal lossAmount;
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    private String remarks;
+}