Browse Source

Merge remote-tracking branch 'origin/master'

master
God 9 months ago
parent
commit
385b61b169
  1. 31
      anrui-riskcenter-ui/src/views/settle/settleAdd.vue
  2. 1
      anrui-riskcenter-ui/src/views/settlethevehicleaccount/settlethevehicleaccount.vue
  3. 2
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
  4. 9
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeign.java
  5. 7
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeignFallback.java
  6. 17
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankInfo.java
  7. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java
  8. 9
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java
  9. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.java
  10. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankRest.java
  11. 17
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankService.java
  12. 47
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorySearch/AppBusrepairBillVo.java
  13. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorySearch/AppInventorySearchFeign.java
  14. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java
  15. 13
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorySearch/AppInventorySearchRest.java
  16. 29
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java
  17. 78
      yxt-as-ui/src/api/storage/manufacturerconfirm.js
  18. 85
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
  19. 23
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
  20. 4
      yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue
  21. 60
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
  22. 16
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
  23. 47
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/AppBusrepairBillVo.java
  24. 20
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/InventorySearchQuery.java
  25. 7
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
  26. 25
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
  27. 8
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
  28. 58
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

31
anrui-riskcenter-ui/src/views/settle/settleAdd.vue

@ -102,14 +102,10 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>资方结清费用</div>
<div>
<div>
<span>贷款保证金:</span>
<el-input v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
</div>
<div>
<span>是否抵顶:</span>
<el-radio-group v-model="formobj.loanSettleBankCostVo.topping ">
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>贷款保证金:<el-input style="width: 60%" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
<div>是否抵顶:
<el-radio-group v-model="formobj.loanSettleBankCostVo.topping">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
@ -186,7 +182,7 @@
<el-col :span="8">
<div class="span-sty">资方收款账号</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
<el-select class="addinputInfo" v-model="formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
<el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.accountName" :value="item.bankAccount"></el-option>
</el-select>
</el-form-item>
@ -522,6 +518,11 @@ export default {
req.settleRepoInit({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.formobj = res.data
fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
if (res.success) {
this.bank_list = res.data
}
})
if (this.formobj.loanSettleBankCostVo.filesList.length > 0) {
const aa = []
this.formobj.loanSettleBankCostVo.filesList.forEach((e) => {
@ -714,4 +715,16 @@ export default {
.addinputInfo {
margin-left: 190px !important;
}
/* 覆盖element-ui的单选按钮样式 */
.el-radio__input.is-checked .el-radio__inner {
border-color: #409EFF; /* 未选中状态下的边框颜色 */
background-color: #409EFF; /* 选中后的背景色 */
}
/* 如果需要改变选中后对勾的颜色 */
.el-radio__input.is-checked .el-radio__inner::after {
background-color: #000000; /* 对勾的颜色 */
}
.el-radio__input.is-checked+.el-radio__label {
color: #000000;
}
</style>

1
anrui-riskcenter-ui/src/views/settlethevehicleaccount/settlethevehicleaccount.vue

@ -56,7 +56,6 @@
<el-table-column prop="vinNo" label="车架号" align="center" width="130" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
<el-table-column prop="loanName" label="贷款人" align="center" width="130" />
<el-table-column prop="peroid" label="期数" align="center" width="130" />
<el-table-column prop="settingDate" label="结清日期" align="center" width="130" />
<el-table-column prop="bankSettlePrice" label="资方结清金额" align="center" width="130" />
<el-table-column prop="settleAll" label="公司正常结清合计" align="center" width="140" />

2
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue

@ -185,7 +185,7 @@
<el-col :span="8">
<div class="span-sty">资方收款账号</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
<el-select class="addinputInfo" v-model="formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
<el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.accountName" :value="item.bankAccount"></el-option>
</el-select>
</el-form-item>

9
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeign.java

@ -55,9 +55,14 @@ import java.util.List;
path = "v1/loanfinopenbank",
fallback = LoanFinOpenBankFeignFallback.class)
public interface LoanFinOpenBankFeign {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<LoanFinOpenBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}
@ApiOperation("根据资方SID获取账户信息")
@GetMapping("/fetchListByBankSid")
@ResponseBody
public ResultBean<List<LoanFinOpenBankInfo>> fetchListByBankSid(@RequestParam("bankSid") String bankSid);
}

7
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeignFallback.java

@ -53,4 +53,9 @@ public class LoanFinOpenBankFeignFallback implements LoanFinOpenBankFeign {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-risk/loanfinopenbank/fetchDetailsBySid无法访问");
}
}
@Override
public ResultBean<List<LoanFinOpenBankInfo>> fetchListByBankSid(String bankSid) {
return null;
}
}

17
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankInfo.java

@ -0,0 +1,17 @@
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/8/26 10:05
*/
@Data
public class LoanFinOpenBankInfo {
private String accountName;//资方账户
private String bankAccount;//银行账号
}

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

@ -18,6 +18,10 @@ public class LoanSettleApplyDetailsVo {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("bankSid")
private String bankSid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请部门sid")

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

@ -34,6 +34,13 @@ public class LoanSettleBankCostVo {
private String otherReceivableRemarks;
@ApiModelProperty("资方结清金额")
private String bankSettlePrice;
@ApiModelProperty("是否勾选减免,1勾选,0不勾选")
private boolean topping;
@ApiModelProperty("贷款保证金")
private String loanDeposit;
@ApiModelProperty("资方收款账号")
private String bankAccount;
@ApiModelProperty("资方收款账户")
private String dueBankValue;
private List<UrlQuery> filesList = new ArrayList<>();
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.java

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankInfo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -59,4 +60,7 @@ public interface LoanFinOpenBankMapper extends BaseMapper<LoanFinOpenBank> {
List<LoanFinOpenBankDetailsVo> selectByManSid(String sid);
void updateBySidIsDeletes(String s);
}
@Select("select * from loan_fin_open_bank where bankSid = #{bankSid} AND isDelete = 0")
List<LoanFinOpenBankInfo> fetchListByBankSid(@Param("bankSid") String bankSid);
}

14
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankRest.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign;
/**
* Project: anrui-risk(资方开户行) <br/>
@ -70,4 +65,11 @@ public class LoanFinOpenBankRest implements LoanFinOpenBankFeign {
LoanFinOpenBankDetailsVo vo = loanFinOpenBankService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<LoanFinOpenBankInfo>> fetchListByBankSid(String bankSid) {
ResultBean rb = ResultBean.fireFail();
List<LoanFinOpenBankInfo> list = loanFinOpenBankService.fetchListByBankSid(bankSid);
return rb.success().setData(list);
}
}

17
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankService.java

@ -28,18 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.*;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign;
import org.springframework.stereotype.Service;
@ -60,13 +55,13 @@ import java.util.List;
*/
@Service
public class LoanFinOpenBankService extends MybatisBaseService<LoanFinOpenBankMapper, LoanFinOpenBank> {
public void insertByDto(LoanFinOpenBankDto dto){
LoanFinOpenBank entity = new LoanFinOpenBank();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public LoanFinOpenBankDetailsVo fetchDetailsVoBySid(String sid){
LoanFinOpenBank entity = fetchBySid(sid);
LoanFinOpenBankDetailsVo vo = new LoanFinOpenBankDetailsVo();
@ -81,4 +76,8 @@ public class LoanFinOpenBankService extends MybatisBaseService<LoanFinOpenBankMa
public void updateBySidIsDeletes(String s) {
baseMapper.updateBySidIsDeletes(s);
}
}
public List<LoanFinOpenBankInfo> fetchListByBankSid(String bankSid) {
return baseMapper.fetchListByBankSid(bankSid);
}
}

47
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorySearch/AppBusrepairBillVo.java

@ -0,0 +1,47 @@
package com.yxt.anrui.terminal.api.wms.inventorySearch;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/8/26 14:10
*/
@Data
public class AppBusrepairBillVo implements Vo {
/**
* 维修单类型
*/
private String billType;
/**
* 车架号/车牌号
*/
private String carCodeInfo;
/**
* 客户名称
*/
private String customerName;
/**
* 进厂时间
*/
private String entryTime;
/**
* 是否外出
*/
private String isGoOut2;
/**
* 维修单编号
*/
private String repairId;
private String sid;
/**
* 环节名称
*/
private String state;
/**
* 科目
*/
private String subject;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorySearch/AppInventorySearchFeign.java

@ -35,5 +35,7 @@ public interface AppInventorySearchFeign {
@PostMapping("/oldParts")
public ResultBean<PagerVo<OldStorageVo>> appOldStorage(@RequestBody PagerQuery<InventorySearchQuery> pq);
@PostMapping("/repairs")
@ApiOperation("app工单查询列表")
ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(@RequestBody PagerQuery<InventorySearchQuery> pagerQuery);
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.yxt.anrui.terminal",
"com.yxt.common.base.config"
},exclude = {DataSourceAutoConfiguration.class})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill"})
public class TerminalApplication {
public static void main(String[] args) {

13
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorySearch/AppInventorySearchRest.java

@ -25,16 +25,14 @@
*********************************************************/
package com.yxt.anrui.terminal.biz.wms.inventorySearch;
import com.yxt.anrui.terminal.api.wms.inventorySearch.AppInventorySearchFeign;
import com.yxt.anrui.terminal.api.wms.inventorySearch.InventorySearchQuery;
import com.yxt.anrui.terminal.api.wms.inventorySearch.OldStorageVo;
import com.yxt.anrui.terminal.api.wms.inventorySearch.StorageVo;
import com.yxt.anrui.terminal.api.wms.inventorySearch.*;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.AppInventoryProfitoutDetailsVo;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.AppInventoryProfitoutFeign;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutDto;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutTaskQuery;
import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsbusrepairBillFegin;
import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventoryFeign;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -53,6 +51,8 @@ public class AppInventorySearchRest implements AppInventorySearchFeign {
@Resource
private WmsInventoryFeign wmsInventoryFeign;
@Resource
private AsbusrepairBillFegin asbusrepairBillFegin;
@Override
public ResultBean<PagerVo<StorageVo>> appStorage(PagerQuery<InventorySearchQuery> pq) {
@ -63,4 +63,9 @@ public class AppInventorySearchRest implements AppInventorySearchFeign {
public ResultBean<PagerVo<OldStorageVo>> appOldStorage(PagerQuery<InventorySearchQuery> pq) {
return wmsInventoryFeign.appOldStorage(pq);
}
@Override
public ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(PagerQuery<InventorySearchQuery> pagerQuery) {
return asbusrepairBillFegin.appRepairs(pagerQuery);
}
}

29
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java

@ -0,0 +1,29 @@
package com.yxt.anrui.terminal.fegin.asbusrepairbill;
import com.yxt.anrui.terminal.api.wms.inventorySearch.AppBusrepairBillVo;
import com.yxt.anrui.terminal.api.wms.inventorySearch.InventorySearchQuery;
import com.yxt.anrui.terminal.api.wms.inventorySearch.OldStorageVo;
import com.yxt.anrui.terminal.api.wms.inventorySearch.StorageVo;
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.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @description: 商品基础信息
* @author: fzz
* @date: 2024/3/7
**/
@FeignClient(
contextId = "yxt-as-AsbusrepairBill",
name = "yxt-as",
path = "v1/AsBusrepairBill"
)
public interface AsbusrepairBillFegin {
@PostMapping("/appRepairs")
@ApiOperation("app工单查询列表")
ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(@RequestBody PagerQuery<InventorySearchQuery> pagerQuery);
}

78
yxt-as-ui/src/api/storage/manufacturerconfirm.js

@ -5,7 +5,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/as/v1/asoldpartreturnapply/confirmListPage',
url: '/as/v1/asoldpartreturnconfirm/listPage',
method: 'post',
data: params,
headers: {
@ -14,54 +14,18 @@ export default {
})
},
// 获取确认结果详情
saveConfirmResult: function(data) {
return request({
url: ' ',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 获取确认结果详情
fetchDetailsByMainSid: function(data) {
return request({
url: '/as/v1/asoldpartreturnconfirm/fetchDetailsByMainSid/' + data,
method: 'get'
});
},
// 初始化
init: function(data) {
return request({
url: '/as/v1/asoldpartreturnapply/fetchDetailsBySid/' + data,
url: '/as/v1/asoldpartreturnconfirm/fetchDetailsBySid/' + data,
method: 'get'
});
},
// 新增、保存
save: function(data) {
return request({
url: '/as/v1/asoldpartreturnapply/save',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 提交
submit: function(data) {
return request({
url: '/as/v1/asoldpartreturnapply/submit',
url: '/as/v1/asoldpartreturnconfirm/confirm',
method: 'post',
data: data,
headers: {
@ -70,40 +34,4 @@ export default {
});
},
deleteBySids: function(data) {
return request({
url: '/as/v1/asoldpartreturnapply/delBySids',
method: 'DELETE',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 查询分页列表
getGoodsListPage: function(params) {
return request({
url: '/wms/apiadmin/WmsOutBill/getInventoryList',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 下载模板
downloadExcel: function() {
return request({
url: '/as/v1/asoldpartreturnapply/downloadModPriceExcel',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: {
'Content-Type': 'application/json'
}
})
},
}

85
yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue

@ -3,7 +3,7 @@
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{title}}旧件返厂确认</div>
<div>{{title}}确认</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button>
@ -15,7 +15,7 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
@ -41,14 +41,14 @@
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
</el-image>
<div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="imgList">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData" />
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -65,10 +65,10 @@
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>已返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
style="width: 100%;" :row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="goodsSkuName" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="厂家" prop="manufacturerName" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
@ -97,15 +97,25 @@
<script>
import req from '@/api/storage/manufacturerconfirm.js'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
components: {},
components: {
uploadImg
},
data() {
return {
listLoading: false,
submitdisabled: false,
title: "新增",
formobj: {},
imgList: [],
rules: {
filePaths: [{
required: true,
message: '附件不能为空',
trigger: 'blur'
}],
}
}
},
methods: {
@ -119,10 +129,18 @@
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
for (var i = 0; i < resp.data.filePaths.length; i++) {
this.imgList.push({
url: resp.data.filePaths[i].url
})
}
}
})
.catch(e => {
@ -130,7 +148,9 @@
})
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
var params = {
sid: row.sid
}
@ -143,6 +163,17 @@
.catch(e => {
this.formobj = {}
})
},
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.imgList = value
for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url)
}
},
commodityComputeYHAndXSJE(row) {
@ -153,11 +184,39 @@
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}

23
yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue

@ -3,7 +3,7 @@
<div class="tab-header webtop">
<!-- 标题 -->
<div>旧件返</div>
<div>家确认</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@ -55,14 +55,7 @@
</el-col>
</el-row> -->
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -74,16 +67,24 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>已返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
style="width: 100%;" :row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="goodsSkuName" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="厂家" prop="manufacturerName" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />

4
yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue

@ -3,7 +3,7 @@
<div class="tab-header webtop">
<!-- 标题 -->
<div>旧件返</div>
<div>家确认</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@ -83,7 +83,7 @@
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="goodsSkuName" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="厂家" prop="manufacturerName" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />

60
yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue

@ -8,7 +8,8 @@
<el-button type="primary" size="small" :disabled="submitdisabled" @click="importDetail">导入厂家返件明细</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="downLoadDetail">下载待出库旧件明细</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" v-show="formobj.sid!=''"
@click="downLoadDetail">下载待出库旧件明细</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
@ -59,14 +60,14 @@
</el-col>
</el-row> -->
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea"
:rows="4" clearable />
<div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="imgList">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData" />
</el-form-item>
</el-col>
@ -75,14 +76,16 @@
<el-row>
<el-col :span="24">
<div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="imgList">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData" />
<div class="span-sty">备注</div>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea"
:rows="4" clearable />
</el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>返厂旧件列表</div>
<el-button type="primary" size="mini" @click="seleGoods3()">添加</el-button>
@ -202,7 +205,7 @@
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="importDetail" />
:limit.sync="queryParams.size" class="pagination" @pagination="seleGoods" />
</div>
@ -241,7 +244,7 @@
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="importDetail" />
:limit.sync="queryParams.size" class="pagination" @pagination="seleGoods3" />
</div>
@ -566,17 +569,13 @@
},
seleGoods(row) {
this.itemInfo = row
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
"vinNo": row.vinNo,
"goodsSkuCode": row.goodsSkuCode,
"sourceBillNo": row.sourceBillNo,
"orgPath": window.sessionStorage.getItem('defaultOrgPath'),
}
this.queryParams.params = {
"vinNo": row.vinNo,
"goodsSkuCode": row.goodsSkuCode,
"sourceBillNo": row.sourceBillNo,
"orgPath": window.sessionStorage.getItem('defaultOrgPath'),
}
req.getGoodsListPage(this.queryParams).then(resp => {
if (resp.success) {
const data = resp.data
@ -630,17 +629,12 @@
handleClose2() {
this.dialogVisible2 = false
},
seleGoods3(row) {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
"vinNo": '',
"goodsSkuCode": '',
"sourceBillNo": '',
"orgPath": window.sessionStorage.getItem('defaultOrgPath'),
}
seleGoods3() {
this.queryParams.params = {
"vinNo": '',
"goodsSkuCode": '',
"sourceBillNo": '',
"orgPath": window.sessionStorage.getItem('defaultOrgPath'),
}
req.getGoodsListPage(this.queryParams).then(resp => {
if (resp.success) {

16
yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue

@ -55,14 +55,7 @@
</el-col>
</el-row> -->
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -76,6 +69,15 @@
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>商品列表</div>

47
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/AppBusrepairBillVo.java

@ -0,0 +1,47 @@
package com.yxt.anrui.as.api.asbusrepairbill.app;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/8/26 14:10
*/
@Data
public class AppBusrepairBillVo implements Vo {
/**
* 维修单类型
*/
private String billType;
/**
* 车架号/车牌号
*/
private String carCodeInfo;
/**
* 客户名称
*/
private String customerName;
/**
* 进厂时间
*/
private String entryTime;
/**
* 是否外出
*/
private String isGoOut2;
/**
* 维修单编号
*/
private String repairId;
private String sid;
/**
* 环节名称
*/
private String state;
/**
* 科目
*/
private String subject;
}

20
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/InventorySearchQuery.java

@ -0,0 +1,20 @@
package com.yxt.anrui.as.api.asbusrepairbill.app;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/8/23 8:50
*/
@Data
public class InventorySearchQuery implements Query {
private String name;
private String userSid;
private String menuSid;
private String orgPath;
}

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

@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.asbusrepairbill.*;
import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimDetailsVo;
import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimListVo;
import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo;
import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
import com.yxt.anrui.as.api.asbusrepairbill.app.*;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -60,4 +57,6 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
IPage<GoodsConfrimListVo> notConfirmList2(IPage<AsBusrepairBill> page,@Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
List<GoodsConfrimDetailsVo> goodsConfrimInfoList(@Param("sid") String sid);
IPage<AppBusrepairBillVo> appRepairs(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER)QueryWrapper<AsBusrepairBill> qw);
}

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

@ -272,4 +272,29 @@
LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
where i.sourceBillSid = #{sid}
</select>
<select id="appRepairs" resultType="com.yxt.anrui.as.api.asbusrepairbill.app.AppBusrepairBillVo">
SELECT
a.sid,
a.billNo repairId,
a.billType,
a.nodeName state,
a.customerName,
a.entryTime,
CASE
a.isGoOut
WHEN '1' THEN
'是'
WHEN '2' THEN
'否'
END AS isGoOut2,
concat(v.vinNo,'/',v.vehMark) carCodeInfo,
a.subject
FROM
as_busrepair_bill AS a
LEFT JOIN as_busrepair_bill_vech AS v ON a.sid = v.billSid
LEFT JOIN anrui_portal.sys_organization AS s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

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

@ -50,7 +50,13 @@ public class AsBusrepairBillRest {
PagerVo<AsBusrepairBillVo> pv = asBusrepairBillService.listPage(pagerQuery);
return rb.success().setData(pv);
}
@PostMapping("/appRepairs")
@ApiOperation("app工单查询列表")
ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(@RequestBody PagerQuery<InventorySearchQuery> pagerQuery) {
ResultBean<PagerVo<AppBusrepairBillVo>> rb = ResultBean.fireFail();
PagerVo<AppBusrepairBillVo> pv = asBusrepairBillService.appRepairs(pagerQuery);
return rb.success().setData(pv);
}
@PostMapping("/listPageCC")
@ApiOperation("工单查询列表-出厂")
ResultBean<PagerVo<AsBusrepairBillVo>> listPageCC(@RequestBody PagerQuery<AsBusrepairBillQuery> pagerQuery) {

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

@ -63,6 +63,7 @@ import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo;
import com.yxt.anrui.as.feign.sms.SmsGoods;
import com.yxt.anrui.as.feign.sms.SmsGoodsFeign;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventory;
import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryFeign;
import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryPush;
import com.yxt.common.base.config.component.DocPdfComponent;
@ -2283,4 +2284,61 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
return rb.success().setData(pdfName);
}
public PagerVo<AppBusrepairBillVo> appRepairs(PagerQuery<InventorySearchQuery> pq) {
InventorySearchQuery query = pq.getParams();
QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setUserSid(query.getUserSid());
privilegeQuery.setMenuSid(query.getMenuSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (com.yxt.common.base.utils.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("a.createBySid", query.getUserSid());
} else {
PagerVo<AppBusrepairBillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AppBusrepairBillVo> p = new PagerVo<>();
return p;
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("a.billNo", query.getName())
.or().like("a.billType", query.getName())
.or().like("a.subject", query.getName())
.or().like("a.customerName", query.getName())
.or().like("v.vinNo", query.getName())
.or().like("v.vehMark", query.getName())
.or().like("a.nodeName", query.getName())
);
}
qw.eq("a.isDelete",0);
qw.orderByDesc("a.id");
IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pq);
IPage<AppBusrepairBillVo> pagging = baseMapper.appRepairs(page, qw);
PagerVo<AppBusrepairBillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

Loading…
Cancel
Save