站长出厂确认

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -92,4 +93,7 @@ public interface FinSelectedReceivablesDetailedFeign {
     @PostMapping("/saveAll")
     ResultBean saveAll(List<FinSelectedReceivablesDetailed> list);
 
+    @ApiOperation("根据维修工单sid查询待审核和已审核的认款金额之和")
+    @GetMapping("/selRkByBillSid")
+    ResultBean<BigDecimal> selRkByBillSid(@RequestParam("billSid") String billSid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java

@@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -93,4 +94,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR
 		return null;
 	}
 
+	@Override
+	public ResultBean<BigDecimal> selRkByBillSid(String billSid) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -140,4 +141,8 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("根据销售订单车辆sid查询已审核订金总和")
     @PostMapping("/selectDjByBusVinSid")
     ResultBean<String> selectDjByBusVinSid(@RequestParam("busVinSid") String busVinSid);
+
+    @ApiOperation("根据维修工单sid查询应收金额之和")
+    @PostMapping("/selYsByBillSid")
+    ResultBean<BigDecimal> selYsByBillSid(@RequestParam("billSid") String billSid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -156,4 +157,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		return null;
 	}
 
+	@Override
+	public ResultBean<BigDecimal> selYsByBillSid(String billSid) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -37,6 +37,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import org.apache.ibatis.annotations.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -159,4 +160,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     String getBalance(String busSid);
 
     List<FinSelectedReceivablesDetailed> selectLiBy(String sid);
+
+    BigDecimal selRkByBillSid(String billSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -593,4 +593,13 @@
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed">
         select * from fin_selected_receivables_detailed where collSid = #{sid} and receivablesName = '融资放款'
     </select>
+
+    <select id="selRkByBillSid" resultType="java.math.BigDecimal">
+        SELECT
+                SUM(subscriptionMoney)
+        FROM
+                fin_selected_receivables_detailed
+        WHERE contractSid = #{billSid}
+          AND auditState != 2
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
 import com.yxt.common.base.utils.PagerUtil;
@@ -37,6 +38,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -118,4 +120,9 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable
 		return finSelectedReceivablesDetailedService.saveAll(list);
 	}
 
+	@Override
+	public ResultBean<BigDecimal> selRkByBillSid(String billSid) {
+		return finSelectedReceivablesDetailedService.selRkByBillSid(billSid);
+	}
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -900,4 +900,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         }
         return rb.success();
     }
