diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendix.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendix.java index 70a470fa38..88332060a1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendix.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendix.java @@ -6,19 +6,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-base(安瑞基础信息模块)
- * File: CommonAppendix.java
- * Class: com.yxt.anrui.base.api.commonappendix.CommonAppendix
- * Description: 公共附件表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-10-28 08:59:25
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "公共附件表", description = "公共附件表") @TableName("common_appendix") @Data @@ -27,16 +14,16 @@ public class CommonAppendix extends BaseEntity { @ApiModelProperty("上传人姓名") private String name; - @ApiModelProperty("文件名") + @ApiModelProperty("文件名") private String fileName; - @ApiModelProperty("文件类型") + @ApiModelProperty("文件类型") private String fileType; - @ApiModelProperty("关联业务对象sid") + @ApiModelProperty("关联业务对象sid") private String linkSid; - @ApiModelProperty("附件类型") + @ApiModelProperty("附件类型") private String attachType; - @ApiModelProperty("文件大小") + @ApiModelProperty("文件大小") private String fileSize; - @ApiModelProperty("文件的路径") + @ApiModelProperty("文件的路径") private String filePath; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 50b4692335..fd836a401e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2645,14 +2645,16 @@ public class BaseVehicleService extends MybatisBaseService -1) { - filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); - } - commonAppendix.setFilePath(filePath); - commonAppendix.setLinkSid(s); - commonAppendix.setAttachType(CommonAttachTypeEnum.VEHBUYBLANK.getAttachType()); - commonAppendixService.save(commonAppendix); + if (commonAppendix != null){ + String filePath = commonAppendix.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendix.setFilePath(filePath); + commonAppendix.setLinkSid(s); + commonAppendix.setAttachType(CommonAttachTypeEnum.VEHBUYBLANK.getAttachType()); + commonAppendixService.save(commonAppendix); + } } return rb.success().setMsg("买断成功"); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java index 96f7129509..a64a4e1560 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java @@ -23,6 +23,7 @@ public class AsBusrepairBillVo { private String mobile; //联系电话 private String entryTime; //进厂日期 private String nodeName; //环节名称 - + private String deptSid; //部门sid + private Boolean isLL; //是否可以领料 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java index e4533f2acf..74a735c7ff 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java @@ -29,6 +29,8 @@ import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService; import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.file.AsFileEnum; +import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; +import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables; import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign; import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum; @@ -113,6 +115,8 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService listPage(PagerQuery pagerQuery) { AsBusclaimInvoiceBillQuery query = pagerQuery.getParams(); @@ -548,8 +552,24 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService exportExcel(@Param(Constants.WRAPPER)QueryWrapper qw); IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + BusrepairInfo getInventoryInfo(String sid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml index 696c52a1ec..452246b54b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml @@ -80,7 +80,7 @@ a.sid AS billSid, a.billNo, a.billType AS billTypeValue, - a.`subject` AS subjectValue, + a.subject AS subjectValue, a.customerName, v.vehMark, v.vinNo, @@ -93,7 +93,8 @@ END AS isGoOut, a.mobile, a.entryTime, - a.nodeName + a.nodeName, + a.deptSid FROM as_busrepair_bill AS a LEFT JOIN as_busrepair_bill_vech AS v ON a.sid = v.billSid diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java index ccf2cc0cec..a31ac2cdb5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java @@ -32,6 +32,7 @@ import com.yxt.anrui.as.feign.wms.wmsInventoryrecord.WmsInventoryRecordFeign; import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDetailDto; import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDto; import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillFeign; +import com.yxt.anrui.as.feign.wms.wmsinventorycheckbill.WmsInventoryCheckBillFegin; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -63,7 +64,7 @@ public class AsBusrepairInventorybillService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.listPage(page, qw); + for (AsBusrepairBillVo record : pagging.getRecords()) { + Integer count = wmsInventoryCheckBillFegin.selPdByDeptSid(record.getDeptSid()).getData(); + if (count > 0) { + record.setIsLL(false); + } else if (count == 0) { + record.setIsLL(true); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java index 52929637c0..e5539d2665 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java @@ -25,52 +25,38 @@ *********************************************************/ package com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed; - import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-fin(销售相关)
- * File: FinUncollectedReceivablesDetailedDto.java
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto
- * Description: 应收未收款项明细表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象") @Data public class FinUncollectedReceivablesDetailedDto implements Dto { @ApiModelProperty("应收未收款项sid") private String sid; // 应收未收款项sid - @ApiModelProperty("创建人接口") + @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @ApiModelProperty("合同sid") + @ApiModelProperty("合同sid") private String contractSid; // 合同sid - @ApiModelProperty("合同编号") + @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("客户sid") + @ApiModelProperty("客户sid") private String customerSid; // 客户sid - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String VIN; // 车架号 - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("联系电话") + @ApiModelProperty("联系电话") private String customerPhone; // 联系电话 - @ApiModelProperty("应收项目名称") + @ApiModelProperty("应收项目名称") private String receivablesName; // 应收项目名称 - @ApiModelProperty("当前应收金额") + @ApiModelProperty("当前应收金额") private String currentReceivableMoney; // 当前应收金额 @ApiModelProperty("应收金额(不变)") private String reveivableMoney; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 7659d61fb0..7da13665e0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -25,30 +25,14 @@ *********************************************************/ package com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed; -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(应收未收款项明细表)
- * File: FinUncollectedReceivablesDetailedFeign.java
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign
- * Description: 应收未收款项明细表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-12 17:57:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "应收未收款项明细表") @FeignClient( contextId = "anrui-fin-FinUncollectedReceivablesDetailed", @@ -57,7 +41,6 @@ import java.util.List; fallback = FinUncollectedReceivablesDetailedFeignFallback.class) public interface FinUncollectedReceivablesDetailedFeign { - @ApiOperation("新增或修改保存") @PostMapping("/saveOrUpdate") public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsinventorycheckbill/WmsInventoryCheckBillFegin.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsinventorycheckbill/WmsInventoryCheckBillFegin.java new file mode 100644 index 0000000000..a1340bf21b --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsinventorycheckbill/WmsInventoryCheckBillFegin.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.as.feign.wms.wmsinventorycheckbill; + +import com.yxt.anrui.as.feign.wms.wmsInventory.*; +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; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient( + contextId = "yxt-wms-WmsInventoryCheckBill", + name = "yxt-wms", + path = "v1/wmsinventorycheckbill" +) +public interface WmsInventoryCheckBillFegin { + + @ApiOperation("查询本部门下是否有盘点中的商品") + @PostMapping("/selPdByDeptSid") + public ResultBean selPdByDeptSid(@RequestParam("deptSid") String deptSid); +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index 5a1edd628b..6df71ebdfd 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -129,6 +129,14 @@ public class WmsInventoryCheckbillRest { return rb.success().setData(pv); } + @ApiOperation("查询本部门下是否有盘点中的商品") + @PostMapping("/selPdByDeptSid") + public ResultBean selPdByDeptSid(@RequestParam("deptSid") String deptSid){ + ResultBean rb = ResultBean.fireFail(); + Integer count = wmsInventoryCheckbillService.selPdByDeptSid(deptSid); + return rb.success().setData(count); + } + /*********************************************************移动端************************************************************/ @ApiOperation("app-盘点-查看库位盘点列表") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java index 9e6d4b9511..db05713f41 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java @@ -72,4 +72,7 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper selPkByDeptSid(@Param("deptSid") String deptSid, @Param("warehouseTypeKey") String warehouseTypeKey); int getToDoNum(String userSid); + + @Select("SELECT COUNT(*) FROM wms_inventory_checkbill WHERE deptSid = #{deptSid} AND checkState = 1") + Integer selPdByDeptSid(String deptSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 3a33501346..5cbc8dda58 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -969,4 +969,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService