Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java

@@ -80,4 +80,14 @@ public interface FinUncollectedReceivablesDetailedJRFeign {
     @PostMapping("/saveList")
     @ResponseBody
     void saveList(@RequestBody List<FinUncollectedReceivablesDetailedJR> jrList);
+
+    @ApiOperation("应收修改")
+    @PostMapping("/updateList")
+    @ResponseBody
+    void updateList(@RequestBody List<FinUncollectedReceivablesDetailedJR> list);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @GetMapping("/getUnJrByPayCostTitleKeyAndBusSid")
+    public ResultBean<FinUncollectedReceivablesDetailedJR> getUnJrByPayCostTitleKeyAndBusSid(@RequestParam("key") String key ,@RequestParam("busSid") String busSid);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java

@@ -75,4 +75,14 @@ public class FinUncollectedReceivablesDetailedJRFeignFallback implements FinUnco
     public void saveList(List<FinUncollectedReceivablesDetailedJR> jrList) {
 
     }
+
+    @Override
+    public void updateList(List<FinUncollectedReceivablesDetailedJR> jrList) {
+
+    }
+
+    @Override
+    public ResultBean<FinUncollectedReceivablesDetailedJR> getUnJrByPayCostTitleKeyAndBusSid(String key, String busSid) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java

@@ -95,4 +95,6 @@ IPage<AppFinUncollectedReceivablesDetailedRskVo> getRskPaymentDetailsList(IPage<
     LoanRepaymentPlanDetails selectDetails(String sid);
 
     void saveList(@Param("list") List<FinUncollectedReceivablesDetailedJR> list);
+
+    FinUncollectedReceivablesDetailedJR getUnJrByPayCostTitleKeyAndBusSid(@Param("key") String key, @Param("busSid")String busSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml

@@ -466,4 +466,8 @@
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
         select * from anrui_riskcenter.loan_repayment_plan_details where sid = #{sid}
     </select>
+    <select id="getUnJrByPayCostTitleKeyAndBusSid"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
+        select * from anrui_fin.fin_uncollected_receivables_detailed_jr where payCostTitleKey = #{key} and busSid = #{busSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRRest.java

@@ -88,4 +88,14 @@ public class FinUncollectedReceivablesDetailedJRRest implements FinUncollectedRe
     public void saveList(List<FinUncollectedReceivablesDetailedJR> jrList) {
         finUncollectedReceivablesDetailedJRService.saveList(jrList);
     }
+
+    @Override
+    public void updateList(List<FinUncollectedReceivablesDetailedJR> list) {
+        finUncollectedReceivablesDetailedJRService.updateList(list);
+    }
+
+    @Override
+    public ResultBean<FinUncollectedReceivablesDetailedJR> getUnJrByPayCostTitleKeyAndBusSid(String key, String busSid) {
+        return finUncollectedReceivablesDetailedJRService.getUnJrByPayCostTitleKeyAndBusSid(key,busSid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java

@@ -182,4 +182,20 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
     public void saveList(List<FinUncollectedReceivablesDetailedJR> jrList) {
         baseMapper.saveList(jrList);
     }
+
+    public void updateList(List<FinUncollectedReceivablesDetailedJR> list) {
+        list.removeAll(Collections.singleton(null));
+        if(!list.isEmpty()){
+            for (int i = 0; i < list.size(); i++) {
+                FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = list.get(i);
+                baseMapper.updateById(finUncollectedReceivablesDetailedJR);
+            }
+        }
+    }
+
+    public ResultBean<FinUncollectedReceivablesDetailedJR> getUnJrByPayCostTitleKeyAndBusSid(String key, String busSid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinUncollectedReceivablesDetailedJR jr = baseMapper.getUnJrByPayCostTitleKeyAndBusSid(key,busSid);
+        return rb.success().setData(jr);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.riskcenter.api.loansettleapply;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @description:
@@ -57,7 +59,8 @@ public class LoanSettleApply extends BaseEntity {
     @ApiModelProperty("机构全路径")
     private String orgSidPath;
     @ApiModelProperty("办结日期")
-    private String closeDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date closeDate;
     @ApiModelProperty("实例id")
     private String procInstId;
     @ApiModelProperty("流程定义id")
@@ -78,5 +81,7 @@ public class LoanSettleApply extends BaseEntity {
     private String settingDateBe;
     @ApiModelProperty("业务sid")
     private String busSid;
+    @ApiModelProperty("资方sid")
+    private String bankSid;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDto.java

@@ -18,7 +18,8 @@ public class LoanSettleApplyDto {
     private String sid;
     private String userSid;
     private String orgPath;
-
+    @ApiModelProperty("备注")
+    private String remarks;
     @ApiModelProperty("申请部门")
     private String createDept;
     @ApiModelProperty("申请部门sid")
@@ -73,7 +74,8 @@ public class LoanSettleApplyDto {
 
     @ApiModelProperty("预计结清日期")
     private String settingDateBe;
-
+    @ApiModelProperty("资方sid")
+    private String bankSid;
     private String busSid;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyVo.java

@@ -12,6 +12,7 @@ import lombok.Data;
 public class LoanSettleApplyVo {
 
     private String createBySid;
+    private String state;
 
     private boolean allowModify;
     @ApiModelProperty("流程状态")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/PlanNoReturnMoney.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/28 10:29
+ */
+@Data
+public class PlanNoReturnMoney {
+    private String sid;
+    private String mSid;
+    private String money;
+    private String jrSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyCommonVo.java

@@ -50,4 +50,5 @@ public class SettleApplyCommonVo {
 
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
+    private String bankSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCost.java

@@ -36,4 +36,13 @@ public class LoanSettleBankCost extends BaseEntity {
     private BigDecimal bankSettlePrice;
     @ApiModelProperty("附件")
     private String files;
+    @ApiModelProperty("贷款保证金")
+    private BigDecimal loanDeposit;
+    @ApiModelProperty("资方收款账户")
+    private String accountName;
+    @ApiModelProperty("资方收款账号")
+    private String bankAccount;
+    @ApiModelProperty("是否抵顶（1是，0否）")
+    private int topping;
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java

@@ -41,6 +41,6 @@ public class LoanSettleBankCostVo {
     @ApiModelProperty("资方收款账号")
     private String bankAccount;
     @ApiModelProperty("资方收款账户")
-    private String dueBankValue;
+    private String accountName;
     private List<UrlQuery> filesList = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -357,4 +357,11 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     public List<AppRepaymentPlanRecord> selByMainSidAndVinNo(String scheduleSid, String vinNo) {
         return baseMapper.selByMainSidAndVinNo(scheduleSid, vinNo);
     }
+
+    public void updateList(List<LoanRepaymentPlanDetails> list) {
+        list.removeAll(Collections.singleton(null));
+        for (LoanRepaymentPlanDetails planDetails : list) {
+            baseMapper.updateById(planDetails);
+        }
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java

@@ -9,10 +9,12 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedR
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply;
 import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo;
+import com.yxt.anrui.riskcenter.api.loansettleapply.PlanNoReturnMoney;
 import com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -55,4 +57,17 @@ public interface LoanSettleApplyMapper extends BaseMapper<LoanSettleApply> {
     FinUncollectedReceivablesDetailedJR selectByType(@Param("busSid") String sid, @Param("type") String type);
 
     int updateBusAndSettleApplyDate(@Param("busVinSid")String busVinSid, @Param("state")String state, @Param("date")String date);
+
+    LoanRepaymentPlanDetails selectMainPeriodByBusVinSid(@Param("busVinSid") String busVinSid);
+
+    List<PlanNoReturnMoney> selPlansNoReturnMoneyByBusVinSidDesc(@Param("busVinSid") String busVinSid);
+
+
+    List<PlanNoReturnMoney> selNoReturnJrMoneyByBusVinSidAndKeyDesc(@Param("busVinSid") String busVinSid, @Param("key") String key);
+
+    PlanNoReturnMoney selectNoReturnMoneyByType(@Param("planDetailsSid") String planDetailsSid, @Param("value") String value);
+
+    String selJrMoneyByBusVinSidAndCloseDate(@Param("busVinSid") String busVinSid, @Param("formatDate") String formatDate);
+
+    String selDueMoneyByBusVinSidAndCloseDate(@Param("busVinSid")String busVinSid, @Param("formatDate")String formatDate);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

@@ -21,6 +21,7 @@
 
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo">
         select la.sid,
+               la.`state`,
                la.createBySid,
                if(length(la.nodeState) > 0, la.nodeState, '待提交') as nodeState,
                la.useOrgName,
@@ -91,11 +92,18 @@
     </select>
 
     <select id="selectDzfyqlx" resultType="java.lang.String">
-        SELECT IFNULL(SUM(lbpv.`bankBeInter`), 0)
-        FROM loan_be_padsincere_veh lbpv
-        LEFT JOIN loan_be_padsincere_apply as ba ON lbpv.mainSid = ba.sid
-        WHERE lbpv.saleVehSid = #{busVinSid}
-          AND ba.nodeState = '已办结'
+select ifnull(SUM(a.reveivableMoney), 0) - IFNULL(sum(a.m), 0)
+FROM (
+         select fjj.reveivableMoney,
+                (select IFNULL(SUM(s.subscriptionMoney), 0)
+                 FROM anrui_fin.fin_selected_receivables_detailed AS s
+                 WHERE s.auditState = '3'
+                   AND s.receivablesSid = fjj.sid) as m
+         from anrui_fin.fin_uncollected_receivables_detailed_jr fjj
+         where fjj.busSid in (SELECT lrpd.sid
+                              FROM loan_repayment_plan_details lrpd
+                              WHERE lrpd.busVinSid = #{busVinSid})
+           and fjj.payCostTitleKey = '005') a
     </select>
 
     <select id="selectZjzyf" resultType="java.lang.String">
@@ -189,4 +197,142 @@
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
         select * from anrui_fin.fin_uncollected_receivables_detailed_jr where busSid = #{busSid} and payCostTitleValue = #{type} order by id desc limit 1
     </select>
+    <select id="selectMainPeriodByBusVinSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
+            select * from loan_repayment_plan_details where busVinSid = #{busVinSid} and policyOrOther = '0' order by period desc limit 1
+    </select>
+    <select id="selPlansNoReturnMoneyByBusVinSidDesc"
+            resultType="com.yxt.anrui.riskcenter.api.loansettleapply.PlanNoReturnMoney">
+        SELECT * FROM
+            (SELECT
+                 p.sid,
+                 p.scheduleSid mSid,
+                 IFNULL(
+                         (p.dueMoney - IFNULL((SELECT
+                                                   SUM(IFNULL( h.actualMoney, 0 ))
+                                               FROM
+                                                   loan_repayment_history AS h
+                                               WHERE
+                                                   h.planDetailSid = p.sid
+                                                 AND h.updateState = '1'
+                                              ),0)),0) AS money
+             FROM
+                 loan_repayment_plan_details p
+             WHERE
+                 p.busVinSid = #{busVinSid}
+             ORDER BY
+                 p.period DESC,
+                 p.policyOrOther ASC) a
+        WHERE a.money > 0
+    </select>
+    <select id="selNoReturnJrMoneyByBusVinSidAndKeyDesc"
+            resultType="com.yxt.anrui.riskcenter.api.loansettleapply.PlanNoReturnMoney">
+        SELECT * FROM
+            (SELECT
+                 a.*,
+                 (
+                     SELECT
+                         IFNULL( fjj.reveivableMoney, 0 ) - IFNULL( fjj.m, 0 )
+                     FROM
+                         (
+                             SELECT
+                                 (
+                                     SELECT
+                                         IFNULL( SUM( subscriptionMoney ), 0 )
+                                     FROM
+                                         anrui_fin.fin_selected_receivables_detailed AS s
+                                     WHERE
+                                         s.auditState = '3'
+                                       AND s.receivablesSid = fj.sid
+                                 ) AS m,
+                                 fj.*
+                             FROM
+                                 (
+                                     SELECT
+                                         j.busSid,
+                                         j.sid,
+                                         IFNULL( j.reveivableMoney, 0 ) reveivableMoney
+                                     FROM
+                                         anrui_fin.fin_uncollected_receivables_detailed_jr AS j
+                                     WHERE
+                                         j.payCostTitleKey = #{key}
+                                 ) AS fj
+                         ) AS fjj
+                     WHERE
+                         fjj.busSid = a.sid
+                 ) AS money,
+                 (SELECT
+                      j.sid
+                  FROM
+                      anrui_fin.fin_uncollected_receivables_detailed_jr AS j
+                  WHERE
+                      j.payCostTitleKey = #{key} and j.busSid = a.sid) jrSid
+             FROM
+                 (
+                     SELECT
+                         p.sid,
+                         p.period,
+                         p.bankName
+                     FROM
+                         loan_repayment_plan_details p
+                     WHERE
+                         p.busVinSid = #{busVinSid}
+                     ORDER BY
+                         p.period DESC,
+                         p.policyOrOther ASC
+                 ) a) b
+        WHERE b.money > 0
+    </select>
+    <select id="selectNoReturnMoneyByType"
+            resultType="com.yxt.anrui.riskcenter.api.loansettleapply.PlanNoReturnMoney">
+        SELECT * FROM
+            (SELECT
+                 IFNULL( fjj.reveivableMoney, 0 ) - IFNULL( fjj.m, 0 ) money,
+                 fjj.sid jrSid
+             FROM
+                 (
+                     SELECT
+                         (
+                             SELECT
+                                 IFNULL( SUM( subscriptionMoney ), 0 )
+                             FROM
+                                 anrui_fin.fin_selected_receivables_detailed AS s
+                             WHERE
+                                 s.auditState = '3'
+                               AND s.receivablesSid = fj.sid
+                         ) AS m,
+                         fj.*
+                     FROM
+                         (
+                             SELECT
+                                 j.busSid,
+                                 j.sid,
+                                 IFNULL( j.reveivableMoney, 0 ) reveivableMoney
+                             FROM
+                                 anrui_fin.fin_uncollected_receivables_detailed_jr AS j
+                             WHERE
+                                 j.payCostTitleValue = #{value}
+                         ) AS fj
+                 ) AS fjj
+             WHERE
+                 fjj.busSid = #{planDetailsSid}) a
+        WHERE a.money > 0
+    </select>
+    <select id="selJrMoneyByBusVinSidAndCloseDate" resultType="java.lang.String">
+        SELECT
+            IFNULL(SUM(s.subscriptionMoney),0)
+        FROM
+            loan_repayment_plan_details AS p
+                LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr as jr ON p.sid = jr.busSid
+                LEFT JOIN anrui_fin.fin_selected_receivables_detailed as s ON jr.sid = s.receivablesSid
+        WHERE p.busVinSid = #{busVinSid} AND s.auditState = '3' AND s.createTime > #{formatDate}
+    </select>
+    <select id="selDueMoneyByBusVinSidAndCloseDate" resultType="java.lang.String">
+        SELECT
+            IFNULL(SUM(h.actualMoney),0)
+        FROM
+            loan_repayment_plan_details AS p
+                LEFT JOIN loan_repayment_history as h ON p.sid = h.planDetailSid
+        WHERE p.busVinSid = #{busVinSid} AND h.updateState = '1' AND h.dataTime > #{formatDate}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -8,8 +8,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -29,6 +32,7 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loansettleapply.*;
@@ -42,6 +46,8 @@ import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompany
 import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleDto;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
+import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostMapper;
 import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostService;
@@ -82,6 +88,8 @@ import java.util.stream.Collectors;
 @Service
 public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMapper, LoanSettleApply> {
 
+    @Autowired
+    private FinPaymentrecordFeign finPaymentrecordFeign;
     @Autowired
     private FlowFeign flowFeign;
     @Autowired
@@ -124,7 +132,10 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
     @Autowired
     private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
-
+    @Autowired
+    private LoanRepaymentHistoryService loanRepaymentHistoryService;
+    @Autowired
+    private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
 
     public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
         LoanSettleApplyQuery query = pq.getParams();
@@ -308,7 +319,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String busVinSid = query.getBusVinSid();
         String orgPath = query.getOrgPath();
         String userSid = query.getUserSid();
-        if (StringUtils.isBlank(sid)) {//新增初始化
+        if (StringUtils.isBlank(sid)) {
+            //新增初始化
             //根据用户查询发起人、发起部门、发起日期为当前日期
             String deptName = "";
             String deptSid = "";
@@ -479,20 +491,20 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         settleApplyCommonVo.setPutBankInterest(putBankInterest);
         //资金占用费
         String funfCost = baseMapper.selectZjzyf(busVinSid, settingDate);
-        String dk = baseMapper.selectDk(busVinSid, settingDate);
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        //计算当日资金占用费根据垫款总额
-        try {
-            Date d1 = format.parse(settingDate);//毫秒ms
-            Date d2 = format.parse(DateUtil.today());//毫秒ms
-            long diff = d2.getTime() - d1.getTime();
-            long diffDays = diff / (24 * 60 * 60 * 1000);
-            int i = new Long(diffDays).intValue() + 1;
-            String dks = new BigDecimal(dk).multiply(new BigDecimal("0.0007")).multiply(new BigDecimal(i)).setScale(2, RoundingMode.HALF_UP).toString();
-            funfCost = new BigDecimal(funfCost).add(new BigDecimal(dks)).toString();
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
+//        String dk = baseMapper.selectDk(busVinSid, settingDate);
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+//        //计算当日资金占用费根据垫款总额
+//        try {
+//            Date d1 = format.parse(settingDate);//毫秒ms
+//            Date d2 = format.parse(DateUtil.today());//毫秒ms
+//            long diff = d2.getTime() - d1.getTime();
+//            long diffDays = diff / (24 * 60 * 60 * 1000);
+//            int i = new Long(diffDays).intValue() + 1;
+//            String dks = new BigDecimal(dk).multiply(new BigDecimal("0.0007")).multiply(new BigDecimal(i)).setScale(2, RoundingMode.HALF_UP).toString();
+//            funfCost = new BigDecimal(funfCost).add(new BigDecimal(dks)).toString();
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
 
         settleApplyCommonVo.setFunfCost(funfCost);
         //公司当前逾期月还
@@ -510,6 +522,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         //根据销售订单查询还款计划主表
         LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
         if (null != schedule) {
+            if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                settleApplyCommonVo.setBankSid(schedule.getBankSid());
+            }
             BigDecimal bondAmounts = BigDecimal.ZERO;
             if (null != schedule.getBondAmounts()) {
                 bondAmounts = schedule.getBondAmounts();
@@ -717,25 +732,34 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 loanSettleApply = fetchBySid(businessSid);
-                loanSettleApply.setCloseDate(DateUtil.today());
+                loanSettleApply.setCloseDate(new Date());
                 loanSettleApply.setSettingDate(DateUtil.today());
-                baseMapper.updateById(loanSettleApply);
-//                //更新车辆表结清状态
-//                baseMapper.updateBus(loanSettleApply.getBusVinSid(),"1");
-                //推送到结清车辆台账
-//                pushSettlevehicle(businessSid);
-                LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
-                if (null != reduction) {
-                    //获取公司减免情况
-                    BigDecimal amountTo = BigDecimal.ZERO;
-                    if (null != reduction.getAmountTo()) {
-                        amountTo = reduction.getAmountTo();
-                    }
-                    if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
-                        //推送应收、结转、减免。
-                        pushUnColl(businessSid);
+                if (loanSettleApply.getTrueReduction() == 1) {
+                    LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
+                    if (null != reduction) {
+                        //获取公司减免情况
+                        BigDecimal amountTo = BigDecimal.ZERO;
+                        if (null != reduction.getAmountTo()) {
+                            amountTo = reduction.getAmountTo();
+                        }
+                        //生成结清应收
+                        pushNewUnLists(loanSettleApply);
+                        if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
+                            //减免后结清合计 <= 0
+                            //结转剩余保证金
+                            carryForward(loanSettleApply);
+                            //减免剩余应收
+                            reliefMoney(loanSettleApply);
+                            //设置结清申请的“客户结清确认”状态为是
+                            loanSettleApply.setState(1);
+                            //更新车辆表结清状态
+                            baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1");
+                            //推送资方结清款到出纳代付款列表
+                            pushBankSettlePrice(loanSettleApply);
+                        }
                     }
                 }
+                baseMapper.updateById(loanSettleApply);
             } else {
                 //极光推送
                 loanSettleApply = fetchBySid(businessSid);
@@ -758,6 +782,676 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
     }
 
+    //---------------------------------- 结清生成应收新逻辑 ---------------------
+    private void pushNewUnLists(LoanSettleApply loanSettleApply) {
+        List<FinUncollectedReceivablesDetailedJR> list = new ArrayList<>();
+        List<FinUncollectedReceivablesDetailedJR> updateList = new ArrayList<>();
+        //资方逾期利息应收、名义价应收、合同违约金应收、其他费用应收
+        LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(loanSettleApply.getSid());
+        LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
+        String scheduleSid = planDetails.getScheduleSid();
+        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+        if (schedule.getIsOtherPolicy().equals("1") && schedule.getSameBank().equals("0")) {
+            planDetails = baseMapper.selectMainPeriodByBusVinSid(loanSettleApply.getBusVinSid());
+        }
+        String planDetailsSid = planDetails.getSid();
+        FinUncollectedReceivablesDetailedJR jr1 = finUncollectedReceivablesDetailedJRFeign.getUnJrByPayCostTitleKeyAndBusSid("012", planDetailsSid).getData();
+        if (null != jr1) {
+            if (null != loanSettleCompanyCost.getBankOverInterest()) {
+                jr1.setReveivableMoney(loanSettleCompanyCost.getBankOverInterest());
+                updateList.add(jr1);
+            }
+        } else {
+            if (loanSettleCompanyCost.getBankOverInterest().compareTo(BigDecimal.ZERO) > 0) {
+                //资方逾期利息应收
+                FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                jr.setBusSid(planDetails.getSid());
+                jr.setReveivableMoney(loanSettleCompanyCost.getBankOverInterest());
+                jr.setPayCostTitleKey("012");
+                jr.setPayCostTitleValue("结清时资方逾期利息");
+                jr.setOrgSidPath(planDetails.getOrgSidPath());
+                jr.setUseOrgName(planDetails.getUseOrgName());
+                jr.setUseOrgSid(planDetails.getUseOrgSid());
+                jr.setStaffDeptName(planDetails.getDept());
+                jr.setStaffName(planDetails.getStaffName());
+                jr.setStaffDeptSid(planDetails.getDeptSid());
+                jr.setStaffUserSid(planDetails.getSalesUserSid());
+                list.add(jr);
+            }
+        }
+        FinUncollectedReceivablesDetailedJR jr2 = finUncollectedReceivablesDetailedJRFeign.getUnJrByPayCostTitleKeyAndBusSid("009", planDetailsSid).getData();
+        if (null != jr2) {
+            if (null != loanSettleCompanyCost.getCompanyNominalPrice()) {
+                jr2.setReveivableMoney(loanSettleCompanyCost.getCompanyNominalPrice());
+                updateList.add(jr1);
+            }
+        } else {
+            if (loanSettleCompanyCost.getCompanyNominalPrice().compareTo(BigDecimal.ZERO) > 0) {
+                //名义价应收
+                FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                jr.setBusSid(planDetails.getSid());
+                jr.setReveivableMoney(loanSettleCompanyCost.getCompanyNominalPrice());
+                jr.setPayCostTitleKey("009");
+                jr.setPayCostTitleValue("名义价");
+                jr.setOrgSidPath(planDetails.getOrgSidPath());
+                jr.setUseOrgName(planDetails.getUseOrgName());
+                jr.setUseOrgSid(planDetails.getUseOrgSid());
+                jr.setStaffDeptName(planDetails.getDept());
+                jr.setStaffName(planDetails.getStaffName());
+                jr.setStaffDeptSid(planDetails.getDeptSid());
+                jr.setStaffUserSid(planDetails.getSalesUserSid());
+                list.add(jr);
+            }
+        }
+        FinUncollectedReceivablesDetailedJR jr3 = finUncollectedReceivablesDetailedJRFeign.getUnJrByPayCostTitleKeyAndBusSid("010", planDetailsSid).getData();
+        if (null != jr3) {
+            if (null != loanSettleCompanyCost.getContractLiquidated()) {
+                jr3.setReveivableMoney(loanSettleCompanyCost.getContractLiquidated());
+                updateList.add(jr3);
+            }
+        } else {
+            if (loanSettleCompanyCost.getContractLiquidated().compareTo(BigDecimal.ZERO) > 0) {
+                //合同违约金应收
+                FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                jr.setBusSid(planDetails.getSid());
+                jr.setReveivableMoney(loanSettleCompanyCost.getContractLiquidated());
+                jr.setPayCostTitleKey("010");
+                jr.setPayCostTitleValue("合同违约金");
+                jr.setOrgSidPath(planDetails.getOrgSidPath());
+                jr.setUseOrgName(planDetails.getUseOrgName());
+                jr.setUseOrgSid(planDetails.getUseOrgSid());
+                jr.setStaffDeptName(planDetails.getDept());
+                jr.setStaffName(planDetails.getStaffName());
+                jr.setStaffDeptSid(planDetails.getDeptSid());
+                jr.setStaffUserSid(planDetails.getSalesUserSid());
+                list.add(jr);
+            }
+        }
+        FinUncollectedReceivablesDetailedJR jr4 = finUncollectedReceivablesDetailedJRFeign.getUnJrByPayCostTitleKeyAndBusSid("011", planDetailsSid).getData();
+        if (null != jr4) {
+            if (null != loanSettleCompanyCost.getContractLiquidated()) {
+                jr4.setReveivableMoney(loanSettleCompanyCost.getContractLiquidated());
+                updateList.add(jr4);
+            }
+        } else {
+            if (loanSettleCompanyCost.getCompanyOtherPrice().compareTo(BigDecimal.ZERO) > 0) {
+                //公司其他费用应收
+                FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                jr.setBusSid(planDetails.getSid());
+                jr.setReveivableMoney(loanSettleCompanyCost.getCompanyOtherPrice());
+                jr.setPayCostTitleKey("011");
+                jr.setPayCostTitleValue("其他费用");
+                jr.setOrgSidPath(planDetails.getOrgSidPath());
+                jr.setUseOrgName(planDetails.getUseOrgName());
+                jr.setUseOrgSid(planDetails.getUseOrgSid());
+                jr.setStaffDeptName(planDetails.getDept());
+                jr.setStaffName(planDetails.getStaffName());
+                jr.setStaffDeptSid(planDetails.getDeptSid());
+                jr.setStaffUserSid(planDetails.getSalesUserSid());
+                list.add(jr);
+            }
+        }
+        list.removeAll(Collections.singleton(null));
+        updateList.removeAll(Collections.singleton(null));
+        if (!list.isEmpty() && list.size() > 0) {
+            finUncollectedReceivablesDetailedJRFeign.saveAll(list);
+        }
+        if (!updateList.isEmpty() && updateList.size() > 0) {
+            finUncollectedReceivablesDetailedJRFeign.updateList(updateList);
+        }
+    }
+
+    //--------------------------------- 贷款保证金结转 -------------------------
+    private void carryForward(LoanSettleApply loanSettleApply) {
+        String userSid = loanSettleApply.getCreateBySid();
+        BigDecimal deposit = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
+        BigDecimal depositKF = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
+        BigDecimal depositJM = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
+        BigDecimal amountTo = BigDecimal.ZERO; // 资方结清合计
+        String busVinSid = loanSettleApply.getBusVinSid();
+        List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
+        List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
+        List<LoanRepaymentPlanDetails> payments = new ArrayList<>(); //消减垫款金额列表
+        List<LoanRepaymentPlanDetails> yqlx = new ArrayList<>(); //消减逾期利息列表
+        LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
+        String scheduleSid = planDetails.getScheduleSid();
+        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+        if (schedule.getIsOtherPolicy().equals("1") && schedule.getSameBank().equals("0")) {
+            planDetails = baseMapper.selectMainPeriodByBusVinSid(loanSettleApply.getBusVinSid());
+        }
+        String planDetailsSid = planDetails.getSid();
+        LoanSettleCompanyCost companyCost = loanSettleCompanyCostService.selectByMainSid(loanSettleApply.getSid());
+        if (null != companyCost) {
+            if (null != companyCost.getLoanDeposit()) {
+                deposit = companyCost.getLoanDeposit();
+            }
+            if (null != companyCost.getDeductionAmount()) {
+                depositKF = companyCost.getDeductionAmount();
+            }
+        }
+        LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
+        if (null != reduction) {
+            if (null != reduction.getDepositPenalty()) {
+                depositJM = reduction.getDepositPenalty();
+            }
+            if (null != reduction.getAmountTo()) {
+                amountTo = reduction.getAmountTo();
+            }
+        }
+        if (amountTo.compareTo(BigDecimal.ZERO) > 0) {
+            deposit = deposit.subtract(depositKF).add(depositJM);
+        } else if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
+            deposit = deposit.subtract(depositKF).add(depositJM).add(amountTo);
+        }
+        //按照顺序结转
+        //月还
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            List<PlanNoReturnMoney> p = baseMapper.selPlansNoReturnMoneyByBusVinSidDesc(busVinSid);
+            p.removeAll(Collections.singleton(null));
+            if (!p.isEmpty() && p.size() > 0) {
+                for (PlanNoReturnMoney m : p) {
+                    if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+                        BigDecimal money = new BigDecimal(m.getMoney());
+                        BigDecimal mm = BigDecimal.ZERO;
+                        String sid = m.getSid();
+                        String mSid = m.getMSid();
+                        LoanRepaymentHistory history = new LoanRepaymentHistory();
+                        history.setCreateBySid(userSid);
+                        history.setDataTime(new Date());
+                        history.setUpdateState("1");
+                        history.setUpdateTime(new Date());
+                        history.setActualDate(new Date());
+                        history.setBuckleKey("003");
+                        history.setBuckle("审核通过");
+                        history.setReturnWayKey("04");
+                        history.setReturnWay("结转");
+                        history.setPayState(0);
+                        history.setPlanDetailSid(sid);
+                        history.setScheduleSid(mSid);
+                        if (deposit.compareTo(money) >= 0) {
+                            mm = money;
+                            history.setActualMoney(money);
+                            histories.add(history);
+                            deposit = deposit.subtract(money);
+                        } else {
+                            mm = deposit;
+                            history.setActualMoney(deposit);
+                            histories.add(history);
+                            deposit = BigDecimal.ZERO;
+                        }
+                        LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
+                        if (null != pd.getPaymentMoney()) {
+                            BigDecimal paymentMoney = pd.getPaymentMoney();
+                            if (mm.compareTo(paymentMoney) >= 0) {
+                                pd.setPaymentMoney(new BigDecimal("0"));
+                            } else {
+                                pd.setPaymentMoney(paymentMoney.subtract(mm));
+                            }
+                            payments.add(pd);
+                        }
+                    }
+                }
+            }
+        }
+        //结转垫资方逾期利息
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            List<PlanNoReturnMoney> p = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "005");
+            p.removeAll(Collections.singleton(null));
+            if (!p.isEmpty() && p.size() > 0) {
+                for (PlanNoReturnMoney m : p) {
+                    if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+                        BigDecimal money = new BigDecimal(m.getMoney());
+                        BigDecimal mm = BigDecimal.ZERO;
+                        String sid = m.getSid();
+                        LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
+                        FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                        fin.setCreateBySid(userSid);
+                        fin.setRemarks("结转");
+                        fin.setVIN(pd.getVinNo());
+                        fin.setUseOrgSid(pd.getUseOrgSid());
+                        fin.setReceivablesName("资方逾期利息");
+                        if (deposit.compareTo(money) >= 0) {
+                            mm = money;
+                            fin.setSubscriptionMoney(money);
+                            deposit = deposit.subtract(money);
+                        } else {
+                            mm = deposit;
+                            fin.setSubscriptionMoney(deposit);
+                            deposit = BigDecimal.ZERO;
+                        }
+                        fin.setSubscriptionDate(DateUtil.today());
+                        fin.setAuditState(3);
+                        fin.setAuditDate(DateUtil.today());
+                        fin.setReceivablesSid(m.getJrSid());
+                        fin.setKxState("01");
+                        fin.setUseOrgName(pd.getUseOrgName());
+                        fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                        selectList.add(fin);
+                        if (null != pd.getPaymentInterest()) {
+                            BigDecimal paymentInterest = pd.getPaymentInterest();
+                            if (mm.compareTo(paymentInterest) >= 0) {
+                                pd.setPaymentInterest(new BigDecimal("0"));
+                            } else {
+                                pd.setPaymentInterest(paymentInterest.subtract(mm));
+                            }
+                            yqlx.add(pd);
+                        }
+                    }
+                }
+            }
+        }
+        //结转资方逾期利息
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "结清时资方逾期利息");
+            BigDecimal money = new BigDecimal(p.getMoney());
+            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+            fin.setCreateBySid(planDetails.getSalesUserSid());
+            fin.setRemarks("结转");
+            fin.setVIN(planDetails.getVinNo());
+            fin.setUseOrgSid(planDetails.getUseOrgSid());
+            fin.setReceivablesName("结清时资方逾期利息");
+            if (deposit.compareTo(money) >= 0) {
+                fin.setSubscriptionMoney(money);
+                deposit = deposit.subtract(money);
+            } else {
+                fin.setSubscriptionMoney(deposit);
+                deposit = BigDecimal.ZERO;
+            }
+            fin.setSubscriptionDate(DateUtil.today());
+            fin.setAuditState(3);
+            fin.setAuditDate(DateUtil.today());
+            fin.setReceivablesSid(p.getJrSid());
+            fin.setKxState("01");
+            fin.setPurchaseSystemSid("");
+            fin.setPurchaseSystemName("");
+            fin.setStaffUserSid("");
+            fin.setUseOrgName(planDetails.getUseOrgName());
+            fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+            selectList.add(fin);
+        }
+        //名义价
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "名义价");
+            BigDecimal money = new BigDecimal(p.getMoney());
+            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+            fin.setCreateBySid(planDetails.getSalesUserSid());
+            fin.setRemarks("结转");
+            fin.setVIN(planDetails.getVinNo());
+            fin.setUseOrgSid(planDetails.getUseOrgSid());
+            fin.setReceivablesName("名义价");
+            if (deposit.compareTo(money) >= 0) {
+                fin.setSubscriptionMoney(money);
+                deposit = deposit.subtract(money);
+            } else {
+                fin.setSubscriptionMoney(deposit);
+                deposit = BigDecimal.ZERO;
+            }
+            fin.setSubscriptionDate(DateUtil.today());
+            fin.setAuditState(3);
+            fin.setAuditDate(DateUtil.today());
+            fin.setReceivablesSid(p.getJrSid());
+            fin.setKxState("01");
+            fin.setPurchaseSystemSid("");
+            fin.setPurchaseSystemName("");
+            fin.setStaffUserSid("");
+            fin.setUseOrgName(planDetails.getUseOrgName());
+            fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+            selectList.add(fin);
+        }
+        //合同违约金
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "合同违约金");
+            BigDecimal money = new BigDecimal(p.getMoney());
+            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+            fin.setCreateBySid(planDetails.getSalesUserSid());
+            fin.setRemarks("结转");
+            fin.setVIN(planDetails.getVinNo());
+            fin.setUseOrgSid(planDetails.getUseOrgSid());
+            fin.setReceivablesName("合同违约金");
+            if (deposit.compareTo(money) >= 0) {
+                fin.setSubscriptionMoney(money);
+                deposit = deposit.subtract(money);
+            } else {
+                fin.setSubscriptionMoney(deposit);
+                deposit = BigDecimal.ZERO;
+            }
+            fin.setSubscriptionDate(DateUtil.today());
+            fin.setAuditState(3);
+            fin.setAuditDate(DateUtil.today());
+            fin.setReceivablesSid(p.getJrSid());
+            fin.setKxState("01");
+            fin.setPurchaseSystemSid("");
+            fin.setPurchaseSystemName("");
+            fin.setStaffUserSid("");
+            fin.setUseOrgName(planDetails.getUseOrgName());
+            fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+            selectList.add(fin);
+        }
+        //其他费用
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "其他费用");
+            BigDecimal money = new BigDecimal(p.getMoney());
+            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+            fin.setCreateBySid(planDetails.getSalesUserSid());
+            fin.setRemarks("结转");
+            fin.setVIN(planDetails.getVinNo());
+            fin.setUseOrgSid(planDetails.getUseOrgSid());
+            fin.setReceivablesName("其他费用");
+            if (deposit.compareTo(money) >= 0) {
+                fin.setSubscriptionMoney(money);
+                deposit = deposit.subtract(money);
+            } else {
+                fin.setSubscriptionMoney(deposit);
+                deposit = BigDecimal.ZERO;
+            }
+            fin.setSubscriptionDate(DateUtil.today());
+            fin.setAuditState(3);
+            fin.setAuditDate(DateUtil.today());
+            fin.setReceivablesSid(p.getJrSid());
+            fin.setKxState("01");
+            fin.setPurchaseSystemSid("");
+            fin.setPurchaseSystemName("");
+            fin.setStaffUserSid("");
+            fin.setUseOrgName(planDetails.getUseOrgName());
+            fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+            selectList.add(fin);
+        }
+        //资金占用费
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            List<PlanNoReturnMoney> p = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "006");
+            p.removeAll(Collections.singleton(null));
+            if (!p.isEmpty() && p.size() > 0) {
+                for (PlanNoReturnMoney m : p) {
+                    if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+                        BigDecimal money = new BigDecimal(m.getMoney());
+                        FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                        fin.setCreateBySid(userSid);
+                        fin.setRemarks("结转");
+                        fin.setVIN(planDetails.getVinNo());
+                        fin.setUseOrgSid(planDetails.getUseOrgSid());
+                        fin.setReceivablesName("资金占用费");
+                        if (deposit.compareTo(money) >= 0) {
+                            fin.setSubscriptionMoney(money);
+                            deposit = deposit.subtract(money);
+                        } else {
+                            fin.setSubscriptionMoney(deposit);
+                            deposit = BigDecimal.ZERO;
+                        }
+                        fin.setSubscriptionDate(DateUtil.today());
+                        fin.setAuditState(3);
+                        fin.setAuditDate(DateUtil.today());
+                        fin.setReceivablesSid(m.getJrSid());
+                        fin.setKxState("01");
+                        fin.setUseOrgName(planDetails.getUseOrgName());
+                        fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                        selectList.add(fin);
+                    }
+                }
+            }
+        }
+        if (histories.size() > 0 && !histories.isEmpty()) {
+            loanRepaymentHistoryService.saveList(histories);
+        }
+        if (payments.size() > 0 && !payments.isEmpty()) {
+            loanRepaymentPlanDetailsService.updateList(payments);
+        }
+        if (yqlx.size() > 0 && !yqlx.isEmpty()) {
+            loanRepaymentPlanDetailsService.updateList(yqlx);
+        }
+        selectList.removeAll(Collections.singleton(null));
+        if (selectList.size() > 0 && !selectList.isEmpty()) {
+            ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList);
+        }
+    }
+
+    //--------------------------------- 减免 ----------------------------
+    private void reliefMoney(LoanSettleApply loanSettleApply) {
+        String userSid = loanSettleApply.getCreateBySid();
+        String busVinSid = loanSettleApply.getBusVinSid();
+        List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
+        List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
+        List<LoanRepaymentPlanDetails> payments = new ArrayList<>(); //消减垫款金额列表
+        List<LoanRepaymentPlanDetails> yqlx = new ArrayList<>(); //消减逾期利息列表
+        LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
+        String scheduleSid = planDetails.getScheduleSid();
+        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+        if (schedule.getIsOtherPolicy().equals("1") && schedule.getSameBank().equals("0")) {
+            planDetails = baseMapper.selectMainPeriodByBusVinSid(loanSettleApply.getBusVinSid());
+        }
+        String planDetailsSid = planDetails.getSid();
+        //资金占用费
+        List<PlanNoReturnMoney> p = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "006");
+        p.removeAll(Collections.singleton(null));
+        if (!p.isEmpty() && p.size() > 0) {
+            for (PlanNoReturnMoney m : p) {
+                BigDecimal money = new BigDecimal(m.getMoney());
+                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                fin.setCreateBySid(userSid);
+                fin.setRemarks("减免");
+                fin.setVIN(planDetails.getVinNo());
+                fin.setUseOrgSid(planDetails.getUseOrgSid());
+                fin.setReceivablesName("资金占用费");
+                fin.setSubscriptionMoney(money);
+                fin.setSubscriptionDate(DateUtil.today());
+                fin.setAuditState(3);
+                fin.setAuditDate(DateUtil.today());
+                fin.setReceivablesSid(m.getJrSid());
+                fin.setKxState("01");
+                fin.setUseOrgName(planDetails.getUseOrgName());
+                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                selectList.add(fin);
+            }
+        }
+        //月还
+        List<PlanNoReturnMoney> p1 = baseMapper.selPlansNoReturnMoneyByBusVinSidDesc(busVinSid);
+        p1.removeAll(Collections.singleton(null));
+        if (!p1.isEmpty() && p1.size() > 0) {
+            for (PlanNoReturnMoney m : p1) {
+                BigDecimal money = new BigDecimal(m.getMoney());
+                String sid = m.getSid();
+                String mSid = m.getMSid();
+                LoanRepaymentHistory history = new LoanRepaymentHistory();
+                history.setCreateBySid(userSid);
+                history.setDataTime(new Date());
+                history.setUpdateState("1");
+                history.setUpdateTime(new Date());
+                history.setActualDate(new Date());
+                history.setBuckleKey("003");
+                history.setBuckle("审核通过");
+                history.setReturnWayKey("05");
+                history.setReturnWay("减免");
+                history.setPayState(0);
+                history.setPlanDetailSid(sid);
+                history.setScheduleSid(mSid);
+                history.setActualMoney(money);
+                histories.add(history);
+                LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
+                if (null != pd.getPaymentMoney()) {
+                    BigDecimal paymentMoney = pd.getPaymentMoney();
+                    pd.setPaymentMoney(new BigDecimal("0"));
+                    payments.add(pd);
+                }
+            }
+        }
+        //垫资方逾期利息
+        List<PlanNoReturnMoney> p2 = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "005");
+        p2.removeAll(Collections.singleton(null));
+        if (!p2.isEmpty() && p2.size() > 0) {
+            for (PlanNoReturnMoney m : p2) {
+                BigDecimal money = new BigDecimal(m.getMoney());
+                String sid = m.getSid();
+                LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
+                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                fin.setCreateBySid(userSid);
+                fin.setRemarks("减免");
+                fin.setVIN(pd.getVinNo());
+                fin.setUseOrgSid(pd.getUseOrgSid());
+                fin.setReceivablesName("资方逾期利息");
+                fin.setSubscriptionMoney(money);
+                fin.setSubscriptionDate(DateUtil.today());
+                fin.setAuditState(3);
+                fin.setAuditDate(DateUtil.today());
+                fin.setReceivablesSid(m.getJrSid());
+                fin.setKxState("01");
+                fin.setUseOrgName(pd.getUseOrgName());
+                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                selectList.add(fin);
+                if (null != pd.getPaymentInterest()) {
+                    BigDecimal paymentInterest = pd.getPaymentInterest();
+                    pd.setPaymentInterest(new BigDecimal("0"));
+                    yqlx.add(pd);
+                }
+            }
+        }
+        //资方逾期利息
+        PlanNoReturnMoney p3 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "结清时资方逾期利息");
+        if (null != p3) {
+            BigDecimal money = new BigDecimal(p3.getMoney());
+            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+            fin.setCreateBySid(planDetails.getSalesUserSid());
+            fin.setRemarks("减免");
+            fin.setVIN(planDetails.getVinNo());
+            fin.setUseOrgSid(planDetails.getUseOrgSid());
+            fin.setReceivablesName("结清时资方逾期利息");
+            fin.setSubscriptionMoney(money);
+            fin.setSubscriptionDate(DateUtil.today());
+            fin.setAuditState(3);
+            fin.setAuditDate(DateUtil.today());
+            fin.setReceivablesSid(p3.getJrSid());
+            fin.setKxState("01");
+            fin.setPurchaseSystemSid("");
+            fin.setPurchaseSystemName("");
+            fin.setStaffUserSid("");
+            fin.setUseOrgName(planDetails.getUseOrgName());
+            fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+            selectList.add(fin);
+        }
+        //名义价
+        PlanNoReturnMoney p4 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "名义价");
+        if (null != p4) {
+            BigDecimal money = new BigDecimal(p4.getMoney());
+            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+            fin.setCreateBySid(planDetails.getSalesUserSid());
+            fin.setRemarks("减免");
+            fin.setVIN(planDetails.getVinNo());
+            fin.setUseOrgSid(planDetails.getUseOrgSid());
+            fin.setReceivablesName("名义价");
+            fin.setSubscriptionMoney(money);
+            fin.setSubscriptionDate(DateUtil.today());
+            fin.setAuditState(3);
+            fin.setAuditDate(DateUtil.today());
+            fin.setReceivablesSid(p4.getJrSid());
+            fin.setKxState("01");
+            fin.setPurchaseSystemSid("");
+            fin.setPurchaseSystemName("");
+            fin.setStaffUserSid("");
+            fin.setUseOrgName(planDetails.getUseOrgName());
+            fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+            selectList.add(fin);
+        }
+        //合同违约金
+        PlanNoReturnMoney p5 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "合同违约金");
+        if (null != p5) {
+            BigDecimal money = new BigDecimal(p5.getMoney());
+            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+            fin.setCreateBySid(planDetails.getSalesUserSid());
+            fin.setRemarks("减免");
+            fin.setVIN(planDetails.getVinNo());
+            fin.setUseOrgSid(planDetails.getUseOrgSid());
+            fin.setReceivablesName("合同违约金");
+            fin.setSubscriptionMoney(money);
+            fin.setSubscriptionDate(DateUtil.today());
+            fin.setAuditState(3);
+            fin.setAuditDate(DateUtil.today());
+            fin.setReceivablesSid(p5.getJrSid());
+            fin.setKxState("01");
+            fin.setPurchaseSystemSid("");
+            fin.setPurchaseSystemName("");
+            fin.setStaffUserSid("");
+            fin.setUseOrgName(planDetails.getUseOrgName());
+            fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+            selectList.add(fin);
+        }
+        //其他费用
+        PlanNoReturnMoney p6 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "其他费用");
+        if (null != p6) {
+            BigDecimal money = new BigDecimal(p6.getMoney());
+            FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+            fin.setCreateBySid(planDetails.getSalesUserSid());
+            fin.setRemarks("减免");
+            fin.setVIN(planDetails.getVinNo());
+            fin.setUseOrgSid(planDetails.getUseOrgSid());
+            fin.setReceivablesName("其他费用");
+            fin.setSubscriptionMoney(money);
+            fin.setSubscriptionDate(DateUtil.today());
+            fin.setAuditState(3);
+            fin.setAuditDate(DateUtil.today());
+            fin.setReceivablesSid(p6.getJrSid());
+            fin.setKxState("01");
+            fin.setPurchaseSystemSid("");
+            fin.setPurchaseSystemName("");
+            fin.setStaffUserSid("");
+            fin.setUseOrgName(planDetails.getUseOrgName());
+            fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+            selectList.add(fin);
+        }
+        if (histories.size() > 0 && !histories.isEmpty()) {
+            loanRepaymentHistoryService.saveList(histories);
+        }
+        if (payments.size() > 0 && !payments.isEmpty()) {
+            loanRepaymentPlanDetailsService.updateList(payments);
+        }
+        if (yqlx.size() > 0 && !yqlx.isEmpty()) {
+            loanRepaymentPlanDetailsService.updateList(yqlx);
+        }
+        selectList.removeAll(Collections.singleton(null));
+        if (selectList.size() > 0 && !selectList.isEmpty()) {
+            ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList);
+        }
+    }
+    //--------------------资方结清款到出纳代付款列表------------------
+    private void  pushBankSettlePrice(LoanSettleApply loanSettleApply) {
+        if (StringUtils.isBlank(loanSettleApply.getBusSid())) {
+            LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(loanSettleApply.getSid());
+            if (null != bankCost) {
+                if (null != bankCost.getBankSettlePrice()) {
+                    BigDecimal bankSettlePrice = bankCost.getBankSettlePrice();
+                    if (bankSettlePrice.compareTo(BigDecimal.ZERO) > 0) {
+                        FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                        finPaymentrecordDto.setApplySid("");
+                        finPaymentrecordDto.setPayCompanySid("");
+                        finPaymentrecordDto.setPayType(1);
+                        finPaymentrecordDto.setCreateOrgSid(loanSettleApply.getUseOrgSid());
+                        finPaymentrecordDto.setUseOrgSid(loanSettleApply.getUseOrgSid());
+                        finPaymentrecordDto.setCostTypeKey("");
+                        finPaymentrecordDto.setCostTypeValue("资方结清款");
+                        finPaymentrecordDto.setCostTitleKey("");
+                        finPaymentrecordDto.setCostTitleValue("资方结清款");
+                        finPaymentrecordDto.setReceiveBank("");
+                        if (StringUtils.isNotBlank(bankCost.getBankAccount())) {
+                            finPaymentrecordDto.setReceiveBankAccount(bankCost.getBankAccount());
+                        }
+                        if (StringUtils.isNotBlank(bankCost.getAccountName())) {
+                            finPaymentrecordDto.setReceiveCompany(bankCost.getAccountName());
+                        }
+                        finPaymentrecordDto.setCost(bankSettlePrice.toString());
+                        finPaymentrecordDto.setAccountsReceive(bankSettlePrice.toString());
+                        finPaymentrecordDto.setBusSid(loanSettleApply.getSid());
+                        finPaymentrecordDto.setPayRemark("");
+                        finPaymentrecordDto.setPayCode("");
+                        finPaymentrecordDto.setCreateBySid(loanSettleApply.getCreateBySid());
+                        finPaymentrecordDto.setUpdateBySid(loanSettleApply.getCreateBySid());
+                        finPaymentrecordDto.setRemarks(loanSettleApply.getRemarks());
+                        finPaymentrecordDto.setPurchaseSystemSid("");
+                        finPaymentrecordDto.setPurchaseSystemName("");
+                        finPaymentrecordDto.setBusRemarks("");
+                        String sid = finPaymentrecordFeign.save(finPaymentrecordDto).getData();
+                    }
+                }
+            }
+        }
+    }
+
     private void pushUnColl(String businessSid) {
         LoanSettleApply loanSettleApply = fetchBySid(businessSid);
         List<FinUncollectedReceivablesDetailedJR> list = new ArrayList<>();
@@ -1452,8 +2146,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 updateFlowFiled(map);
                 loanSettleApply = fetchBySid(query.getBusinessSid());
                 if (loanSettleApply.getNodeState().equals("终止")) {
-                 //修改车辆结算状态为0
-                 baseMapper.updateBus(loanSettleApply.getBusVinSid(),"0");
+                    //修改车辆结算状态为0
+                    baseMapper.updateBus(loanSettleApply.getBusVinSid(), "0");
                 }
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -1469,7 +2163,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     loanSettleApply = fetchBySid(query.getBusinessSid());
                     if (loanSettleApply.getNodeState().equals("终止")) {
                         //修改车辆结算状态为0
-                        baseMapper.updateBus(loanSettleApply.getBusVinSid(),"0");
+                        baseMapper.updateBus(loanSettleApply.getBusVinSid(), "0");
                     }
                     return rb.success().setData(resultBean.getData());
                 }
