From 42fef79280c960ab8c5a3515d91cc7b57b5d8e4c Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Thu, 6 Mar 2025 15:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairInventorybillService.java | 20 ++++++++++++++--- .../WmsInventoryRecordDto.java | 4 ++++ .../biz/smssalesbill/SmsSalesBillService.java | 2 ++ .../WmsInventoryRecordDto.java | 5 ++++- .../inventroy/WmsInventoryRecordRest.java | 4 ++++ .../WmsInventoryRecord.java | 4 ++++ .../WmsInventoryRecordDto.java | 7 +++--- .../WmsInventoryRecordService.java | 22 ++++++------------- .../wmsshelfbill/WmsShelfBillService.java | 7 ++++-- 9 files changed, 51 insertions(+), 24 deletions(-) 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 479d99d7a2..7c4f3e98a9 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 @@ -14,8 +14,6 @@ import com.yxt.anrui.as.api.asbusrepairinventorybill.*; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; -import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo; -import com.yxt.anrui.as.api.enums.AsBillTypeEnum; import com.yxt.anrui.as.api.utils.AsRule; import com.yxt.anrui.as.api.utils.domain.AsBillNo; import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; @@ -40,7 +38,6 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import javassist.Loader; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -263,6 +260,19 @@ public class AsBusrepairInventorybillService extends MybatisBaseService> pageList(@RequestBody PagerQuery pagerQuery){ ResultBean> rb = ResultBean.fireFail(); + WmsInventoryRecordsQuery params = pagerQuery.getParams(); + params.setType("配件库"); + pagerQuery.setParams(params); PagerVo pv = wmsInventoryRecordService.listPage(pagerQuery); return rb.success().setData(pv); } @@ -166,6 +169,7 @@ public class WmsInventoryRecordRest { @PostMapping("/exportExcel") @ApiOperation(value = "出入库记录导出") public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) { + query.setType("配件库"); //得到所有要导出的数据 List exportVoList = wmsInventoryRecordService.listExcel(query); //定义导出的excel名字 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java index c1711ec0fe..c16a827931 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java @@ -118,4 +118,8 @@ public class WmsInventoryRecord extends BaseEntity { private String preBillSid; @ApiModelProperty("前一单编号") private String preBillNo; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String customerName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java index 69c64b6548..26e3bf5156 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java @@ -27,13 +27,10 @@ package com.yxt.wms.biz.inventory.wmsinventoryrecord; 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: wms(yxt)
* File: WmsInventoryRecordDto.java
@@ -128,4 +125,8 @@ public class WmsInventoryRecordDto implements Dto { private String preBillSid; @ApiModelProperty("前一单编号") private String preBillNo; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String customerName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 75a9fca3dc..d77136cde0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -28,28 +28,24 @@ package com.yxt.wms.biz.inventory.wmsinventoryrecord; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +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.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; -import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo; import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*; import com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsListVo; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; -import com.yxt.wms.feign.portal.sysuser.SysUserVo; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -318,9 +314,7 @@ public class WmsInventoryRecordService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.listPage(page, qw); @@ -415,9 +409,7 @@ public class WmsInventoryRecordService extends MybatisBaseService list = baseMapper.listExcel(qw); list.removeAll(Collections.singleton(null)); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index 572ff86fe1..bc4b08edb2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -795,8 +795,9 @@ public class WmsShelfBillService extends MybatisBaseService