+
+    public ResultBean<BigDecimal> selRkByBillSid(String billSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BigDecimal rkMoney = baseMapper.selRkByBillSid(billSid);
+        return rb.success().setData(rkMoney);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -36,6 +36,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -126,4 +127,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     List<CustomerBillDetailedListExportVo> exportExcel( @Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
 
     String selectDjByBusVinSid(String busVinSid);
+
+    @Select("SELECT SUM(reveivableMoney) FROM fin_uncollected_receivables_detailed WHERE contractSid = #{billSid}")
+    BigDecimal selYsByBillSid(String billSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -37,6 +37,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.List;
 
@@ -197,6 +198,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
         return finUncollectedReceivablesDetailedService.selectDjByBusVinSid(busVinSid);
     }
 
+    @Override
+    public ResultBean<BigDecimal> selYsByBillSid(String billSid) {
+        return finUncollectedReceivablesDetailedService.selYsByBillSid(billSid);
+    }
+
 
     @Override
     public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -1227,4 +1227,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         String djTotal = baseMapper.selectDjByBusVinSid(busVinSid);
         return rb.success().setData(djTotal);
     }
+
+    public ResultBean<BigDecimal> selYsByBillSid(String billSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BigDecimal ysMoney = baseMapper.selYsByBillSid(billSid);
+        return rb.success().setData(ysMoney);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java

@@ -24,9 +24,7 @@ import java.util.List;
 public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     IPage<AsBusrepairBillListVo> getList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
 
-    IPage<AsBusrepairBillListVo> carOutFactory(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
-
-    @Update("update as_busrepair_bill set outDoorState = '1' where sid = #{sid}")
+    @Update("update as_busrepair_bill set outDoorState = '1',outDoorTime = NOW() where sid = #{sid}")
     void updateOutDoorState(String sid);
 
     int selectNum(String bill);

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -15,13 +15,6 @@
         where nodeCode = 3
     </select>
 
-    <select id="carOutFactory" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo">
-        select *
-        from as_busrepair_bill
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
     <select id="selectNum" resultType="java.lang.Integer">
         select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
         from as_busrepair_bill

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -111,22 +111,20 @@ public class AsBusrepairBillRest {
         return asBusrepairBillService.selectOneByBillNo(billNo);
     }
 
-    @PostMapping("carOutFactory")
-    @ApiOperation("维修工单-车辆出厂")
-    ResultBean<PagerVo<AsBusrepairBillListVo>> carOutFactory(@RequestBody PagerQuery<AsBusrepairBillListQuery> pagerQuery) {
-        ResultBean<PagerVo<AsBusrepairBillListVo>> rb = ResultBean.fireFail();
-        PagerVo<AsBusrepairBillListVo> pv = asBusrepairBillService.carOutFactory(pagerQuery);
-        return rb.success().setData(pv);
-    }
-
     @PostMapping("confirmOut")
     @ApiOperation("维修工单-车辆出厂-确认出厂")
-    ResultBean confirmOut(@RequestParam String sid) {
+    ResultBean confirmOut(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
-        asBusrepairBillService.confirmOut(sid);
+        asBusrepairBillService.confirmOut(sids);
         return rb.success();
     }
 
+    @PostMapping("statConfirmOut")
+    @ApiOperation("维修工单-站长出厂确认-确认出厂")
+    ResultBean statConfirmOut(@RequestBody String[] sids) {
+        return asBusrepairBillService.statConfirmOut(sids);
+    }
+
     //==============================================================================
 
     @PostMapping("getList")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -49,6 +49,7 @@ import com.yxt.anrui.as.biz.astrackbill.AsTrackBillService;
 import com.yxt.anrui.as.feign.crm.CrmCustomerTemp;
 import com.yxt.anrui.as.feign.crm.CrmCustomerTempFeign;
 import com.yxt.anrui.as.feign.file.AsFileEnum;
+import com.yxt.anrui.as.feign.fin.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.as.feign.fms.FmsReceivesettle;
@@ -148,6 +149,9 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     private AsArrearsoutApplyService asArrearsoutApplyService;
     @Autowired
     private DocPdfComponent docPdfComponent;
+    @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
+
 
     /**
      * 维修领料获取派工单
@@ -182,30 +186,27 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         return p;
     }
 
-    public PagerVo<AsBusrepairBillListVo> carOutFactory(PagerQuery<AsBusrepairBillListQuery> pagerQuery) {
-        AsBusrepairBillListQuery query = pagerQuery.getParams();
-        QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
-        qw.eq("nodeCode", query.getNodeCode());
-        if (query != null) {
-
+    public void confirmOut(String[] sids) {
+        for (String sid : sids) {
+            //修改维修工单出厂状态为已出厂
+            baseMapper.updateOutDoorState(sid);
         }
-        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<AsBusrepairBillListVo> pagging = baseMapper.carOutFactory(page, qw);
-        PagerVo<AsBusrepairBillListVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
     }
 
-    public void confirmOut(String sid) {
-        AsBusrepairBill asBusrepairBill = fetchBySid(sid);
-        //修改维修工单出厂状态为已出厂
-        baseMapper.updateOutDoorState(sid);
-        //新增工单环节信息
-        AsBusrepairBillNodeDto asBusrepairBillNodeDto = new AsBusrepairBillNodeDto();
-        asBusrepairBillNodeDto.setBillSid(sid);
-        asBusrepairBillNodeDto.setCreateByName(asBusrepairBill.getCreateByName());
-        asBusrepairBillNodeDto.setNodeName("出厂");
-        asBusrepairBillNodeDto.setNodeCode("6");
-        asBusrepairBillNodeService.saveOrUpdateDto(asBusrepairBillNodeDto);
+    public ResultBean statConfirmOut(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        for (String sid : sids) {
+            AsBusrepairBill asBusrepairBill = fetchBySid(sid);
+            BigDecimal ysMoney = finUncollectedReceivablesDetailedFeign.selYsByBillSid(sid).getData();
+            BigDecimal rkMoney = finSelectedReceivablesDetailedFeign.selRkByBillSid(sid).getData();
+            if (rkMoney.compareTo(ysMoney) < 0){
+                return rb.setMsg(asBusrepairBill.getBillNo() + "该维修单尚未收款，不能出厂！");
+            }
+        }
+        for (String sid : sids) {
+            baseMapper.updateOutFactory(sid);
+        }
+        return rb.success();
     }
 
     /**
@@ -1108,6 +1109,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             qw.eq("i.isInvoicing", query.getIsInvoicing());
         }
         qw.eq("b.outDoorState",2);
+        qw.eq("b.isOutFactory",0);
         qw.orderByDesc("b.createTime");
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusrepairBillVo> pagging = baseMapper.listPage(page, qw);

yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.feign.fin.finselectedreceivablesdetailed;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Project: anrui-fin(销售相关) <br/>
+ * File: FinSelectedReceivablesDetailedFeign.java <br/>
+ * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign <br/>
+ * Description: 已选应收款项明细表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "已选应收款项明细表")
+@FeignClient(
+        contextId = "anrui-fin-FinSelectedReceivablesDetailed",
+        name = "anrui-fin",
+        path = "finselectedreceivablesdetailed")
+public interface FinSelectedReceivablesDetailedFeign {
+
+    @ApiOperation("根据维修工单sid查询待审核和已审核的认款金额之和")
+    @GetMapping("/selRkByBillSid")
+    ResultBean<BigDecimal> selRkByBillSid(@RequestParam("billSid") String billSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -61,4 +62,7 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @PostMapping("/saveOrUpdate")
     public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto);
 
+    @ApiOperation("根据维修工单sid查询应收金额之和")
+    @PostMapping("/selYsByBillSid")
+    ResultBean<BigDecimal> selYsByBillSid(@RequestParam("billSid") String billSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -55,6 +56,8 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		return ResultBean.fireFail().setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/saveOrUpdate无法访问");
 	}
 
-
-
+	@Override
+	public ResultBean<BigDecimal> selYsByBillSid(String billSid) {
+		return null;
+	}
 }