@@ -1626,7 +2320,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     qw.eq("bv.repoState", 0);
                 }
             }
-            qw.eq("ld.repaymentState",1);
+            qw.eq("ld.repaymentState", 1);
             qw.orderBy(true, true, "ld.loanContractNo", "bv.linkNo");
         }
         IPage<LoanSettleApply> page = PagerUtil.queryToPage(pagerQuery);
@@ -1640,13 +2334,47 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         LoanSettleApply loanSettleApply = fetchBySid(sid);
         String settingDate = loanSettleApply.getSettingDate();
         String formatDate = DateUtil.formatDate(new Date());
+        boolean settle = isSettle(loanSettleApply);
+        if (!settle) {
+            return rb.setMsg("结清款尚未认款完毕，请继续认款！");
+        }
         if (formatDate.compareTo(settingDate) > 0) {
             return rb.setMsg("只能在结清申请发起当日确认客户结清，若需结清，请重新发起结清申请！");
-        } else {
-            pushConfirm(sid);
-            loanSettleApply.setState(1);
-            baseMapper.updateById(loanSettleApply);
         }
+        loanSettleApply.setState(1);
+        baseMapper.updateById(loanSettleApply);
+        carryForward(loanSettleApply);
+        reliefMoney(loanSettleApply);
+        //更新车辆表结清状态
+        baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1");
+        //推送资方结清款到出纳代付款列表
+        pushBankSettlePrice(loanSettleApply);
         return rb.success();
     }
+
+    public boolean isSettle(LoanSettleApply loanSettleApply) {
+        boolean isSettle = true;
+        String busVinSid = loanSettleApply.getBusVinSid();
+        BigDecimal sumMoney = BigDecimal.ZERO;
+        BigDecimal dueMoney = BigDecimal.ZERO; //月还
+        BigDecimal jrMoney = BigDecimal.ZERO; //金融认款金额
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date closeDate = loanSettleApply.getCloseDate();
+        String formatDate = sdf.format(closeDate);
+        String jMoney = baseMapper.selJrMoneyByBusVinSidAndCloseDate(busVinSid,formatDate);
+        jrMoney = new BigDecimal(jMoney);
+        String dMoney = baseMapper.selDueMoneyByBusVinSidAndCloseDate(busVinSid,formatDate);
+        dueMoney = new BigDecimal(dMoney);
+        sumMoney = jrMoney.add(dueMoney);
+        LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
+        if (null != reduction) {
+            if (null != reduction.getAmountTo()) {
+                BigDecimal amountTo = reduction.getAmountTo();
+                if (sumMoney.compareTo(amountTo) < 0) {
+                    isSettle = false;
+                }
+            }
+        }
+        return isSettle;
+    }
 }

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

@@ -0,0 +1,218 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsoldcheckbill.WmsOldCheckbillDto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbill.WmsOldCheckbillQuery;
+import com.yxt.wms.biz.inventory.wmsoldcheckbill.WmsOldCheckbillService;
+import com.yxt.wms.biz.inventory.wmsoldcheckbill.WmsOldCheckbillVo;
+import com.yxt.wms.biz.inventory.wmsoldcheckbill.flowable.*;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.*;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.*;
+import com.yxt.wms.biz.inventory.wmsoldcheckbillreport.WmsOldCheckbillReportDetailsVo;
+import com.yxt.wms.feign.flowable.flow.BusinessVariables;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Api(tags = "旧件盘点")
+@RestController
+@RequestMapping("v1/oldpPartStocktaking")
+public class WmsOldCheckbillRest {
+
+    @Autowired
+    private WmsOldCheckbillService wmsOldCheckbillService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<WmsOldCheckbillVo>> listPage(@RequestBody PagerQuery<WmsOldCheckbillQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsOldCheckbillVo> pv = wmsOldCheckbillService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("新建盘点单")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody WmsOldCheckbillDto dto) {
+        return wmsOldCheckbillService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("生成盘点报告")
+    @PostMapping("/createReport")
+    public ResultBean createReport(@RequestParam("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        wmsOldCheckbillService.createReport(sid);
+        return rb.success();
+    }
+
+    @ApiOperation("查看盘点报告")
+    @PostMapping("/viewReport")
+    public ResultBean<WmsOldCheckbillReportDetailsVo> viewReport(@RequestParam("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsOldCheckbillReportDetailsVo wmsOldCheckbillReportDetailsVo = wmsOldCheckbillService.viewReport(sid);
+        return rb.success().success().setData(wmsOldCheckbillReportDetailsVo);
+    }
+
+    @ApiOperation("保存办理盘点报告")
+    @PostMapping("/saveReport")
+    public ResultBean saveReport(@RequestParam("sid") String sid,@RequestParam("remarks") String remarks) {
+        ResultBean rb = ResultBean.fireFail();
+        wmsOldCheckbillService.saveReport(sid,remarks);
+        return rb.success().success();
+    }
+
+    @ApiOperation("生成盘点报告PDF")
+    @PostMapping("/createPdf")
+    public ResultBean<String> createPdf(@RequestParam("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String url = wmsOldCheckbillService.createPdf(sid);
+        return rb.success().success().setData(url);
+    }
+
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return wmsOldCheckbillService.delAll(sids);
+    }
+
+    @ApiOperation("盘点-查看库位盘点列表")
+    @PostMapping("/detailRackPageList")
+    public ResultBean<PagerVo<WmsOldCheckbillDetailRackPageListVo>> detailRackPageList(@RequestBody PagerQuery<WmsOldCheckbillDetailRackPageListQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsOldCheckbillDetailRackPageListVo> pv = wmsOldCheckbillService.detailRackPageList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("盘点-查看商品盘点列表")
+    @PostMapping("/detailGoodPageList")
+    public ResultBean<PagerVo<WmsOldCheckbillDetailGoodPageListVo>> detailGoodPageList(@RequestBody PagerQuery<WmsOldCheckbillDetailGoodPageListQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsOldCheckbillDetailGoodPageListVo> pv = wmsOldCheckbillService.detailGoodPageList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("查看库位商品盘点列表")
+    @PostMapping("/detailRackGoodPageList")
+    public ResultBean<PagerVo<WmsOldCheckbillDetailRackGoodPageListVo>> detailRackGoodPageList(@RequestBody PagerQuery<WmsOldCheckbillDetailRackGoodPageListQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsOldCheckbillDetailRackGoodPageListVo> pv = wmsOldCheckbillService.detailRackGoodPageList(pq);
+        return rb.success().setData(pv);
+    }
+
+    /*********************************************************移动端************************************************************/
+
+    @ApiOperation("app-盘点-查看库位盘点列表")
+    @PostMapping("/appDetailRackPageList")
+    public ResultBean<PagerVo<WmsOldCheckbillPageVo>> appDetailRackPageList(@RequestBody PagerQuery<WmsOldCheckbillPageQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsOldCheckbillPageVo> pv = wmsOldCheckbillService.appDetailRackPageList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("办理/扫码保存")
+    @PostMapping("/saveInventoryInfo")
+    @ResponseBody
+    ResultBean saveInventoryInfo(@RequestBody WmsOldCheckbillGoodsDto dto) {
+        return wmsOldCheckbillService.saveInventoryInfo(dto);
+    }
+
+    @ApiOperation("盘盈保存")
+    @PostMapping("/saveInventoryInfo2")
+    @ResponseBody
+    ResultBean saveInventoryInfo2(@RequestBody WmsOldCheckbillGoodsPyDto dto){
+        return wmsOldCheckbillService.saveInventoryInfo2(dto);
+    }
+
+    @ApiOperation("扫描商品码")
+    @GetMapping("/scan")
+    @ResponseBody
+    public ResultBean<HandleBean> scan(@RequestParam("sid") String sid, @RequestParam("content") String content, @RequestParam("houseSid") String houseSid) {
+        return wmsOldCheckbillService.scan(sid, content, houseSid);
+    }
+
+    /*********************************************************流程************************************************************/
+
+    @ApiOperation("提交")
+    @PostMapping("/submitApply")
+    public ResultBean submitApply(@Valid @RequestBody SubmitOldCheckDto dto) {
+        return wmsOldCheckbillService.submitApply(dto);
+    }
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteOldCheckDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId("");
+        return wmsOldCheckbillService.complete(bv);
+    }
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<OldCheckNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap OldCheckNodeQuery query) {
+        return wmsOldCheckbillService.getPreviousNodesForReject(query);
+    }
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<OldCheckNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap OldCheckNodeQuery query) {
+        return wmsOldCheckbillService.getNextNodesForSubmit(query);
+    }
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody OldCheckTaskQuery query) {
+        return wmsOldCheckbillService.taskReject(query);
+    }
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody OldCheckTaskQuery query) {
+        return wmsOldCheckbillService.revokeProcess(query);
+    }
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody OldCheckTaskQuery query) {
+        return wmsOldCheckbillService.breakProcess(query);
+    }
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody OldCheckDelegateQuery query) {
+        return wmsOldCheckbillService.delegate(query);
+    }
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java

@@ -80,4 +80,8 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
     List<StorageListVo> appStorage(@Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
 
     List<OldStorageListVo> appOldStorage(@Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
+
+    List<WmsInventory> selJJByDeptSidAndRackSid(@Param("deptSid") String deptSid,@Param("rackSids") List<String> rackSids);
+
+    List<WmsInventory> selJJByDeptSid(String deptSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -582,4 +582,28 @@
         AND wi.goodsSkuCode = #{goodsSkuCode}
         AND wi.useOrgSid = #{deptSid}
     </select>
+
+    <select id="selJJByDeptSidAndRackSid" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventory">
+        SELECT wi.*
+        FROM wms_inventory wi
+        LEFT JOIN wms_warehouse_info wwi
+        ON wi.`warehouseSid` = wwi.`sid`
+        WHERE wi.count > 0
+        AND wwi.`useOrgSid` = #{deptSid}
+        AND RIGHT(wi.`goodsID`,2) = '-O'
+        AND wi.warehouseRackSid in
+        <foreach item="rackSid" collection="rackSids" open="(" separator="," close=")">
+            #{rackSid}
+        </foreach>
+    </select>
+
+    <select id="selJJByDeptSid" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventory">
+        SELECT wi.*
+        FROM wms_inventory wi
+                     LEFT JOIN wms_warehouse_info wwi
+                ON wi.`warehouseSid` = wwi.`sid`
+        WHERE wi.count > 0
+          AND wwi.`useOrgSid` = #{deptSid}
+          AND RIGHT(wi.`goodsID`,2) = '-O'
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -959,4 +959,12 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         List<WmsInventoryReturnFactSelectList> wmsInventoryReturnFactSelectListList = baseMapper.selBillNoAndCode(sourceBillNo,goodsSkuCode,deptSid);
         return rb.success().setData(wmsInventoryReturnFactSelectListList);
     }
+
+    public List<WmsInventory> selJJByDeptSidAndRackSid(String deptSid, List<String> rackSids) {
+        return baseMapper.selJJByDeptSidAndRackSid(deptSid,rackSids);
+    }
+
+    public List<WmsInventory> selJJByDeptSid(String deptSid) {
+        return baseMapper.selJJByDeptSid(deptSid);
+    }
 }

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

@@ -66,11 +66,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
 	IPage<WmsInventoryCheckbillDetailGoodPageListVo> detailGoodPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
 
 	IPage<WmsInventoryCheckbillDetailRackGoodPageListVo> detailRackGoodPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryCheckbill> qw);
-	
-	List<WmsInventoryCheckbillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
-	
-	@Select("select * from wms_inventory_checkbill")
-	List<WmsInventoryCheckbillVo> selectListVo();
 
     String selectNum(String billNo);
 

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

@@ -22,19 +22,19 @@
 		wic.`procDefId`,
 		wic.`procInstId`,
 		SUM(wicd.bookCount) AS bookCount,
-		SUM(wicd.bookCount) * cost AS bookAmount,
+		SUM(wicd.bookCount * cost) AS bookAmount,
 		SUM(wicd.realCount) AS realCount,
-		SUM(wicd.realCount) * cost AS realAmount,
+		SUM(wicd.realCount * cost) AS realAmount,
 		SUM(wicd.bookCount) - SUM(wicd.realCount) AS notCount,
 		(
-		SUM(wicd.bookCount) - SUM(wicd.realCount)
-		) * cost AS notAmount,
+		SUM(wicd.bookCount * cost) - SUM(wicd.realCount * cost)
+		) AS notAmount,
 		SUM(wicd.profitCount) AS profitCount,
-		SUM(wicd.profitCount) * cost AS profitAmount,
+		SUM(wicd.profitCount * cost) AS profitAmount,
 		SUM(wicd.loseCount) AS loseCount,
-		SUM(wicd.loseCount) * cost AS loseAmount,
+		SUM(wicd.loseCount * cost) AS loseAmount,
 		SUM(wicd.lossCount) AS lossCount,
-		SUM(wicd.lossCount) * cost AS lossAmount
+		SUM(wicd.lossCount * cost) AS lossAmount
 		FROM
 		wms_inventory_checkbill wic
 		LEFT JOIN wms_inventory_checkbill_detail wicd
@@ -53,17 +53,17 @@
 				warehouseRackSid,
 				warehouseRackName,
 				SUM(bookCount) AS bookCount,
-				SUM(bookCount) * cost AS bookAmount,
+				SUM(bookCount * cost) AS bookAmount,
 				SUM(realCount) AS realCount,
-				SUM(realCount) * cost AS realAmount,
+				SUM(realCount * cost) AS realAmount,
 				SUM(bookCount) - SUM(realCount) AS notCount,
-				(SUM(bookCount) - SUM(realCount)) * cost AS notAmount,
+				(SUM(bookCount * cost) - SUM(realCount * cost)) AS notAmount,
 				SUM(profitCount) AS profitCount,
-				SUM(profitCount) * cost AS profitAmount,
+				SUM(profitCount * cost) AS profitAmount,
 				SUM(loseCount) AS loseCount,
-				SUM(loseCount) * cost AS loseAmount,
+				SUM(loseCount * cost) AS loseAmount,
 				SUM(lossCount) AS lossCount,
-				SUM(lossCount) * cost AS lossAmount
+				SUM(lossCount * cost) AS lossAmount
 		FROM
 				wms_inventory_checkbill_detail
 		<where> ${ew.sqlSegment} </where>
@@ -170,10 +170,6 @@
 		<where> ${ew.sqlSegment} </where>
 	</select>
 
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillVo">
-		SELECT * FROM wms_inventory_checkbill <where> ${ew.sqlSegment} </where>
-	</select>
-
 	<select id="selectNum" resultType="java.lang.String">
 		select RIGHT (billNo, 4)
 		from wms_inventory_checkbill

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

@@ -288,7 +288,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     public ResultBean<String> saveOrUpdateDto(WmsInventoryCheckbillDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String checkState = baseMapper.checkState(dto.getDeptSid());
-        if (!"2".equals(checkState)) {
+        if (!"2".equals(checkState) && StringUtils.isNotBlank(checkState)) {
             return rb.setMsg("存在盘点中数据，无法生成新的盘点单");
         }
         SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(dto.getDeptSid()).getData();
@@ -356,16 +356,6 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         return entity.getSid();
     }
 
-    public void updateByDto(WmsInventoryCheckbillDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-        WmsInventoryCheckbill entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-    }
-
     public WmsInventoryCheckbillDetailsVo fetchDetailsVoBySid(String sid) {
         WmsInventoryCheckbill entity = fetchBySid(sid);
         WmsInventoryCheckbillDetailsVo vo = new WmsInventoryCheckbillDetailsVo();

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

@@ -22,15 +22,15 @@
             resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo">
 		SELECT
 				SUM(wicd.bookCount) AS ypNum,
-				SUM(wicd.bookCount) * cost AS ypMoney,
+				SUM(wicd.bookCount * cost) AS ypMoney,
 				SUM(wicd.realCount) AS spNum,
-				SUM(wicd.realCount) * cost AS spMoney,
+				SUM(wicd.realCount * cost) AS spMoney,
 				SUM(wicd.profitCount) AS pyNum,
-				SUM(wicd.profitCount) * cost AS pyMoney,
+				SUM(wicd.profitCount * cost) AS pyMoney,
 				SUM(wicd.loseCount) AS pkNum,
-				SUM(wicd.loseCount) * cost AS pkMoney,
+				SUM(wicd.loseCount * cost) AS pkMoney,
 				SUM(lossCount) AS psNum,
-				SUM(lossCount) * cost AS psMoney
+				SUM(lossCount * cost) AS psMoney
 		FROM
 				wms_inventory_checkbill_detail AS wicd
 		WHERE wicd.billSid = #{billSid}
@@ -42,15 +42,15 @@
 		SELECT
 				wicd.warehouseName,
 				SUM(wicd.bookCount) AS ypNum,
-				SUM(wicd.bookCount) * cost AS ypMoney,
+				SUM(wicd.bookCount * cost) AS ypMoney,
 				SUM(wicd.realCount) AS spNum,
-				SUM(wicd.realCount) * cost AS spMoney,
+				SUM(wicd.realCount * cost) AS spMoney,
 				SUM(wicd.profitCount) AS pyNum,
-				SUM(wicd.profitCount) * cost AS pyMoney,
+				SUM(wicd.profitCount * cost) AS pyMoney,
 				SUM(wicd.loseCount) AS pkNum,
-				SUM(wicd.loseCount) * cost AS pkMoney,
+				SUM(wicd.loseCount * cost) AS pkMoney,
 				SUM(lossCount) AS psNum,
-				SUM(lossCount) * cost AS psMoney
+				SUM(lossCount * cost) AS psMoney
 		FROM
 				wms_inventory_checkbill_detail AS wicd
 		WHERE wicd.billSid = #{billSid}
@@ -66,15 +66,15 @@
 						wicd.warehouseArea
 						) AS warehouseAreaeName,
 				SUM(wicd.bookCount) AS ypNum,
-				SUM(wicd.bookCount) * cost AS ypMoney,
+				SUM(wicd.bookCount * cost) AS ypMoney,
 				SUM(wicd.realCount) AS spNum,
-				SUM(wicd.realCount) * cost AS spMoney,
+				SUM(wicd.realCount * cost) AS spMoney,
 				SUM(wicd.profitCount) AS pyNum,
-				SUM(wicd.profitCount) * cost AS pyMoney,
+				SUM(wicd.profitCount * cost) AS pyMoney,
 				SUM(wicd.loseCount) AS pkNum,
-				SUM(wicd.loseCount) * cost AS pkMoney,
+				SUM(wicd.loseCount * cost) AS pkMoney,
 				SUM(lossCount) AS psNum,
-				SUM(lossCount) * cost AS psMoney
+				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/wmsoldcheckbill/WmsOldCheckbill.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbill;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("wms_old_checkbill")
+public class WmsOldCheckbill extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("申请部门sid")
+    private String deptSid; // 申请部门sid
+    @ApiModelProperty("申请部门名称")
+    private String deptName; // 申请部门名称
+    @ApiModelProperty("盘点类型key")
+    private String checkTypeKey;
+    @ApiModelProperty("盘点类型value")
+    private String checkTypeValue;
+    @ApiModelProperty("监盘人sid")
+    private String superviseSid; // 监盘人sid
+    @ApiModelProperty("监盘人姓名")
+    private String superviseName; // 监盘人姓名
+    @ApiModelProperty("盘点状态（盘点中1，盘点完成2）")
+    private Integer checkState; // 盘点状态（盘点中1，盘点完成2）
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/WmsOldCheckbillDetailsVo.java

@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailDetailsVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class WmsOldCheckbillDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("申请部门sid")
+    private String deptSid; // 申请部门sid
+    @ApiModelProperty("申请部门名称")
+    private String deptName; // 申请部门名称
+    @ApiModelProperty("盘点类型key")
+    private String checkTypeKey;
+    @ApiModelProperty("盘点类型value")
+    private String checkTypeValue;
+    @ApiModelProperty("监盘人sid")
+    private String superviseSid; // 监盘人sid
+    @ApiModelProperty("监盘人姓名")
+    private String superviseName; // 监盘人姓名
+    @ApiModelProperty("盘点状态（盘点中1，盘点完成2）")
+    private Integer checkState; // 盘点状态（盘点中1，盘点完成2）
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("盘库明细")
+    private List<WmsOldCheckbillDetailDetailsVo> wmsOldCheckbillDetailList;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/WmsOldCheckbillDto.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class WmsOldCheckbillDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("申请部门sid")
+    private String deptSid; // 申请部门sid
+    @ApiModelProperty("申请部门名称")
+    private String deptName; // 申请部门名称
+    @ApiModelProperty("盘点类型key")
+    private String checkTypeKey;
+    @ApiModelProperty("盘点类型value")
+    private String checkTypeValue;
+    @ApiModelProperty("监盘人sid")
+    private String superviseSid; // 监盘人sid
+    @ApiModelProperty("监盘人姓名")
+    private String superviseName; // 监盘人姓名
+    @ApiModelProperty("盘点状态（盘点中1，盘点完成2）")
+    private Integer checkState; // 盘点状态（盘点中1，盘点完成2）
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("盘库明细")
+    private List<WmsOldCheckbillDetailDto> wmsOldCheckbillDetailList;
+
+    /*
+    * 月度抽盘
+    * */
+    @ApiModelProperty("库位sid")
+    private List<String> rackSids = new ArrayList<>();
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/WmsOldCheckbillMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbill;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailGoodPageListVo;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailRackGoodPageListVo;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailRackPageListVo;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillPageVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface WmsOldCheckbillMapper extends BaseMapper<WmsOldCheckbill> {
+
+	IPage<WmsOldCheckbillVo> selectPageVo(IPage<WmsOldCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsOldCheckbill> qw);
+
+	IPage<WmsOldCheckbillDetailRackPageListVo> detailRackPageList(IPage<WmsOldCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsOldCheckbill> qw);
+
+	IPage<WmsOldCheckbillDetailGoodPageListVo> detailGoodPageList(IPage<WmsOldCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsOldCheckbill> qw);
+
+	IPage<WmsOldCheckbillDetailRackGoodPageListVo> detailRackGoodPageList(IPage<WmsOldCheckbill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsOldCheckbill> qw);
+	
+    String selectNum(String billNo);
+
+	int selectBySid(String join);
+
+	@Update("update wms_old_checkbill set state = 0,checkState = 2 where sid = #{sid}")
+	void createReport(String sid);
+
+	String checkState(String deptSid);
+
+    int updateFlowFiled(Map<String, Object> beanToMap);
+
+    IPage<WmsOldCheckbillPageVo> appDetailRackPageList(IPage<WmsOldCheckbill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsOldCheckbill> qw);
+
+    List<InventoryBillVo> selPyByDeptSid(String deptSid);
+
+    List<InventoryBillVo> selPkByDeptSid(String deptSid);
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/WmsOldCheckbillMapper.xml

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.inventory.wmsoldcheckbill.WmsOldCheckbillMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsoldcheckbill.WmsOldCheckbillVo">
+		SELECT
+		wic.sid,
+		wic.state,
+		wic.`remarks`,
+		wic.`nodeState`,
+		wic.`deptName`,
+		wic.`billNo`,
+		wic.`createTime`,
+		wic.`createByName`,
+		wic.`superviseName`,
+		IF(
+		wic.`checkState` = '1',
+		'盘点中',
+		'盘点完成'
+		) AS checkState,
+		wic.`procDefId`,
+		wic.`procInstId`,
+		SUM(wicd.bookCount) AS bookCount,
+		SUM(wicd.bookCount * cost) AS bookAmount,
+		SUM(wicd.realCount) AS realCount,
+		SUM(wicd.realCount * cost) AS realAmount,
+		SUM(wicd.bookCount) - SUM(wicd.realCount) AS notCount,
+		(
+		SUM(wicd.bookCount * cost) - SUM(wicd.realCount * cost)
+		) AS notAmount,
+		SUM(wicd.profitCount) AS profitCount,
+		SUM(wicd.profitCount * cost) AS profitAmount,
+		SUM(wicd.loseCount) AS loseCount,
+		SUM(wicd.loseCount * cost) AS loseAmount,
+		SUM(wicd.lossCount) AS lossCount,
+		SUM(wicd.lossCount * cost) AS lossAmount
+		FROM
+		wms_old_checkbill wic
+		LEFT JOIN wms_old_checkbill_detail wicd
+		ON wic.sid = wicd.`billSid`
+		LEFT JOIN anrui_portal.sys_organization AS s
+		ON wic.deptSid = s.sid
+		<where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="detailRackPageList"
+			resultType="com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailRackPageListVo">
+		SELECT
+				billSid,
+				warehouseName,
+				warehouseArea,
+				warehouseRackSid,
+				warehouseRackName,
+				SUM(bookCount) AS bookCount,
+				SUM(bookCount * cost) AS bookAmount,
+				SUM(realCount) AS realCount,
+				SUM(realCount * cost) AS realAmount,
+				SUM(bookCount) - SUM(realCount) AS notCount,
+				(SUM(bookCount * cost) - SUM(realCount * cost)) AS notAmount,
+				SUM(profitCount) AS profitCount,
+				SUM(profitCount * cost) AS profitAmount,
+				SUM(loseCount) AS loseCount,
+				SUM(loseCount * cost) AS loseAmount,
+				SUM(lossCount) AS lossCount,
+				SUM(lossCount * cost) AS lossAmount
+		FROM
+				wms_old_checkbill_detail
+		<where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="detailGoodPageList"
+			resultType="com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailGoodPageListVo">
+		SELECT
+				goodsID,
+				goodsSkuTitle,
+				goodsSkuCode,
+				warehouseName,
+				warehouseArea,
+				warehouseRackName,
+				unit,
+				cost,
+				bookCount,
+				bookCount * cost AS bookAmount,
+				realCount,
+				realCount * cost AS realAmount,
+				CASE
+						state
+						WHEN 2
+								THEN '正常'
+						WHEN 3
+								THEN '盘盈'
+						WHEN 4
+								THEN '盘亏'
+						END AS state,
+				CASE
+						state
+						WHEN 2
+								THEN 0
+						WHEN 3
+								THEN profitCount
+						WHEN 4
+								THEN loseCount
+						END AS profitAndLoseCount,
+				CASE
+						state
+						WHEN 2
+								THEN 0
+						WHEN 3
+								THEN profitCount * cost
+						WHEN 4
+								THEN loseCount * cost
+						END AS profitAndLoseAmount,
+				lossCount,
+				lossCount * cost AS lossAmount,
+				remarks
+		FROM
+				wms_old_checkbill_detail
+		<where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="detailRackGoodPageList"
+			resultType="com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailRackGoodPageListVo">
+		SELECT
+		sid,
+		goodsID,
+		goodsSkuTitle,
+		goodsSkuCode,
+		warehouseName,
+		warehouseArea,
+		warehouseRackName,
+		unit,
+		cost,
+		bookCount,
+		bookCount * cost AS bookAmount,
+		realCount,
+		realCount * cost AS realAmount,
+		CASE
+		state
+		WHEN 2
+		THEN '正常'
+		WHEN 3
+		THEN '盘盈'
+		WHEN 4
+		THEN '盘亏'
+		END AS state,
+		CASE
+		state
+		WHEN 2
+		THEN 0
+		WHEN 3
+		THEN profitCount
+		WHEN 4
+		THEN loseCount
+		END AS profitAndLoseCount,
+		CASE
+		state
+		WHEN 2
+		THEN 0
+		WHEN 3
+		THEN profitCount * cost
+		WHEN 4
+		THEN loseCount * cost
+		END AS profitAndLoseAmount,
+		lossCount,
+		lossCount * cost AS lossAmount,
+		remarks
+		FROM
+		wms_old_checkbill_detail
+		<where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="selectNum" resultType="java.lang.String">
+		select RIGHT (billNo, 4)
+		from wms_old_checkbill
+		where billNo LIKE concat(#{billNo}, '%')
+		order by billNo desc
+				limit 1
+    </select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM wms_old_checkbill
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
+
+	<select id="checkState" resultType="java.lang.String">
+		SELECT
+				checkState
+		FROM
+				wms_old_checkbill
+		WHERE deptSid = #{deptSid}
+		ORDER BY createTime DESC
+				LIMIT 1
+	</select>
+
+	<update id="updateFlowFiled">
+		UPDATE wms_old_checkbill
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstId=#{procInsId}
+		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
+		WHERE sid=#{sid}
+    </update>
+
+	<select id="appDetailRackPageList"
+            resultType="com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillPageVo">
+		SELECT
+		c.sid,
+		d.warehouseRackSid AS houseSid,
+		CONCAT(
+		d.warehouseName,
+		'-',
+		d.warehouseArea,
+		'-',
+		d.warehouseRackName
+		) AS title,
+		SUM(bookCount) - SUM(realCount) AS surplusNumber,
+		SUM(bookCount) AS totalNumber,
+		SUM(loseCount) AS lossNumber,
+		SUM(lossCount) AS damageNumber,
+		SUM(profitCount) AS profitNumber,
+		SUM(realCount) AS actualNumber
+		FROM
+		wms_old_checkbill_detail d
+		LEFT JOIN wms_old_checkbill c
+		ON d.billSid = c.sid
+		<where> ${ew.sqlSegment} </where>
+    </select>
+
+	<select id="selPyByDeptSid" resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo">
+		SELECT
+				wc.sid AS billSid,
+				wc.billNo
+		FROM
+				wms_old_checkbill wc
+						JOIN
+						(SELECT
+								 SUM(wd.profitCount) AS total,
+								 wd.billSid AS billSid
+						 FROM
+								 wms_old_checkbill_detail wd
+						 GROUP BY wd.billSid) AS total_goods
+		WHERE wc.deptSid = #{deptSid}
+		  AND total_goods.billSid = wc.sid
+		  AND total_goods.total > 0
+		  AND wc.checkState = 2
+	</select>
+
+	<select id="selPkByDeptSid" resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo">
+		SELECT
+				wc.sid AS billSid,
+				wc.billNo
+		FROM
+				wms_old_checkbill wc
+						JOIN
+						(SELECT
+								 SUM(wd.loseCount) AS total,
+								 wd.billSid AS billSid
+						 FROM
+								 wms_old_checkbill_detail wd
+						 GROUP BY wd.billSid) AS total_goods
+		WHERE wc.deptSid = #{deptSid}
+		  AND total_goods.billSid = wc.sid
+		  AND total_goods.total > 0
+		  AND wc.checkState = 2
+	</select>
+</mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/WmsOldCheckbillQuery.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbill;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillQuery.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbillQuery <br/>
+ * Description: 库存盘点 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillQuery implements Query {
+
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("生成开始日期")
+    private String createStartTime;
+    @ApiModelProperty("生成结束日期")
+    private String createEndTime;
+    @ApiModelProperty("盘点状态（盘点中1，盘点完成2）")
+    private String checkState;
+    @ApiModelProperty("盘点人姓名")
+    private String createByName;
+    @ApiModelProperty("监盘人姓名")
+    private String superviseName;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
+    private String menuSid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/WmsOldCheckbillService.java

@@ -0,0 +1,898 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbill;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.common.base.config.component.DocPdfComponent;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.WordConvertUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendix;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixService;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo;
+import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService;
+import com.yxt.wms.biz.inventory.wmsoldcheckbill.flowable.*;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.*;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillGoodsDto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillGoodsPyDto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillPageQuery;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillPageVo;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.HandleBean;
+import com.yxt.wms.biz.inventory.wmsoldcheckbillreport.*;
+import com.yxt.wms.feign.flowable.flow.BusinessVariables;
+import com.yxt.wms.feign.flowable.flow.FlowableFeign;
+import com.yxt.wms.feign.flowable.flow.ProcDefEnum;
+import com.yxt.wms.feign.flowable.flow.UpdateFlowFieldVo;
+import com.yxt.wms.feign.flowable.flow2.FlowDelegateQuery;
+import com.yxt.wms.feign.flowable.flow2.FlowFeign;
+import com.yxt.wms.feign.flowable.flowtask.FlowTaskFeign;
+import com.yxt.wms.feign.flowable.flowtask.FlowTaskVo;
+import com.yxt.wms.feign.flowable.flowtask.LatestTaskVo;
+import com.yxt.wms.feign.message.MessageFeign;
+import com.yxt.wms.feign.message.MessageFlowVo;
+import com.yxt.wms.feign.message.MessageFlowableQuery;
+import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.Rule;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+@Service
+public class WmsOldCheckbillService extends MybatisBaseService<WmsOldCheckbillMapper, WmsOldCheckbill> {
+
+    @Autowired
+    private WmsOldCheckbillDetailService wmsOldCheckbillDetailService;
+    @Autowired
+    private WmsOldCheckbillReportService wmsOldCheckbillReportService;
+    @Autowired
+    private WmsAppendixService wmsAppendixService;
+    @Autowired
+    private WmsInventoryService wmsInventoryService;
+    @Autowired
+    private WmsInventoryRecordService wmsInventoryRecordService;
+    @Autowired
+    private WmsWarehouseRackService wmsWarehouseRackService;
+    @Autowired
+    private WmsWarehouseAreaService wmsWarehouseAreaService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private FlowFeign flowFeign;
+    @Autowired
+    private MessageFeign messageFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+    public PagerVo<WmsOldCheckbillVo> listPageVo(PagerQuery<WmsOldCheckbillQuery> pq) {
+        WmsOldCheckbillQuery query = pq.getParams();
+        QueryWrapper<WmsOldCheckbill> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("wic.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<WmsOldCheckbillVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<WmsOldCheckbillVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getDeptName())) {
+            qw.like("wic.deptName", query.getDeptName());
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("wic.billNo", query.getBillNo());
+        }
+        if (StringUtils.isNotBlank(query.getCheckState())) {
+            qw.eq("wic.checkState", query.getCheckState());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("wic.createByName", query.getCreateByName());
+        }
+        if (StringUtils.isNotBlank(query.getSuperviseName())) {
+            qw.like("wic.superviseName", query.getSuperviseName());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (wic.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndTime), "date_format (wic.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.groupBy("wic.sid");
+        IPage<WmsOldCheckbill> page = PagerUtil.queryToPage(pq);
+        IPage<WmsOldCheckbillVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<WmsOldCheckbillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<WmsOldCheckbillDetailRackPageListVo> detailRackPageList(PagerQuery<WmsOldCheckbillDetailRackPageListQuery> pq) {
+        WmsOldCheckbillDetailRackPageListQuery query = pq.getParams();
+        QueryWrapper<WmsOldCheckbill> qw = new QueryWrapper<>();
+        qw.eq("billSid", query.getBillSid());
+        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+            qw.eq("warehouseSid", query.getWarehouseSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseAreaSid())) {
+            qw.eq("warehouseAreaSid", query.getWarehouseAreaSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseRackSid())) {
+            qw.eq("warehouseRackSid", query.getWarehouseRackSid());
+        }
+        qw.groupBy("warehouseRackSid");
+        IPage<WmsOldCheckbill> page = PagerUtil.queryToPage(pq);
+        IPage<WmsOldCheckbillDetailRackPageListVo> pagging = baseMapper.detailRackPageList(page, qw);
+        PagerVo<WmsOldCheckbillDetailRackPageListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<WmsOldCheckbillDetailGoodPageListVo> detailGoodPageList(PagerQuery<WmsOldCheckbillDetailGoodPageListQuery> pq) {
+        WmsOldCheckbillDetailGoodPageListQuery query = pq.getParams();
+        QueryWrapper<WmsOldCheckbill> qw = new QueryWrapper<>();
+        qw.eq("billSid", query.getBillSid());
+        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+            qw.eq("warehouseSid", query.getWarehouseSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseAreaSid())) {
+            qw.eq("warehouseAreaSid", query.getWarehouseAreaSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseRackSid())) {
+            qw.eq("warehouseRackSid", query.getWarehouseRackSid());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsID())) {
+            qw.like("goodsID", query.getGoodsID());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) {
+            qw.like("goodsSkuTitle", query.getGoodsSkuTitle());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.like("goodsSkuCode", query.getGoodsSkuCode());
+        }
+        IPage<WmsOldCheckbill> page = PagerUtil.queryToPage(pq);
+        IPage<WmsOldCheckbillDetailGoodPageListVo> pagging = baseMapper.detailGoodPageList(page, qw);
+        PagerVo<WmsOldCheckbillDetailGoodPageListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<WmsOldCheckbillDetailRackGoodPageListVo> detailRackGoodPageList(PagerQuery<WmsOldCheckbillDetailRackGoodPageListQuery> pq) {
+        WmsOldCheckbillDetailRackGoodPageListQuery query = pq.getParams();
+        QueryWrapper<WmsOldCheckbill> qw = new QueryWrapper<>();
+        qw.eq("billSid", query.getBillSid());
+        qw.eq("warehouseRackSid", query.getWarehouseRackSid());
+        if (StringUtils.isNotBlank(query.getGoodsID())) {
+            qw.like("goodsID", query.getGoodsID());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) {
+            qw.like("goodsSkuTitle", query.getGoodsSkuTitle());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.like("goodsSkuCode", query.getGoodsSkuCode());
+        }
+        //移动端查询条件
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("goodsID", query.getName()).or().like("goodsSkuTitle", query.getName()).or().like("goodsSkuCode", query.getName()));
+        }
+        IPage<WmsOldCheckbill> page = PagerUtil.queryToPage(pq);
+        IPage<WmsOldCheckbillDetailRackGoodPageListVo> pagging = baseMapper.detailRackGoodPageList(page, qw);
+        for (WmsOldCheckbillDetailRackGoodPageListVo record : pagging.getRecords()) {
+            List<WmsAppendix> wmsAppendices = wmsAppendixService.fetchByLinkSid(record.getSid());
+            List<WmsOldCheckbillDetailFile> wmsOldCheckbillDetailFiles = new ArrayList<>();
+            for (WmsAppendix wmsAppendix : wmsAppendices) {
+                WmsOldCheckbillDetailFile wmsOldCheckbillDetailFile = new WmsOldCheckbillDetailFile();
+                String url = fileUploadComponent.getUrlPrefix() + wmsAppendix.getFilePath();
+                wmsOldCheckbillDetailFile.setUrl(url);
+                wmsOldCheckbillDetailFiles.add(wmsOldCheckbillDetailFile);
+            }
+            record.setFileList(wmsOldCheckbillDetailFiles);
+        }
+        PagerVo<WmsOldCheckbillDetailRackGoodPageListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<String> saveOrUpdateDto(WmsOldCheckbillDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String checkState = baseMapper.checkState(dto.getDeptSid());
+        if (!"2".equals(checkState) && StringUtils.isNotBlank(checkState)) {
+            return rb.setMsg("存在盘点中数据，无法生成新的盘点单");
+        }
+        SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(dto.getDeptSid()).getData();
+        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
+        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+        dto.setCreateOrgSid(createOrgSid);
+        dto.setCreateOrgName(organizationVo.getName());
+        //生成单据编号
+        String billNo = "";
+        String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+        billNo = "JJPD" + sysOrganizationVo.getOrgCode() + date;
+        String i = baseMapper.selectNum(billNo);
+        if (StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(billNo, 0);
+        }
+        dto.setBillNo(billNo);
+        List<WmsInventory> wmsInventories = null;
+        if ("1".equals(dto.getCheckTypeKey())) {
+            //查询本部门指定库位下，库存数量大0并且旧件的库存
+            wmsInventories = wmsInventoryService.selJJByDeptSidAndRackSid(dto.getDeptSid(), dto.getRackSids());
+        } else if ("2".equals(dto.getCheckTypeKey())) {
+            //查询本部门下，库存数量大0并且是旧件的库存
+            wmsInventories = wmsInventoryService.selJJByDeptSid(dto.getDeptSid());
+        }
+        if (wmsInventories.size() == 0) {
+            return rb.setMsg("该库位下没有商品库存信息");
+        }
+        String sid = this.insertByDto(dto);
+        for (WmsInventory wmsInventory : wmsInventories) {
+            WmsOldCheckbillDetailDto wmsOldCheckbillDetailDto = new WmsOldCheckbillDetailDto();
+            wmsOldCheckbillDetailDto.setBillSid(sid);
+            wmsOldCheckbillDetailDto.setGoodsID(wmsInventory.getGoodsID());
+            wmsOldCheckbillDetailDto.setGoodsSpuSid(wmsInventory.getGoodsSpuSid());
+            wmsOldCheckbillDetailDto.setGoodsSpuName(wmsInventory.getGoodsSpuName());
+            wmsOldCheckbillDetailDto.setGoodsSkuSid(wmsInventory.getGoodsSkuSid());
+            wmsOldCheckbillDetailDto.setGoodsSkuTitle(wmsInventory.getGoodsSkuTitle());
+            wmsOldCheckbillDetailDto.setGoodsSkuCode(wmsInventory.getGoodsSkuCode());
+            wmsOldCheckbillDetailDto.setGoodsSkuOwnSpec(wmsInventory.getGoodsSkuOwnSpec());
+            wmsOldCheckbillDetailDto.setManufacturerSid(wmsInventory.getManufacturerSid());
+            wmsOldCheckbillDetailDto.setManufacturerName(wmsInventory.getManufacturerName());
+            wmsOldCheckbillDetailDto.setCost(wmsInventory.getCost());
+            wmsOldCheckbillDetailDto.setUnit(wmsInventory.getUnit());
+            wmsOldCheckbillDetailDto.setWarehouseSid(wmsInventory.getWarehouseSid());
+            wmsOldCheckbillDetailDto.setWarehouseName(wmsInventory.getWarehouseName());
+            WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsInventory.getWarehouseRackSid());
+            WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid());
+            wmsOldCheckbillDetailDto.setWarehouseAreaSid(wmsWarehouseArea.getSid());
+            wmsOldCheckbillDetailDto.setWarehouseArea(wmsWarehouseArea.getAreaName());
+            wmsOldCheckbillDetailDto.setWarehouseRackSid(wmsInventory.getWarehouseRackSid());
+            wmsOldCheckbillDetailDto.setWarehouseRackName(wmsWarehouseRack.getRackName());
+            wmsOldCheckbillDetailDto.setBookCount(wmsInventory.getCount());
+            wmsOldCheckbillDetailService.insertByDto(wmsOldCheckbillDetailDto);
+        }
+        return rb.success().setData(sid);
+    }
+
+    public String insertByDto(WmsOldCheckbillDto dto) {
+        WmsOldCheckbill entity = new WmsOldCheckbill();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setNodeState("待提交");
+        baseMapper.insert(entity);
+        return entity.getSid();
+    }
+
+    public WmsOldCheckbillDetailsVo fetchDetailsVoBySid(String sid) {
+        WmsOldCheckbill entity = fetchBySid(sid);
+        WmsOldCheckbillDetailsVo vo = new WmsOldCheckbillDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        List<WmsOldCheckbillDetailDetailsVo> wmsOldCheckbillDetailDetailsVos = wmsOldCheckbillDetailService.selByMainSid(sid);
+        vo.setWmsOldCheckbillDetailList(wmsOldCheckbillDetailDetailsVos);
+        return vo;
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
+        delBySids(sids);
+        for (String sid : sids) {
+            wmsOldCheckbillDetailService.delByMainSid(sid);
+            wmsOldCheckbillReportService.delByMainSid(sid);
+            wmsAppendixService.delByLinkSid(sid);
+        }
+        return rb.success();
+    }
+
+    public void createReport(String sid) {
+        baseMapper.createReport(sid);
+        WmsOldCheckbillReportDto wmsOldCheckbillReportDto = new WmsOldCheckbillReportDto();
+        wmsOldCheckbillReportDto.setBillSid(sid);
+        wmsOldCheckbillReportService.insertByDto(wmsOldCheckbillReportDto);
+    }
+
+    public WmsOldCheckbillReportDetailsVo viewReport(String sid) {
+        WmsOldCheckbillReportDetailsVo wmsOldCheckbillReportDetailsVo = new WmsOldCheckbillReportDetailsVo();
+        //表头
+        WmsOldCheckbill wmsOldCheckbill = fetchBySid(sid);
+        wmsOldCheckbillReportDetailsVo.setSid(sid);
+        wmsOldCheckbillReportDetailsVo.setCreateByName(wmsOldCheckbill.getCreateByName());
+        wmsOldCheckbillReportDetailsVo.setCreateName(wmsOldCheckbill.getCreateByName());
+        wmsOldCheckbillReportDetailsVo.setDeptName(wmsOldCheckbill.getDeptName());
+        wmsOldCheckbillReportDetailsVo.setCreateTime(wmsOldCheckbill.getCreateTime());
+        wmsOldCheckbillReportDetailsVo.setFinances(wmsOldCheckbill.getSuperviseName());
+        //盘点报告备注
+        WmsOldCheckbillReport wmsOldCheckbillReport = wmsOldCheckbillReportService.selByBillSid(sid);
+        wmsOldCheckbillReportDetailsVo.setRemarks(wmsOldCheckbillReport.getRemarks());
+        //盘点报告PDF路径
+        wmsOldCheckbillReportDetailsVo.setPdfUrl(wmsOldCheckbillReport.getPdfUrl());
+        //总体盘点情况
+        List<WmsOldCheckbillReportSumVo> total = wmsOldCheckbillDetailService.reportSum(sid, "total");
+        for (WmsOldCheckbillReportSumVo totalSum : total) {
+            wmsOldCheckbillReportDetailsVo.setYpNum(totalSum.getYpNum());
+            wmsOldCheckbillReportDetailsVo.setYpMoney(totalSum.getYpMoney());
+            wmsOldCheckbillReportDetailsVo.setPyNum(totalSum.getPyNum());
+            wmsOldCheckbillReportDetailsVo.setPyMoney(totalSum.getPyMoney());
+            wmsOldCheckbillReportDetailsVo.setSpNum(totalSum.getSpNum());
+            wmsOldCheckbillReportDetailsVo.setSpMoney(totalSum.getSpMoney());
+            wmsOldCheckbillReportDetailsVo.setPyNum(totalSum.getPyNum());
+            wmsOldCheckbillReportDetailsVo.setPyMoney(totalSum.getPyMoney());
+            wmsOldCheckbillReportDetailsVo.setPkNum(totalSum.getPkNum());
+            wmsOldCheckbillReportDetailsVo.setPkMoney(totalSum.getPkMoney());
+            wmsOldCheckbillReportDetailsVo.setPsNum(totalSum.getPsNum());
+            wmsOldCheckbillReportDetailsVo.setPsMoney(totalSum.getPsMoney());
+            wmsOldCheckbillReportDetailsVo.setVirtualNum(totalSum.getVirtualNum());
+            wmsOldCheckbillReportDetailsVo.setUnInStorageNum(totalSum.getUnInStorageNum());
+        }
+        //仓库盘点情况
+        List<WmsOldCheckbillReportSumVo> ware = wmsOldCheckbillDetailService.reportSum(sid, "ware");
+        wmsOldCheckbillReportDetailsVo.setWarehouseStocktakList(ware);
+        //库区盘点情况
+        List<WmsOldCheckbillReportSumVo> area = wmsOldCheckbillDetailService.reportSum(sid, "area");
+        wmsOldCheckbillReportDetailsVo.setArehouseAreaeStocktakList(area);
+        return wmsOldCheckbillReportDetailsVo;
+    }
+
+    public String createPdf(String sid) {
+        WmsOldCheckbillReportDetailsVo wmsOldCheckbillReportDetailsVo = viewReport(sid);
+        Map<String, Object> map = new HashMap<>();
+        //发起人
+        map.put("createName", wmsOldCheckbillReportDetailsVo.getCreateByName());
+        //发起部门
+        map.put("deptName", wmsOldCheckbillReportDetailsVo.getDeptName());
+        //发起日期
+        map.put("createTime", DateUtil.formatDate(wmsOldCheckbillReportDetailsVo.getCreateTime()));
+        //盘点人
+        map.put("pdrName", wmsOldCheckbillReportDetailsVo.getCreateByName());
+        //监盘人
+        map.put("jprName", wmsOldCheckbillReportDetailsVo.getFinances());
+        //备注
+        map.put("remarks", wmsOldCheckbillReportDetailsVo.getRemarks());
+        //总体应盘数量
+        map.put("ypsl", wmsOldCheckbillReportDetailsVo.getYpNum());
+        //总体应盘金额
+        map.put("ypje", wmsOldCheckbillReportDetailsVo.getYpMoney());
+        //总体实盘数量
+        map.put("spsl", wmsOldCheckbillReportDetailsVo.getSpNum());
+        //总体实盘金额
+        map.put("spje", wmsOldCheckbillReportDetailsVo.getSpMoney());
+        //总体盘盈数量
+        map.put("pysl", wmsOldCheckbillReportDetailsVo.getPyNum());
+        //总体盘盈金额
+        map.put("pyje", wmsOldCheckbillReportDetailsVo.getPyMoney());
+        //总体盘亏数量
+        map.put("pksl", wmsOldCheckbillReportDetailsVo.getPkNum());
+        //总体盘亏金额
+        map.put("pkje", wmsOldCheckbillReportDetailsVo.getPkMoney());
+        //总体盘损数量
+        map.put("pssl", wmsOldCheckbillReportDetailsVo.getPsNum());
+        //总体盘损金额
+        map.put("psje", wmsOldCheckbillReportDetailsVo.getPsMoney());
+        //总体虚拟件数量
+        map.put("xnsl", wmsOldCheckbillReportDetailsVo.getVirtualNum());
+        //总体未入库数量
+        map.put("wrksl", wmsOldCheckbillReportDetailsVo.getUnInStorageNum());
+        List<WmsOldCheckbillReportSumVo> ware = wmsOldCheckbillReportDetailsVo.getWarehouseStocktakList();
+        for (int i = 0; i < ware.size(); i++) {
+            WmsOldCheckbillReportSumVo wmsOldCheckbillReportSumVo = ware.get(i);
+            wmsOldCheckbillReportSumVo.setId(i + 1);
+        }
+        map.put("ware", ware);
+        List<WmsOldCheckbillReportSumVo> area = wmsOldCheckbillReportDetailsVo.getArehouseAreaeStocktakList();
+        for (int i = 0; i < area.size(); i++) {
+            WmsOldCheckbillReportSumVo wmsOldCheckbillReportSumVo = area.get(i);
+            wmsOldCheckbillReportSumVo.setId(i + 1);
+        }
+        map.put("area", area);
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "jjpdbg" + ".ftl");
+        //生成word文件名
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String typeName = dateStr + seconds + ".doc";
+        File file = new File(targetPath + "pdbg" + seconds + ".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
+        //新生成的word路径
+        String wordPath = targetPath + typeName;
+        //生成出门证文件名
+        String pdfName = "旧件盘点报告_" + dateStr + seconds + ".pdf";
+        WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+        wmsOldCheckbillReportService.updatePdf(sid,pdfName);
+        return "/template/" + pdfName;
+    }
+
+    public ResultBean submitApply(SubmitOldCheckDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsOldCheckbill wmsOldCheckbill = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, wmsOldCheckbill);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        String businessSid = saveOrUpdateDto(dto).getData();
+        wmsOldCheckbill = fetchBySid(businessSid);
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        //用户的部门全路径sid
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsOldCheckbill.getDeptSid()).getData();
+        if (sysOrganization != null) {
+            bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+        }
+        bv.setBusinessSid(businessSid);
+        bv.setUserSid(dto.getCreateBySid());
+        bv.setFormVariables(variables);
+        if (r == 1) {
+            //ToDo:流程定义id
+            bv.setModelId(ProcDefEnum.WMSINVENCHECKREPORT.getProDefId());
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
+            if (!voResultBean.getSuccess()) {
+                return rb.setMsg(voResultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            wmsOldCheckbill = fetchBySid(businessSid);
+            //==================================添加线程
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                WmsOldCheckbill finalWmsOldCheckbill = wmsOldCheckbill;
+                Future future1 = pool.submit(() -> {
+                    //极光推送
+                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                    MessageFlowVo messageFlowVo = new MessageFlowVo();
+                    BeanUtil.copyProperties(ufVo, messageFlowVo);
+                    messageFlowableQuery.setUfVo(messageFlowVo);
+                    messageFlowableQuery.setAppMap(appMap);
+                    messageFlowableQuery.setBusinessSid(businessSid);
+                    messageFlowableQuery.setModuleName("盘点报告审批");
+                    messageFlowableQuery.setMsgContent(finalWmsOldCheckbill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                    messageFlowableQuery.setMsgTitle("盘点报告审批");
+                    ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //==================================添加线程
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(wmsOldCheckbill.getTaskId());
+            bv.setTaskDefKey(wmsOldCheckbill.getNodeId());
+            bv.setComment("重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    private int updateFlowFiled(Map<String, Object> beanToMap) {
+        return baseMapper.updateFlowFiled(beanToMap);
+    }
+
+
+    private int submitBusinessData(SubmitOldCheckDto dto, WmsOldCheckbill wmsOldCheckbill) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (wmsOldCheckbill != null) {
+                String businessTaskId = wmsOldCheckbill.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+        }
+        return r;
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = bv.getBusinessSid();
+        WmsOldCheckbill wmsOldCheckbill = fetchBySid(businessSid);
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        bv.setFormVariables(variables);
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsOldCheckbill.getDeptSid()).getData();
+        if (sysOrganization != null) {
+            bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+        }
+        bv.setModelId(wmsOldCheckbill.getProcDefId());
+        if (bv.getTaskId().equals(wmsOldCheckbill.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = resultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+
+            } else {
+                //极光推送
+                wmsOldCheckbill = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                messageFlowVo.setProcDefId(wmsOldCheckbill.getProcDefId());
+                messageFlowVo.setProcInsId(wmsOldCheckbill.getProcInstId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("盘点报告审批");
+                messageFlowableQuery.setMsgContent(wmsOldCheckbill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("盘点报告审批");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    public ResultBean<List<OldCheckNodeVo>> getPreviousNodesForReject(OldCheckNodeQuery query) {
+        ResultBean<List<OldCheckNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        WmsOldCheckbill wmsOldCheckbill = fetchBySid(query.getBusinessSid());
+        bv.setModelId(wmsOldCheckbill.getProcDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+        List<OldCheckNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OldCheckNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<OldCheckNodeVo>> getNextNodesForSubmit(OldCheckNodeQuery query) {
+        ResultBean<List<OldCheckNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        WmsOldCheckbill wmsOldCheckbill = fetchBySid(query.getBusinessSid());
+        bv.setModelId(wmsOldCheckbill.getProcDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+        List<OldCheckNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OldCheckNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean taskReject(OldCheckTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = query.getBusinessSid();
+        WmsOldCheckbill wmsOldCheckbill = fetchBySid(businessSid);
+        if (wmsOldCheckbill == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = wmsOldCheckbill.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                if (StringUtils.isBlank(query.getComment())) {
+                    return rb.setMsg("请填写意见");
+                }
+                if (StringUtils.isBlank(query.getUserSid())) {
+                    return rb.setMsg("参数错误：userSid");
+                }
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                Map<String, Object> variables = new HashMap<>();
+                Map<String, Object> appMap = new HashMap<>();
+                appMap.put("sid", businessSid);
+                variables.put("app", appMap);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                UpdateFlowFieldVo ufVo = resultBean.getData();
+                Map<String, Object> map = BeanUtil.beanToMap(ufVo);
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                //极光推送
+                wmsOldCheckbill = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                String procId = wmsOldCheckbill.getProcInstId();
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(wmsOldCheckbill.getProcDefId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("盘点报告审批");
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextName = listResultBean.getData().get(0).getName_();
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                if ("发起申请".equals(nextName)) {
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                } else {
+                    messageFlowableQuery.setMsgContent(wmsOldCheckbill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                }
+
+                messageFlowableQuery.setMsgTitle("盘点报告审批");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean revokeProcess(OldCheckTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        WmsOldCheckbill wmsOldCheckbill = fetchBySid(query.getBusinessSid());
+        String businessTaskId = wmsOldCheckbill.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    public ResultBean breakProcess(OldCheckTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        if (StringUtils.isBlank(query.getComment())) {
+            return rb.setMsg("请填写意见");
+        }
+        WmsOldCheckbill wmsOldCheckbill = fetchBySid(query.getBusinessSid());
+        String businessTaskId = wmsOldCheckbill.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (query.getUserSid().equals(wmsOldCheckbill.getCreateBySid())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                updateFlowFiled(map);
+                return rb.success().setData(resultBean.getData());
+            } else {
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                    updateFlowFiled(map);
+                    return rb.success().setData(resultBean.getData());
+                }
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean delegate(OldCheckDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.delegate(delegateQuery);
+        return rb.success();
+    }
+
+    public PagerVo<WmsOldCheckbillPageVo> appDetailRackPageList(PagerQuery<WmsOldCheckbillPageQuery> pq) {
+        WmsOldCheckbillPageQuery query = pq.getParams();
+        QueryWrapper<WmsOldCheckbill> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuSid())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("c.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<WmsOldCheckbillPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<WmsOldCheckbillPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        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.groupBy("d.warehouseRackSid");
+        IPage<WmsOldCheckbill> page = PagerUtil.queryToPage(pq);
+        IPage<WmsOldCheckbillPageVo> pagging = baseMapper.appDetailRackPageList(page, qw);
+        PagerVo<WmsOldCheckbillPageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveInventoryInfo(WmsOldCheckbillGoodsDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        wmsOldCheckbillDetailService.saveInventoryInfo(dto);
+        return rb.success();
+    }
+
+    public ResultBean<HandleBean> scan(String sid, String content, String houseSid) {
+        ResultBean rb = ResultBean.fireFail();
+        if (content.contains("#")) {
+            return rb.setMsg("请扫描商品码");
+        }
+        HandleBean handleBean = wmsOldCheckbillDetailService.scan(sid, content, houseSid);
+        if (handleBean == null) {
+            List<WmsInventory> wmsInventories = wmsInventoryService.getListByGoodsID(content).getData();
+            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 {
+                String billNo = wmsInventoryRecordService.selByGoodsID(content);
+                if (StringUtils.isBlank(billNo)) {
+                    return rb.setMsg("商品码不正确");
+                } else {
+                    return rb.setMsg("本商品已在" + billNo + "单据编号中出库。");
+                }
+            }
+        }
+        return rb.success().setData(handleBean);
+    }
+
+    public ResultBean saveInventoryInfo2(WmsOldCheckbillGoodsPyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        wmsOldCheckbillDetailService.saveInventoryInfo2(dto);
+        return rb.success();
+    }
+
+    public void saveReport(String billSid, String remarks) {
+        wmsOldCheckbillReportService.saveReport(billSid, remarks);
+    }
+
+    public List<InventoryBillVo> selPyByDeptSid(String deptSid) {
+        return baseMapper.selPyByDeptSid(deptSid);
+    }
+
+    public List<InventoryBillVo> selPkByDeptSid(String deptSid) {
+        return baseMapper.selPkByDeptSid(deptSid);
+    }
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/WmsOldCheckbillVo.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbill;
+
+
+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.Date;
+
+@Data
+public class WmsOldCheckbillVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("是否生成盘库报告")
+    private String state;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("生成日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("盘点人")
+    private String createByName;
+    @ApiModelProperty("监盘人姓名")
+    private String superviseName;
+    @ApiModelProperty("盘点状态（盘点中1，盘点完成2）")
+    private String checkState;
+
+    @ApiModelProperty("应盘数量")
+    private BigDecimal bookCount;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal bookAmount;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal realAmount;
+    @ApiModelProperty("未盘数量")
+    private BigDecimal notCount;
+    @ApiModelProperty("未盘金额")
+    private BigDecimal notAmount;
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal profitCount;
+    @ApiModelProperty("盘盈金额")
+    private BigDecimal profitAmount;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal loseCount;
+    @ApiModelProperty("盘亏金额")
+    private BigDecimal loseAmount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal lossAmount;
+
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/flowable/CompleteOldCheckDto.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class CompleteOldCheckDto {
+
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/flowable/OldCheckDelegateQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class OldCheckDelegateQuery {
+
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/flowable/OldCheckNodeQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class OldCheckNodeQuery {
+
+    @ApiModelProperty(value = "环节定义id")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/flowable/OldCheckNodeVo.java

@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class OldCheckNodeVo {
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/flowable/OldCheckTaskQuery.java

@@ -0,0 +1,43 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class OldCheckTaskQuery {
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbill/flowable/SubmitOldCheckDto.java

@@ -0,0 +1,19 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbill.flowable;
+
+import com.yxt.wms.biz.inventory.wmsoldcheckbill.WmsOldCheckbillDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class SubmitOldCheckDto extends WmsOldCheckbillDto {
+
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetail.java

@@ -0,0 +1,109 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetail.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetail <br/>
+ * Description: 库存盘点-明细. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("wms_old_checkbill_detail")
+public class WmsOldCheckbillDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("盘点单sid")
+    private String billSid; // 盘点单sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("商品spuSid")
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+    @ApiModelProperty("成本单价")
+    private BigDecimal cost; // 成本单价
+    @ApiModelProperty("单位")
+    private String unit; // 单位
+    @ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+    @ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid; // 库区sid
+    @ApiModelProperty("库区名称")
+    private String warehouseArea; // 库区名称
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+    @ApiModelProperty("库位名称")
+    private String warehouseRackName; // 库位名称
+    @ApiModelProperty("库存数量")
+    private BigDecimal bookCount; // 库存数量
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount; // 实盘数量
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal profitCount;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal loseCount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount; // 盘损数量
+    @ApiModelProperty("虚拟件数量")
+    private BigDecimal vrCount;
+    @ApiModelProperty("未入库数量")
+    private BigDecimal notInCount;
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailDetailsVo.java

@@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+
+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: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillDetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("盘点单sid")
+    private String billSid; // 盘点单sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("商品spuSid")
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+    @ApiModelProperty("成本单价")
+    private BigDecimal cost; // 成本单价
+    @ApiModelProperty("单位")
+    private String unit; // 单位
+    @ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+    @ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid; // 库区sid
+    @ApiModelProperty("库区名称")
+    private String warehouseArea; // 库区名称
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+    @ApiModelProperty("库位名称")
+    private String warehouseRackName; // 库位名称
+    @ApiModelProperty("库存数量")
+    private BigDecimal bookCount; // 库存数量
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount; // 实盘数量
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal profitCount;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal loseCount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount; // 盘损数量
+    @ApiModelProperty("虚拟件数量")
+    private BigDecimal vrCount;
+    @ApiModelProperty("未入库数量")
+    private BigDecimal notInCount;
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailDto.java

@@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailDto.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto <br/>
+ * Description: 库存盘点-明细 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillDetailDto implements Dto {
+
+    private String sid;
+
+    @ApiModelProperty("盘点单sid")
+    private String billSid; // 盘点单sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("商品spuSid")
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+    @ApiModelProperty("成本单价")
+    private BigDecimal cost; // 成本单价
+    @ApiModelProperty("单位")
+    private String unit; // 单位
+    @ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+    @ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid; // 库区sid
+    @ApiModelProperty("库区名称")
+    private String warehouseArea; // 库区名称
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+    @ApiModelProperty("库位名称")
+    private String warehouseRackName; // 库位名称
+    @ApiModelProperty("库存数量")
+    private BigDecimal bookCount; // 库存数量
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount; // 实盘数量
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal profitCount;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal loseCount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount; // 盘损数量
+    @ApiModelProperty("虚拟件数量")
+    private BigDecimal vrCount;
+    @ApiModelProperty("未入库数量")
+    private BigDecimal notInCount;
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailFile.java

@@ -0,0 +1,35 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class WmsOldCheckbillDetailFile implements Vo {
+
+    private String url;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailGoodPageListQuery.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillDetailGoodPageListQuery implements Query {
+
+    @ApiModelProperty("盘点sid")
+    private String billSid;
+    @ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid; // 库区sid
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+    @ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+    @ApiModelProperty("商品名称")
+    private String goodsSkuTitle; // 商品名称
+    @ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailGoodPageListVo.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+
+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.List;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillDetailGoodPageListVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+    @ApiModelProperty("商品名称")
+    private String goodsSkuTitle; // 商品名称
+    @ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
+    @ApiModelProperty("库位名称")
+    private String warehouseRackName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("成本单价")
+    private BigDecimal cost;
+    @ApiModelProperty("应盘数量")
+    private BigDecimal bookCount;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal bookAmount;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal realAmount;
+    @ApiModelProperty("状态")
+    private String state;
+    @ApiModelProperty("盈亏数量")
+    private BigDecimal profitAndLoseCount;
+    @ApiModelProperty("盈亏金额")
+    private BigDecimal profitAndLoseAmount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal lossAmount;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("附件")
+    private List<WmsOldCheckbillDetailFile> fileList = new ArrayList<>();
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailMapper.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.HandleBean;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillGoodsDto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbillreport.WmsOldCheckbillReportSumVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Mapper
+public interface WmsOldCheckbillDetailMapper extends BaseMapper<WmsOldCheckbillDetail> {
+
+	@Delete("delete from wms_old_checkbill_detail where billSid = #{dtoSid}")
+	void delByMainSid(String dtoSid);
+
+	List<WmsOldCheckbillDetailDetailsVo> selByMainSid(String billSid);
+
+    WmsOldCheckbillReportSumVo reportSumTotal(String billSid);
+
+	List<WmsOldCheckbillReportSumVo> reportSumWare(String billSid);
+
+	List<WmsOldCheckbillReportSumVo> reportSumArea(String billSid);
+
+    void saveInventoryInfoZC(@Param("dto") WmsOldCheckbillGoodsDto dto, @Param("num") String num);
+
+	void saveInventoryInfoPY(@Param("dto") WmsOldCheckbillGoodsDto dto, @Param("pyCount") BigDecimal pyCount);
+
+	void saveInventoryInfoPK(@Param("dto") WmsOldCheckbillGoodsDto dto, @Param("pkCount") BigDecimal pkCount);
+
+    HandleBean scan(@Param("sid") String sid, @Param("content") String content, @Param("houseSid") String houseSid);
+
+    List<WmsInventoryProfitinDetailDto> sourceBillBySid(String sid);
+
+	List<WmsInventoryProfitoutDetailDto> sourceBillPkBySid(String sid);
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailMapper.xml

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selByMainSid"
+            resultType="com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.WmsOldCheckbillDetailDetailsVo">
+		SELECT
+				wicd.*,
+			    wicd.goodsModel as carModel,
+				wicd.goodsSid as goodsSpuSid,
+			    wicd.goodsName as goodsSpuName,
+				wicd.goodsCode as goodsSkuCode
+		FROM
+				wms_old_checkbill_detail wicd
+						LEFT JOIN wms_inventory wi
+						ON wicd.inventorySid = wi.`sid`
+		WHERE billSid = #{billSid}
+	</select>
+
+	<select id="reportSumTotal"
+            resultType="com.yxt.wms.biz.inventory.wmsoldcheckbillreport.WmsOldCheckbillReportSumVo">
+		SELECT
+				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,
+				SUM(vrCount) AS virtualNum,
+				SUM(notInCount) AS unInStorageNum
+		FROM
+				wms_old_checkbill_detail AS wicd
+		WHERE wicd.billSid = #{billSid}
+		GROUP BY wicd.billSid
+	</select>
+
+	<select id="reportSumWare"
+			resultType="com.yxt.wms.biz.inventory.wmsoldcheckbillreport.WmsOldCheckbillReportSumVo">
+		SELECT
+				wicd.warehouseName,
+				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,
+				SUM(vrCount) AS virtualNum,
+				SUM(vrCount * cost) AS virtualMoney,
+				SUM(notInCount) AS unInStorageNum,
+				SUM(notInCount * cost) AS unInStorageMoney
+		FROM
+				wms_old_checkbill_detail AS wicd
+		WHERE wicd.billSid = #{billSid}
+		GROUP BY wicd.warehouseSid
+	</select>
+
+	<select id="reportSumArea"
+			resultType="com.yxt.wms.biz.inventory.wmsoldcheckbillreport.WmsOldCheckbillReportSumVo">
+		SELECT
+				CONCAT(
+						wicd.warehouseName,
+						'-',
+						wicd.warehouseArea
+						) 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,
+				SUM(vrCount) AS virtualNum,
+				SUM(vrCount * cost) AS virtualMoney,
+				SUM(notInCount) AS unInStorageNum,
+				SUM(notInCount * cost) AS unInStorageMoney
+		FROM
+				wms_old_checkbill_detail AS wicd
+		WHERE wicd.billSid = #{billSid}
+		GROUP BY wicd.warehouseAreaSid
+	</select>
+
+	<update id="saveInventoryInfoZC">
+		update wms_old_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = 0,remarks = #{dto.remarks},state = 2 where sid = #{dto.sid}
+	</update>
+
+	<update id="saveInventoryInfoPY">
+		update wms_old_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = #{pyCount},loseCount = 0,remarks = #{dto.remarks},state = 3 where sid = #{dto.sid}
+	</update>
+
+	<update id="saveInventoryInfoPK">
+		update wms_old_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = #{pkCount},remarks = #{dto.remarks},state = 4 where sid = #{dto.sid}
+	</update>
+
+	<select id="scan" resultType="com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.HandleBean">
+		SELECT
+				lossCount AS badNum,
+				goodsID,
+				goodsSkuTitle AS goodsName,
+				goodsSkuCode,
+				bookCount AS lockNum,
+				realCount AS num,
+				remarks,
+				sid,
+				unit
+		FROM
+				wms_old_checkbill_detail
+		WHERE billSid = #{sid}
+		  AND goodsID = #{content}
+		  AND warehouseRackSid = #{houseSid}
+	</select>
+
+	<select id="sourceBillBySid" resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto">
+		SELECT
+				goodsSpuSid AS goodsSid,
+				goodsSpuName,
+				goodsSkuSid,
+				goodsSkuTitle AS goodsName,
+				goodsSkuCode AS goodsCode,
+				goodsSkuOwnSpec AS goodsSpec,
+				manufacturerSid,
+				manufacturerName,
+				unit,
+				profitCount AS pyNum,
+				supplierSid,
+				supplierName,
+				profitCount AS inStorageNum
+		FROM
+				wms_old_checkbill_detail
+		WHERE billSid = #{sid}
+		  AND profitCount > 0
+	</select>
+
+	<select id="sourceBillPkBySid"
+			resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto">
+		SELECT
+				d.goodsID,
+				d.goodsSpuSid AS goodsSid,
+				d.goodsSpuName,
+				d.goodsSkuSid,
+				d.goodsSkuTitle AS goodsName,
+				d.goodsSkuCode AS goodsCode,
+				d.goodsSkuOwnSpec AS goodsSpec,
+				d.manufacturerSid,
+				d.manufacturerName,
+				d.unit,
+				d.loseCount AS pKNum,
+				d.warehouseSid,
+				d.warehouseName,
+				d.warehouseRackSid,
+				d.warehouseRackName,
+				d.loseCount AS outStorageNum,
+				w.cost AS inStoragePrice
+		FROM
+				wms_old_checkbill_detail d
+						LEFT JOIN wms_inventory w
+						ON d.goodsID = w.goodsID
+		WHERE billSid = #{sid}
+		  AND loseCount > 0
+	</select>
+</mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailRackGoodPageListQuery.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillDetailRackGoodPageListQuery implements Query {
+
+    @ApiModelProperty("盘点sid")
+    private String billSid;
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+    @ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+    @ApiModelProperty("商品名称")
+    private String goodsSkuTitle; // 商品名称
+    @ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+
+    /*
+    * 移动端查询条件
+    * */
+    private String name;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailRackGoodPageListVo.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+
+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.List;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillDetailRackGoodPageListVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+    @ApiModelProperty("商品名称")
+    private String goodsSkuTitle; // 商品名称
+    @ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
+    @ApiModelProperty("库位名称")
+    private String warehouseRackName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("成本单价")
+    private BigDecimal cost;
+    @ApiModelProperty("应盘数量")
+    private BigDecimal bookCount;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal bookAmount;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal realAmount;
+    @ApiModelProperty("状态")
+    private String state;
+    @ApiModelProperty("盈亏数量")
+    private BigDecimal profitAndLoseCount;
+    @ApiModelProperty("盈亏金额")
+    private BigDecimal profitAndLoseAmount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal lossAmount;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("附件")
+    private List<WmsOldCheckbillDetailFile> fileList = new ArrayList<>();
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailRackPageListQuery.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillDetailRackPageListQuery implements Query {
+
+    @ApiModelProperty("盘点sid")
+    private String billSid;
+    @ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid; // 库区sid
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+
+    /*
+     * 移动端查询条件
+     * */
+    private String userSid;
+    private String orgPath;
+    private String menuSid;
+    private String names;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailRackPageListVo.java

@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+
+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: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class WmsOldCheckbillDetailRackPageListVo implements Vo {
+
+    private String billSid;
+
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid;
+    @ApiModelProperty("库位名称")
+    private String warehouseRackName;
+    @ApiModelProperty("应盘数量")
+    private BigDecimal bookCount;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal bookAmount;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal realAmount;
+    @ApiModelProperty("未盘数量")
+    private BigDecimal notCount;
+    @ApiModelProperty("未盘金额")
+    private BigDecimal notAmount;
+    @ApiModelProperty("盘盈数量")
+    private BigDecimal profitCount;
+    @ApiModelProperty("盘盈金额")
+    private BigDecimal profitAmount;
+    @ApiModelProperty("盘亏数量")
+    private BigDecimal loseCount;
+    @ApiModelProperty("盘亏金额")
+    private BigDecimal loseAmount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal lossAmount;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/WmsOldCheckbillDetailService.java

@@ -0,0 +1,191 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendix;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixService;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsFileEnum;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.HandleBean;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillGoodsDto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app.WmsOldCheckbillGoodsPyDto;
+import com.yxt.wms.biz.inventory.wmsoldcheckbillreport.WmsOldCheckbillReportSumVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailService.java <br/>
+ * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService <br/>
+ * Description: 库存盘点-明细 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class WmsOldCheckbillDetailService extends MybatisBaseService<WmsOldCheckbillDetailMapper, WmsOldCheckbillDetail> {
+
+    @Autowired
+    private WmsAppendixService wmsAppendixService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private WmsWarehouseRackService wmsWarehouseRackService;
+    @Autowired
+    private WmsWarehouseAreaService wmsWarehouseAreaService;
+    @Autowired
+    private WmsWarehouseInfoService wmsWarehouseInfoService;
+
+    public void insertByDto(WmsOldCheckbillDetailDto dto) {
+        WmsOldCheckbillDetail entity = new WmsOldCheckbillDetail();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public WmsOldCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid) {
+        WmsOldCheckbillDetail entity = fetchBySid(sid);
+        WmsOldCheckbillDetailDetailsVo vo = new WmsOldCheckbillDetailDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public void delByMainSid(String dtoSid) {
+        baseMapper.delByMainSid(dtoSid);
+    }
+
+    public List<WmsOldCheckbillDetailDetailsVo> selByMainSid(String billSid) {
+        return baseMapper.selByMainSid(billSid);
+    }
+
+    public List<WmsOldCheckbillReportSumVo> reportSum(String sid, String sumType) {
+        List<WmsOldCheckbillReportSumVo> wmsOldCheckbillReportSumVos = new ArrayList<>();
+        if ("total".equals(sumType)) {
+            WmsOldCheckbillReportSumVo wmsOldCheckbillReportSumVo = baseMapper.reportSumTotal(sid);
+            wmsOldCheckbillReportSumVos.add(wmsOldCheckbillReportSumVo);
+        } else if ("ware".equals(sumType)) {
+            wmsOldCheckbillReportSumVos = baseMapper.reportSumWare(sid);
+        } else if ("area".equals(sumType)) {
+            wmsOldCheckbillReportSumVos = baseMapper.reportSumArea(sid);
+        }
+        return wmsOldCheckbillReportSumVos;
+    }
+
+    public void saveInventoryInfo(WmsOldCheckbillGoodsDto dto) {
+        int i = new BigDecimal(dto.getLockNum()).compareTo(new BigDecimal(dto.getNum()));
+        if (i < 0) {//盘盈
+            BigDecimal pyCount = new BigDecimal(dto.getNum()).subtract(new BigDecimal(dto.getLockNum()));
+            baseMapper.saveInventoryInfoPY(dto, pyCount);
+        } else if (i > 0) {//盘亏
+            BigDecimal pkCount = new BigDecimal(dto.getLockNum()).subtract(new BigDecimal(dto.getNum()));
+            baseMapper.saveInventoryInfoPK(dto, pkCount);
+        } else {
+            baseMapper.saveInventoryInfoZC(dto, dto.getNum());
+        }
+        List<String> files = dto.getFiles();
+        wmsAppendixService.delByLinkSid(dto.getSid());
+        for (String file : files) {
+            String filePath = file.replace(fileUploadComponent.getUrlPrefix(), "");
+            WmsAppendix wmsAppendix = new WmsAppendix();
+            wmsAppendix.setLinkSid(dto.getSid());
+            wmsAppendix.setAttachType(WmsFileEnum.WMSINVENTORYCHECKBILLDETAIL.getAttachType());
+            wmsAppendix.setFilePath(filePath);
+            wmsAppendixService.save(wmsAppendix);
+        }
+    }
+
+    public HandleBean scan(String sid, String content, String houseSid) {
+        return baseMapper.scan(sid, content, houseSid);
+    }
+
+    public void saveInventoryInfo2(WmsOldCheckbillGoodsPyDto dto) {
+        WmsOldCheckbillDetail wmsOldCheckbillDetail = new WmsOldCheckbillDetail();
+        wmsOldCheckbillDetail.setState(3);
+        wmsOldCheckbillDetail.setBillSid(dto.getPanDianSid());
+        wmsOldCheckbillDetail.setGoodsSpuSid(dto.getGoodsSid());
+        wmsOldCheckbillDetail.setGoodsSpuName(dto.getGoodsSpuName());
+        wmsOldCheckbillDetail.setGoodsSkuSid(dto.getGoodsSkuSid());
+        wmsOldCheckbillDetail.setGoodsSkuTitle(dto.getGoodsName());
+        wmsOldCheckbillDetail.setGoodsSkuCode(dto.getGoodsSkuCode());
+        wmsOldCheckbillDetail.setGoodsSkuOwnSpec(dto.getGoodsSkuOwnSpec());
+        wmsOldCheckbillDetail.setManufacturerSid(dto.getManufacturerSid());
+        wmsOldCheckbillDetail.setManufacturerName(dto.getManufacturerName());
+        wmsOldCheckbillDetail.setUnit(dto.getUnit());
+        WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(dto.getHouseSid());
+        WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid());
+        WmsWarehouseInfo wmsWarehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseArea.getWarehouseSid());
+        wmsOldCheckbillDetail.setWarehouseSid(wmsWarehouseInfo.getSid());
+        wmsOldCheckbillDetail.setWarehouseName(wmsWarehouseInfo.getWarehouseName());
+        wmsOldCheckbillDetail.setWarehouseAreaSid(wmsWarehouseArea.getSid());
+        wmsOldCheckbillDetail.setWarehouseArea(wmsWarehouseArea.getAreaName());
+        wmsOldCheckbillDetail.setWarehouseRackSid(wmsWarehouseRack.getSid());
+        wmsOldCheckbillDetail.setWarehouseRackName(wmsWarehouseRack.getRackName());
+        wmsOldCheckbillDetail.setSupplierSid(dto.getProviderSid());
+        wmsOldCheckbillDetail.setSupplierName(dto.getProvider());
+        wmsOldCheckbillDetail.setBookCount(new BigDecimal("0"));
+        wmsOldCheckbillDetail.setRealCount(new BigDecimal(dto.getNum()));
+        wmsOldCheckbillDetail.setLossCount(new BigDecimal(dto.getBadNum()));
+        wmsOldCheckbillDetail.setProfitCount(new BigDecimal(dto.getNum()));
+        wmsOldCheckbillDetail.setLoseCount(new BigDecimal("0"));
+        wmsOldCheckbillDetail.setRemarks(dto.getRemarks());
+        baseMapper.insert(wmsOldCheckbillDetail);
+        List<String> files = dto.getFiles();
+        for (String file : files) {
+            String filePath = file.replace(fileUploadComponent.getUrlPrefix(), "");
+            WmsAppendix wmsAppendix = new WmsAppendix();
+            wmsAppendix.setLinkSid(wmsOldCheckbillDetail.getSid());
+            wmsAppendix.setAttachType(WmsFileEnum.WMSINVENTORYCHECKBILLDETAIL.getAttachType());
+            wmsAppendix.setFilePath(filePath);
+            wmsAppendixService.save(wmsAppendix);
+        }
+    }
+
+    public List<WmsInventoryProfitinDetailDto> sourceBillBySid(String sid) {
+        return baseMapper.sourceBillBySid(sid);
+    }
+
+    public List<WmsInventoryProfitoutDetailDto> sourceBillPkBySid(String sid) {
+        return baseMapper.sourceBillPkBySid(sid);
+    }
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/app/HandleBean.java

@@ -0,0 +1,44 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HandleBean {
+
+    /**
+     * 损坏数量，默认 0
+     */
+    private String badNum;
+    private List<String> files;
+    /**
+     * 商品ID
+     */
+    private String goodsID;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 图号
+     */
+    private String goodsSkuCode;
+    /**
+     * 本库位库存
+     */
+    private String lockNum;
+    /**
+     * 确认数量/数量，赋值为库存数量
+     */
+    private String num;
+    private String remarks;
+    /**
+     * 商品记录sid
+     */
+    private String sid;
+    /**
+     * 单位
+     */
+    private String unit;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/app/WmsOldCheckbillGoodsDto.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WmsOldCheckbillGoodsDto implements Dto {
+
+    /**
+     * 损坏数量
+     */
+    private String badNum;
+    /**
+     * 附件
+     */
+    private List<String> files;
+    /**
+     * 确认数量/数量
+     */
+    private String num;
+    /**
+     * 库存数量
+     */
+    private String lockNum;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 商品记录sid
+     */
+    private String sid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/app/WmsOldCheckbillGoodsPyDto.java

@@ -0,0 +1,66 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WmsOldCheckbillGoodsPyDto implements Dto {
+
+    /**
+     * 损坏数量
+     */
+    private String badNum;
+    /**
+     * 附件
+     */
+    private List<String> files;
+    /**
+     * 确认数量/数量
+     */
+    private String num;
+    /**
+     * 库存数量
+     */
+    private String lockNum;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 商品sid
+     */
+    private String goodsSid;
+    /**
+     * 图号
+     */
+    private String goodsSkuCode;
+    /**
+     * 库位sid
+     */
+    private String houseSid;
+    /**
+     * 盘点单sid
+     */
+    private String panDianSid;
+    /**
+     * 供应商
+     */
+    private String provider;
+    private String providerSid;
+    /**
+     * 单位
+     */
+    private String unit;
+
+    private String goodsSkuSid;
+    private String goodsSpuName;
+    private String goodsSkuOwnSpec;
+    private String manufacturerSid;
+    private String manufacturerName;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/app/WmsOldCheckbillPageQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+@Data
+public class WmsOldCheckbillPageQuery implements Query {
+
+    private String menuSid;
+    /**
+     * 仓库/库区/库位
+     */
+    private String name;
+    /**
+     * 组织机构sid
+     */
+    private String orgPath;
+    private String userSid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbilldetail/app/WmsOldCheckbillPageVo.java

@@ -0,0 +1,30 @@
+package com.yxt.wms.biz.inventory.wmsoldcheckbilldetail.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WmsOldCheckbillPageVo implements Vo {
+
+    @ApiModelProperty("盘点单sid")
+    private String sid;
+    @ApiModelProperty("库位sid")
+    private String houseSid;
+    @ApiModelProperty("仓库-库区-库位")
+    private String title;
+    @ApiModelProperty("应盘数量")
+    private String totalNumber;
+    @ApiModelProperty("未盘数量")
+    private String surplusNumber;
+    @ApiModelProperty("盘亏数量")
+    private String lossNumber;
+    @ApiModelProperty("盘损数量")
+    private String damageNumber;
+    @ApiModelProperty("盘盈数量")
+    private String profitNumber;
+    @ApiModelProperty("实盘数量")
+    private String actualNumber;
+    @ApiModelProperty("是否显示按钮")
+    private Boolean showBtn = true;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbillreport/WmsOldCheckbillReport.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbillreport;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(盘点报告) <br/>
+ * File: WmsInventoryCheckbillReport.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReport <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
+@TableName("wms_old_checkbill_report")
+public class WmsOldCheckbillReport extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("盘点单sid")
+    private String billSid; // 盘点单sid
+	@ApiModelProperty("pdf路径")
+    private String pdfUrl; // pdf路径
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbillreport/WmsOldCheckbillReportDetailsVo.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbillreport;
+
+
+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
+public class WmsOldCheckbillReportDetailsVo 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;
+    @ApiModelProperty("虚拟件数量")
+    private BigDecimal virtualNum;
+    @ApiModelProperty("未入库数量")
+    private BigDecimal unInStorageNum;
+
+    //仓库盘点情况
+    List<WmsOldCheckbillReportSumVo> warehouseStocktakList = new ArrayList<>();
+
+    //库区盘点情况
+    List<WmsOldCheckbillReportSumVo> arehouseAreaeStocktakList = new ArrayList<>();
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbillreport/WmsOldCheckbillReportDto.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbillreport;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(盘点报告) <br/>
+ * File: WmsInventoryCheckbillReportDto.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReportDto <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
+public class WmsOldCheckbillReportDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("盘点单sid")
+    private String billSid; // 盘点单sid
+	@ApiModelProperty("pdf路径")
+    private String pdfUrl; // pdf路径
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbillreport/WmsOldCheckbillReportMapper.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbillreport;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.*;
+
+@Mapper
+public interface WmsOldCheckbillReportMapper extends BaseMapper<WmsOldCheckbillReport> {
+
+	@Delete("delete from wms_old_checkbill_report where billSid = #{billSid}")
+	void delByMainSid(String billSid);
+
+	@Select("select * from wms_old_checkbill_report where billSid = #{billSid}")
+	WmsOldCheckbillReport selByBillSid(String billSid);
+
+	@Update("update wms_old_checkbill_report set remarks = #{remarks} where billSid = #{billSid}")
+    void saveReport(@Param("billSid") String billSid,@Param("remarks") String remarks);
+
+	@Update("update wms_old_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/wmsoldcheckbillreport/WmsOldCheckbillReportMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.inventory.wmsoldcheckbillreport.WmsOldCheckbillReportMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldcheckbillreport/WmsOldCheckbillReportService.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbillreport;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WmsOldCheckbillReportService extends MybatisBaseService<WmsOldCheckbillReportMapper, WmsOldCheckbillReport> {
+	
+	public void insertByDto(WmsOldCheckbillReportDto dto){
+		WmsOldCheckbillReport entity = new WmsOldCheckbillReport();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public WmsOldCheckbillReportDetailsVo fetchDetailsVoBySid(String sid){
+		WmsOldCheckbillReport entity = fetchBySid(sid);
+		WmsOldCheckbillReportDetailsVo vo = new WmsOldCheckbillReportDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public void delByMainSid(String billSid) {
+		baseMapper.delByMainSid(billSid);
+	}
+
+	public WmsOldCheckbillReport 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/wmsoldcheckbillreport/WmsOldCheckbillReportSumVo.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.inventory.wmsoldcheckbillreport;
+
+
+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
+public class WmsOldCheckbillReportSumVo 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;
+    @ApiModelProperty("虚拟件数量")
+    private BigDecimal virtualNum;
+    @ApiModelProperty("虚拟件金额")
+    private BigDecimal virtualMoney;
+    @ApiModelProperty("未入库数量")
+    private BigDecimal unInStorageNum;
+    @ApiModelProperty("未入库金额")
+    private BigDecimal unInStorageMoney;
+}