diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml index 99468ca28c..c228a86ab7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml @@ -25,6 +25,7 @@ bvoa.mobile, bvo.materialName, bvo.materialCode, + bvo.materialSid, bvo.giftsDescription, bvo.salesAllowance, bvo.middleOne, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index a75d03a42f..7c230c06c2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java @@ -235,25 +235,27 @@ public class BaseVehicleOutApplyService extends MybatisBaseService ysSids = finUncollectedReceivablesDetailedFeign.fetchYsSidByOrderVehSid(busSalesOrderVehicle.getSid()).getData(); for (String ysSid : ysSids) { FinSelectedReceivablesDetailed data = finSelectedReceivablesDetailedFeign.fetchByReceivablesSidLimt(ysSid).getData(); - BigDecimal currentReceivableMoney = data.getCurrentReceivableMoney(); - BigDecimal subscriptionMoney = data.getSubscriptionMoney(); - BigDecimal decimal = currentReceivableMoney.subtract(subscriptionMoney); - int i1 = decimal.intValue(); - if (i1 > 0) { - String today = DateUtil.today(); - DateTime currentDate = DateUtil.parse(today); - DateTime saleDateTime = DateUtil.parse(saleDate); - int j = saleDateTime.compareTo(currentDate); - long betweenDay = DateUtil.between(saleDateTime, currentDate, DateUnit.DAY); - record.setQkDate(betweenDay * j * -1); - break; - }else { - String auditDate = data.getAuditDate(); - DateTime auditDateTime = DateUtil.parse(auditDate); - DateTime saleDateTime = DateUtil.parse(saleDate); - int j = saleDateTime.compareTo(auditDateTime); - long betweenDay = DateUtil.between(saleDateTime, auditDateTime, DateUnit.DAY); - record.setQkDate(betweenDay * j * -1); + if (data != null){ + BigDecimal currentReceivableMoney = data.getCurrentReceivableMoney(); + BigDecimal subscriptionMoney = data.getSubscriptionMoney(); + BigDecimal decimal = currentReceivableMoney.subtract(subscriptionMoney); + int i1 = decimal.intValue(); + if (i1 > 0) { + String today = DateUtil.today(); + DateTime currentDate = DateUtil.parse(today); + DateTime saleDateTime = DateUtil.parse(saleDate); + int j = saleDateTime.compareTo(currentDate); + long betweenDay = DateUtil.between(saleDateTime, currentDate, DateUnit.DAY); + record.setQkDate(betweenDay * j * -1); + break; + }else { + String auditDate = data.getAuditDate(); + DateTime auditDateTime = DateUtil.parse(auditDate); + DateTime saleDateTime = DateUtil.parse(saleDate); + int j = saleDateTime.compareTo(auditDateTime); + long betweenDay = DateUtil.between(saleDateTime, auditDateTime, DateUnit.DAY); + record.setQkDate(betweenDay * j * -1); + } } } } else { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailDetailsVo.java index 4e0a2c44af..0ef5976974 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailDetailsVo.java @@ -25,33 +25,23 @@ *********************************************************/ package com.yxt.anrui.terminal.api.wms.inventoryprofitout; - import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-wms(盘库)
- * File: WmsInventoryProfitinDetailVo.java
- * Class: com.yxt.wms.api.wmsinventoryprofitindetail.WmsInventoryProfitinDetailVo
- * Description: 盘盈入库-明细 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-07 16:58:17
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ +import java.math.BigDecimal; + @Data -@ApiModel(value = "盘盈入库-明细 视图数据详情", description = "盘盈入库-明细 视图数据详情") +@ApiModel(value = "盘亏出库-明细 视图数据详情", description = "盘亏出库-明细 视图数据详情") public class AppInventoryProfitoutDetailDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("主表sid") - private String mainSid; + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID @ApiModelProperty("图号") private String goodsCode; @ApiModelProperty("商品spuSid") @@ -64,23 +54,26 @@ public class AppInventoryProfitoutDetailDetailsVo implements Vo { private String goodsName; @ApiModelProperty("规格") private String goodsSpec; - @ApiModelProperty("入库数量(默认盘盈数量)") - private String inStorageNum; @ApiModelProperty("入库单价") private String inStoragePrice; - @ApiModelProperty("盘盈数量") - private String pyNum; + @ApiModelProperty("盘亏数量") + private String pkNum; @ApiModelProperty("厂家sid") private String manufacturerSid; @ApiModelProperty("厂家名称") private String manufacturerName; @ApiModelProperty("单位") private String unit; // 单位 - @ApiModelProperty("供应商sid") - private String supplierSid; // 供应商sid - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("库位名称") + private String warehouseRackName; // 库位名称 + @ApiModelProperty("出库数量") + private BigDecimal outStorageNum; // 出库数量 private String money; - } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailsVo.java index 475e704a4b..802256240b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailsVo.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; @Data -@ApiModel(value = "盘盈入库申请 视图数据详情", description = "盘盈入库申请 视图数据详情") +@ApiModel(value = "盘亏出库申请 视图数据详情", description = "盘亏出库申请 视图数据详情") public class AppInventoryProfitoutDetailsVo implements Vo { private String sid; // sid @@ -43,20 +43,20 @@ public class AppInventoryProfitoutDetailsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("申请日期") private Date createTime; - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请人sid") private String createBySid; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 - @ApiModelProperty("业务类型") - private String businessVaule; // 业务类型 + @ApiModelProperty("业务类型") + private String businessValue; // 业务类型 @ApiModelProperty("盘点单sid") private String sourceBillSid; // 盘点单sid @ApiModelProperty("盘点单号") @@ -64,19 +64,19 @@ public class AppInventoryProfitoutDetailsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeId; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty private List goodsList; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitout/WmsInventoryProfitoutService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitout/WmsInventoryProfitoutService.java index 97308b2872..ef6f076016 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitout/WmsInventoryProfitoutService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitout/WmsInventoryProfitoutService.java @@ -30,8 +30,9 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.wms.inventoryprofitout.AppInventoryProfitoutDetailDetailsVo; import com.yxt.anrui.terminal.api.wms.inventoryprofitout.AppInventoryProfitoutDetailsVo; +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; @@ -43,6 +44,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Collections; import java.util.List; @@ -61,6 +64,10 @@ public class WmsInventoryProfitoutService { WmsInventoryProfitoutDetailsVo data = wmsInventoryProfitoutFeign.fetchDetailsBySid(sid).getData(); AppInventoryProfitoutDetailsVo appInventoryProfitoutDetailsVo = new AppInventoryProfitoutDetailsVo(); BeanUtil.copyProperties(data,appInventoryProfitoutDetailsVo); + List goodsList = appInventoryProfitoutDetailsVo.getGoodsList(); + for (AppInventoryProfitoutDetailDetailsVo appInventoryProfitoutDetailDetailsVo : goodsList) { + appInventoryProfitoutDetailDetailsVo.setMoney(appInventoryProfitoutDetailDetailsVo.getOutStorageNum().multiply(new BigDecimal(appInventoryProfitoutDetailDetailsVo.getInStoragePrice())).setScale(2, RoundingMode.HALF_UP).toString()); + } return rb.success().setData(appInventoryProfitoutDetailsVo); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java index 4e5861d7e9..6ca8d91ad1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java @@ -89,4 +89,23 @@ public class AsBusrepairInventorybillDetail extends BaseEntity { @ApiModelProperty("接收时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date receivedTime; + + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("旧件ID") + private String oldGoodsID; + @ApiModelProperty("旧件图号") + private String oldGoodsSkuCode; + @ApiModelProperty("库存sid") + private String oldInventorySid; + @ApiModelProperty("成本价") + private BigDecimal cost; + @ApiModelProperty("成本合计") + private BigDecimal costTotal; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java index afd146ed83..9a0fd513c1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java @@ -57,17 +57,29 @@ public class AsOldparthandle extends BaseEntity { @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("商品ID") - private String goodsSkuId; // 商品ID - @ApiModelProperty("商品名称") - private String goodsSkuName; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("供应商") - private String supplierName; - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 + private String goodsID; // 商品ID + @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 String unit; // 单位 + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") @@ -78,5 +90,6 @@ public class AsOldparthandle extends BaseEntity { private String warehouseRackCode; // 库位编码 @ApiModelProperty("数量") private BigDecimal count; // 数量 - + @ApiModelProperty("收益金额") + private BigDecimal profit; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java index 2f642113d7..24b64bfd29 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java @@ -57,18 +57,30 @@ public class AsOldparthandleDetailsVo implements Vo { private String mainSid; // 主表sid @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("商品ID") - private String goodsSkuId; // 商品ID - @ApiModelProperty("商品名称") - private String goodsSkuName; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("供应商") - private String supplierName; - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("单位") + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @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 String unit; // 单位 + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") @@ -79,5 +91,6 @@ public class AsOldparthandleDetailsVo implements Vo { private String warehouseRackCode; // 库位编码 @ApiModelProperty("数量") private BigDecimal count; // 数量 - + @ApiModelProperty("收益金额") + private BigDecimal profit; } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java index 659f18b022..64910eb183 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java @@ -57,18 +57,30 @@ public class AsOldparthandleDto implements Dto { private String mainSid; // 主表sid @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("商品ID") - private String goodsSkuId; // 商品ID - @ApiModelProperty("商品名称") - private String goodsSkuName; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("供应商") - private String supplierName; - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("单位") + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @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 String unit; // 单位 + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") @@ -79,5 +91,6 @@ public class AsOldparthandleDto implements Dto { private String warehouseRackCode; // 库位编码 @ApiModelProperty("数量") private BigDecimal count; // 数量 - + @ApiModelProperty("收益金额") + private BigDecimal profit; } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java index 0c042b2175..ef548b6b3a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java @@ -54,7 +54,7 @@ public class AsOldparthandleApplyQuery implements Query { @ApiModelProperty("分公司名称") private String useOrgName; @ApiModelProperty("申请部门") - private String deptName; + private String createDeptName; @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("单据编号") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java index 546054a8ae..5516d14662 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java @@ -73,6 +73,8 @@ public class AsOldparthandleApplyVo implements Vo { private String handleReasonValue; @ApiModelProperty("处理方式value") private String handleModeValue; + @ApiModelProperty("收益总额") + private String profitTotal; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturn.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturn.java index c9f76083f5..91700c4fd0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturn.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturn.java @@ -56,16 +56,30 @@ public class AsOldpartreturn extends BaseEntity { private String mainSid; @ApiModelProperty("车架号") private String vinNo; - @ApiModelProperty("厂家") + @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 String goodsSkuName; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("单位") - private String unit; // 单位 + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("维修单号") + private String sourceBillNo; + @ApiModelProperty("索赔单号") + private String claimBillNo; + @ApiModelProperty("是否迟返(1是0否)") + private String isCf; @ApiModelProperty("需返厂数量") private BigDecimal needReturnCount; // 需返厂数量 @ApiModelProperty("实际返厂数量") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java index 046afbedbd..6c04ea718f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.as.api.asoldpartreturn; +import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * Project: anrui-as(旧件返厂)
@@ -59,19 +61,32 @@ public class AsOldpartreturnDetailsVo implements Vo { private String mainSid; @ApiModelProperty("车架号") private String vinNo; - @ApiModelProperty("厂家") + @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 String goodsSkuName; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("单位") - private String unit; // 单位 + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("维修单号") + private String sourceBillNo; + @ApiModelProperty("索赔单号") + private String claimBillNo; + @ApiModelProperty("是否迟返(1是0否)") + private String isCf; @ApiModelProperty("需返厂数量") private BigDecimal needReturnCount; // 需返厂数量 @ApiModelProperty("实际返厂数量") private BigDecimal actualReturnCount; // 实际返厂数量 - } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDto.java index 9f11f06b1b..4fb22ce2d9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.as.api.asoldpartreturn; +import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; @@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * Project: anrui-as(旧件返厂)
@@ -59,19 +61,32 @@ public class AsOldpartreturnDto implements Dto { private String mainSid; @ApiModelProperty("车架号") private String vinNo; - @ApiModelProperty("厂家") + @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 String goodsSkuName; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("单位") - private String unit; // 单位 + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("维修单号") + private String sourceBillNo; + @ApiModelProperty("索赔单号") + private String claimBillNo; + @ApiModelProperty("是否迟返(1是0否)") + private String isCf; @ApiModelProperty("需返厂数量") private BigDecimal needReturnCount; // 需返厂数量 @ApiModelProperty("实际返厂数量") private BigDecimal actualReturnCount; // 实际返厂数量 - } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnExcelInfo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnExcelInfo.java index 2165e5246f..4e72de866a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnExcelInfo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnExcelInfo.java @@ -8,8 +8,6 @@ import java.math.BigDecimal; @Data public class AsOldpartreturnExcelInfo { - @ApiModelProperty("车架号") - private String vinNo; @ApiModelProperty("商品名称") private String goodsSkuName; @ApiModelProperty("图号") @@ -18,4 +16,8 @@ public class AsOldpartreturnExcelInfo { private String manufacturerName; @ApiModelProperty("需返厂数量") private BigDecimal needReturnCount; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("索赔单号") + private String claimBillNo; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetail.java new file mode 100644 index 0000000000..14fef74a4a --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetail.java @@ -0,0 +1,92 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.asoldpartreturndetail; + +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-as(旧件)
+ * File: AsOldpartreturnDetail.java
+ * Class: com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetail
+ * Description: 返厂旧件列表明细.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-08-23 09:18:45
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "返厂旧件列表明细", description = "返厂旧件列表明细") +@TableName("as_oldpartreturn_detail") +public class AsOldpartreturnDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品spusid") + private String goodsSpuSid; // 商品spusid + @ApiModelProperty("商品spu名称") + private String goodsSpuName; // 商品spu名称 + @ApiModelProperty("商品skusid") + private String goodsSkuSid; // 商品skusid + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; // 商品sku名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + @ApiModelProperty("厂商sid") + private String manufacturerSid; // 厂商sid + @ApiModelProperty("厂商名称") + private String manufacturerName; // 厂商名称 + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; // 规格 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("库区sid") + private String warehouseAreaSid; // 库区sid + @ApiModelProperty("库区名称") + private String warehouseAreaName; // 库区名称 + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("库位名称") + private String warehouseRackName; // 库位名称 + @ApiModelProperty("库存数量") + private BigDecimal count; // 库存数量 + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetailDetailsVo.java similarity index 63% rename from yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java rename to yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetailDetailsVo.java index ded77f7ffe..b16a555308 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetailDetailsVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.as.api.asoldparthandle; +package com.yxt.anrui.as.api.asoldpartreturndetail; import com.yxt.common.core.vo.Vo; @@ -35,36 +35,42 @@ import lombok.Data; import java.math.BigDecimal; /** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleVo.java
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo
- * Description: 处理旧件列表 视图数据对象.
+ * Project: yxt-as(旧件)
+ * File: AsOldpartreturnDetailVo.java
+ * Class: com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailVo
+ * Description: 返厂旧件列表明细 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
+ * Makedate: 2024-08-23 09:18:46
* * @author liupopo * @version 1.0 * @since 1.0 */ @Data -@ApiModel(value = "处理旧件列表 视图数据对象", description = "处理旧件列表 视图数据对象") -public class AsOldparthandleVo implements Vo { +@ApiModel(value = "返厂旧件列表明细 视图数据详情", description = "返厂旧件列表明细 视图数据详情") +public class AsOldpartreturnDetailDetailsVo implements Vo { private String sid; // sid @ApiModelProperty("主表sid") private String mainSid; // 主表sid - @ApiModelProperty("车架号") - private String vinNo; // 车架号 @ApiModelProperty("商品ID") - private String goodsSkuId; // 商品ID - @ApiModelProperty("商品名称") - private String goodsSkuName; // 商品名称 + private String goodsID; // 商品ID + @ApiModelProperty("商品spusid") + private String goodsSpuSid; // 商品spusid + @ApiModelProperty("商品spu名称") + private String goodsSpuName; // 商品spu名称 + @ApiModelProperty("商品skusid") + private String goodsSkuSid; // 商品skusid + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; // 商品sku名称 @ApiModelProperty("图号") private String goodsSkuCode; // 图号 - @ApiModelProperty("供应商") - private String supplierName; + @ApiModelProperty("厂商sid") + private String manufacturerSid; // 厂商sid + @ApiModelProperty("厂商名称") + private String manufacturerName; // 厂商名称 @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 @ApiModelProperty("单位") @@ -73,11 +79,15 @@ public class AsOldparthandleVo implements Vo { private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 + @ApiModelProperty("库区sid") + private String warehouseAreaSid; // 库区sid + @ApiModelProperty("库区名称") + private String warehouseAreaName; // 库区名称 @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位编码") - private String warehouseRackCode; // 库位编码 - @ApiModelProperty("数量") - private BigDecimal count; // 数量 + @ApiModelProperty("库位名称") + private String warehouseRackName; // 库位名称 + @ApiModelProperty("库存数量") + private BigDecimal count; // 库存数量 -} +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetailDto.java similarity index 61% rename from yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java rename to yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetailDto.java index 31a2e0af5c..c5bee719e7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetailDto.java @@ -23,10 +23,10 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.as.api.asoldparthandle; +package com.yxt.anrui.as.api.asoldpartreturndetail; -import com.yxt.common.core.query.Query; +import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,34 +35,42 @@ import lombok.Data; import java.math.BigDecimal; /** - * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleQuery.java
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery
- * Description: 处理旧件列表 查询条件.
+ * Project: yxt-as(旧件)
+ * File: AsOldpartreturnDetailDto.java
+ * Class: com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDto
+ * Description: 返厂旧件列表明细 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
+ * Makedate: 2024-08-23 09:18:45
* * @author liupopo * @version 1.0 * @since 1.0 */ @Data -@ApiModel(value = "处理旧件列表 查询条件", description = "处理旧件列表 查询条件") -public class AsOldparthandleQuery implements Query { +@ApiModel(value = "返厂旧件列表明细 数据传输对象", description = "返厂旧件列表明细 数据传输对象") +public class AsOldpartreturnDetailDto implements Dto { + + private String sid; // sid @ApiModelProperty("主表sid") private String mainSid; // 主表sid - @ApiModelProperty("车架号") - private String vinNo; // 车架号 @ApiModelProperty("商品ID") - private String goodsSkuId; // 商品ID - @ApiModelProperty("商品名称") - private String goodsSkuName; // 商品名称 + private String goodsID; // 商品ID + @ApiModelProperty("商品spusid") + private String goodsSpuSid; // 商品spusid + @ApiModelProperty("商品spu名称") + private String goodsSpuName; // 商品spu名称 + @ApiModelProperty("商品skusid") + private String goodsSkuSid; // 商品skusid + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; // 商品sku名称 @ApiModelProperty("图号") private String goodsSkuCode; // 图号 - @ApiModelProperty("供应商") - private String supplierName; + @ApiModelProperty("厂商sid") + private String manufacturerSid; // 厂商sid + @ApiModelProperty("厂商名称") + private String manufacturerName; // 厂商名称 @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 @ApiModelProperty("单位") @@ -71,11 +79,15 @@ public class AsOldparthandleQuery implements Query { private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 + @ApiModelProperty("库区sid") + private String warehouseAreaSid; // 库区sid + @ApiModelProperty("库区名称") + private String warehouseAreaName; // 库区名称 @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位编码") - private String warehouseRackCode; // 库位编码 - @ApiModelProperty("数量") - private BigDecimal count; // 数量 + @ApiModelProperty("库位名称") + private String warehouseRackName; // 库位名称 + @ApiModelProperty("库存数量") + private BigDecimal count; // 库存数量 -} +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java index e8afd868b9..94500862f7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java @@ -2,6 +2,7 @@ package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; +import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -23,4 +24,6 @@ public interface AsBusrepairInventorybillDetailMapper extends BaseMapper getGoodsDetailsByBillSid(@Param("sid") String sid); List getGoodsDetailsByBillSidForBack(@Param("sid") String sid); + + AsOldpartreturnDetailsVo selByGdSidAndOldCode(@Param("repairBillSid") String repairBillSid,@Param("goodsSkuCode") String goodsSkuCode); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml index 000a1d2784..0c29f0e203 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml @@ -43,4 +43,24 @@ -- GROUP BY -- d.goodsID,d.sitemSid + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java index bf43469cf2..7893ac4349 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybill; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto; +import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo; import com.yxt.anrui.as.biz.asbusrepairinventorybill.AsBusrepairInventorybillService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; @@ -68,4 +69,8 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService - * File: AsOldparthandleMapper.java
- * Class: com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleMapper
- * Description: 处理旧件列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface AsOldparthandleMapper extends BaseMapper { - //@Update("update as_oldparthandle set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from as_oldparthandle") - List selectListVo(); - @Delete("delete from as_oldparthandle where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleMapper.xml index ccf488b567..75ce4e6af0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleRest.java index 199888de70..20a3715a3b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleRest.java @@ -33,8 +33,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery; -import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; @@ -56,38 +54,4 @@ import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; @RequestMapping("v1/asoldparthandle") public class AsOldparthandleRest{ - @Autowired - private AsOldparthandleService asOldparthandleService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = asOldparthandleService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody AsOldparthandleDto dto){ - ResultBean rb = ResultBean.fireFail(); - asOldparthandleService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") - @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - asOldparthandleService.delBySids(sids); - return rb.success(); - } - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - AsOldparthandleDetailsVo vo = asOldparthandleService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java index 0ddd805555..5b27bee245 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java @@ -34,8 +34,6 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle; -import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery; -import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; @@ -58,26 +56,7 @@ import java.util.List; */ @Service public class AsOldparthandleService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(AsOldparthandleQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { - AsOldparthandleQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(AsOldparthandleDto dto) { - this.insertByDto(dto); - return; - } public void insertByDto(AsOldparthandleDto dto) { AsOldparthandle entity = new AsOldparthandle(); @@ -85,23 +64,6 @@ public class AsOldparthandleService extends MybatisBaseService diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java index 5a291f6be1..964b94c828 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java @@ -155,8 +155,8 @@ public class AsOldparthandleApplyService extends MybatisBaseService= date_format('" + finishStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" ); + qw.groupBy("aoa.sid"); + qw.orderByDesc("aoa.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -210,7 +212,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService { - //@Update("update as_oldpartreturn set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from as_oldpartreturn") - List selectListVo(); - @Delete("delete from as_oldpartreturn where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnMapper.xml index f0118dcb29..21cf9e983c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnRest.java index 1dd86d617a..3e38bdb23b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnRest.java @@ -33,8 +33,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnQuery; -import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto; @@ -56,38 +54,4 @@ import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto; @RequestMapping("v1/asoldpartreturn") public class AsOldpartreturnRest { - @Autowired - private AsOldpartreturnService asOldpartreturnService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = asOldpartreturnService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody AsOldpartreturnDto dto){ - ResultBean rb = ResultBean.fireFail(); - asOldpartreturnService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") - @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - asOldpartreturnService.delBySids(sids); - return rb.success(); - } - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - AsOldpartreturnDetailsVo vo = asOldpartreturnService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java index e084b301ef..2c3450c6e5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java @@ -34,8 +34,6 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturn; -import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnQuery; -import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto; @@ -59,41 +57,11 @@ import java.util.List; @Service public class AsOldpartreturnService extends MybatisBaseService { - public PagerVo listPageVo(PagerQuery pq) { - AsOldpartreturnQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(AsOldpartreturnDto dto) { - this.insertByDto(dto); - return; - } - - public void insertByDto(AsOldpartreturnDto dto) { + public String insertByDto(AsOldpartreturnDto dto) { AsOldpartreturn entity = new AsOldpartreturn(); BeanUtil.copyProperties(dto, entity, "id", "sid"); baseMapper.insert(entity); - } - - public void updateByDto(AsOldpartreturnDto dto) { - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - AsOldpartreturn entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public AsOldpartreturnDetailsVo fetchDetailsVoBySid(String sid) { - AsOldpartreturn entity = fetchBySid(sid); - AsOldpartreturnDetailsVo vo = new AsOldpartreturnDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; + return entity.getSid(); } public void delByMainSid(String dtoSid) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java index 8ab3b090fc..0dbe20d7d8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java @@ -34,12 +34,18 @@ import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply; import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo; import com.yxt.anrui.as.api.asarrearsoutapply.flowable.AsArrearsoutApplyNodeVo; import com.yxt.anrui.as.api.asarrearsoutapply.flowable.SubmitAsArrearsoutApplyDto; +import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnExcelInfo; import com.yxt.anrui.as.api.asoldpartreturn.ReturnExcelInfo; import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*; +import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDto; +import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService; +import com.yxt.anrui.as.biz.asbusrepairinventorybill.AsBusrepairInventorybillService; +import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService; import com.yxt.anrui.as.biz.asoldpartreturn.AsOldpartreturnService; +import com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailService; import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.flowable.flow.*; import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery; @@ -55,6 +61,8 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryFeign; +import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryReturnFactSelectList; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -78,6 +86,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; @@ -126,7 +135,15 @@ public class AsOldpartreturnApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AsOldpartreturnApplyQuery query = pq.getParams(); @@ -238,7 +255,14 @@ public class AsOldpartreturnApplyService extends MybatisBaseService data = wmsInventoryFeign.selBillNoAndCode(asOldpartreturnDto.getSourceBillNo(), asOldpartreturnDto.getGoodsSkuCode(), deptSid).getData(); + for (WmsInventoryReturnFactSelectList datum : data) { + AsOldpartreturnDetailDto asOldpartreturnDetailDto = new AsOldpartreturnDetailDto(); + BeanUtil.copyProperties(datum,asOldpartreturnDetailDto); + asOldpartreturnDetailDto.setMainSid(detailSid); + asOldpartreturnDetailService.insertByDto(asOldpartreturnDetailDto); + } } return sid; } @@ -246,7 +270,7 @@ public class AsOldpartreturnApplyService extends MybatisBaseService - * File: AsOldpartreturnQuery.java
- * Class: com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnQuery
- * Description: 返厂旧件列表 查询条件.
+ * Project: yxt-as(旧件)
+ * File: AsOldpartreturnDetailMapper.java
+ * Class: com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailMapper
+ * Description: 返厂旧件列表明细.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-17 10:29:50
+ * Makedate: 2024-08-23 09:18:46
* * @author liupopo * @version 1.0 * @since 1.0 */ -@Data -@ApiModel(value = "返厂旧件列表 查询条件", description = "返厂旧件列表 查询条件") -public class AsOldpartreturnQuery implements Query { - - @ApiModelProperty("商品名称") - private String goodsSkuName; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("单位") - private String unit; // 单位 - @ApiModelProperty("需返厂数量") - private BigDecimal needReturnCount; // 需返厂数量 - @ApiModelProperty("实际返厂数量") - private BigDecimal actualReturnCount; // 实际返厂数量 +@Mapper +public interface AsOldpartreturnDetailMapper extends BaseMapper { -} +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailMapper.xml new file mode 100644 index 0000000000..979090fa04 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailRest.java similarity index 68% rename from yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java rename to yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailRest.java index b9ce43bd4c..55b034a75f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailRest.java @@ -23,42 +23,35 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.as.feign.wms.wmsInventory; +package com.yxt.anrui.as.biz.asoldpartreturndetail; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Component; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo; +import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDto; /** - * Project: anrui-fin(安瑞财务)
- * File: FinManufacturerBankFeignFallback.java
- * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeignFallback
- * Description: 公司开户账号表.
+ * Project: yxt-as(旧件)
+ * File: AsOldpartreturnDetailFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailRest
+ * Description: 返厂旧件列表明细.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-03 15:00:11
+ * Makedate: 2024-08-23 09:18:46
* * @author liupopo * @version 1.0 * @since 1.0 */ -@Component -public class WmsInventoryFeignFallback implements WmsInventoryFeign { - - - @Override - public ResultBean> getPackageGoodsVo(PagerQuery pq) { - return null; - } - - @Override - public ResultBean updateInventoryCount(WmsUpdateCountQuery query) { - return null; - } +@Api(tags = "返厂旧件列表明细") +@RestController +@RequestMapping("v1/asoldpartreturndetail") +public class AsOldpartreturnDetailRest { - @Override - public ResultBean fetchEntityBySid(String sid) { - return null; - } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailService.java similarity index 55% rename from yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnVo.java rename to yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailService.java index 75e23a223b..507eda7899 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailService.java @@ -23,47 +23,41 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.as.api.asoldpartreturn; - - -import com.yxt.common.core.vo.Vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; +package com.yxt.anrui.as.biz.asoldpartreturndetail; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.vo.PagerVo; +import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetail; +import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo; +import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDto; + +import org.springframework.stereotype.Service; /** - * Project: anrui-as(旧件返厂)
- * File: AsOldpartreturnVo.java
- * Class: com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo
- * Description: 返厂旧件列表 视图数据对象.
+ * Project: yxt-as(旧件)
+ * File: AsOldpartreturnDetailService.java
+ * Class: com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailService
+ * Description: 返厂旧件列表明细 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-17 10:29:50
+ * Makedate: 2024-08-23 09:18:46
* * @author liupopo * @version 1.0 * @since 1.0 */ -@Data -@ApiModel(value = "返厂旧件列表 视图数据对象", description = "返厂旧件列表 视图数据对象") -public class AsOldpartreturnVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("商品名称") - private String goodsSkuName; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("单位") - private String unit; // 单位 - @ApiModelProperty("需返厂数量") - private BigDecimal needReturnCount; // 需返厂数量 - @ApiModelProperty("实际返厂数量") - private BigDecimal actualReturnCount; // 实际返厂数量 - -} +@Service +public class AsOldpartreturnDetailService extends MybatisBaseService { + + public void insertByDto(AsOldpartreturnDetailDto dto){ + AsOldpartreturnDetail entity = new AsOldpartreturnDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java index 70a5018c71..20a431d95a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java @@ -9,6 +9,8 @@ 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; + /** * @description: 商品基础信息 * @author: fzz @@ -17,8 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam; @FeignClient( contextId = "yxt-wms-WmsInventory", name = "yxt-wms", - path = "apiadmin/inventory/wmsinventory", - fallback = WmsInventoryFeignFallback.class + path = "apiadmin/inventory/wmsinventory" ) public interface WmsInventoryFeign { @@ -33,4 +34,8 @@ public interface WmsInventoryFeign { @ApiOperation("根据Sid获取库存实体") @PostMapping("/fetchEntityBySid") ResultBean fetchEntityBySid(@RequestParam("sid") String sid); + + @ApiOperation("根据维修单号和旧件图号查询旧件库存") + @PostMapping("/selBillNoAndCode") + ResultBean> selBillNoAndCode(@RequestParam("sourceBillNo") String sourceBillNo,@RequestParam("goodsSkuCode") String goodsSkuCode,@RequestParam("deptSid") String deptSid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryReturnFactSelectList.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryReturnFactSelectList.java new file mode 100644 index 0000000000..a688168138 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryReturnFactSelectList.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.as.feign.wms.wmsInventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WmsInventoryReturnFactSelectList { + + //商品ID + private String goodsID; + //商品spuSid + private String goodsSpuSid; + //商品spu名称 + private String goodsSpuName; + //商品Skusid + private String goodsSkuSid; + //商品sku名称 + private String goodsSkuTitle; + //图号 + private String goodsSkuCode; + //规格 + private String goodsSkuOwnSpec; + //厂家sid + private String manufacturerSid; + //厂家名称 + private String manufacturerName; + //单位 + private String unit; + //仓库sid + private String warehouseSid; + //仓库名称 + private String warehouseName; + //库区sid + private String warehouseAreaSid; + //库区名称 + private String warehouseAreaName; + //库位sid + private String warehouseRackSid; + //库位名称 + private String warehouseRackName; + //库存数量 + private String count; + //车架号 + private String vinNo; + //维修单号 + private String sourceBillNo; +} diff --git a/yxt-as/src/main/resources/static/旧件返厂商品列表.xls b/yxt-as/src/main/resources/static/旧件返厂商品列表.xls index 99b9e12f3a..3847324423 100644 Binary files a/yxt-as/src/main/resources/static/旧件返厂商品列表.xls and b/yxt-as/src/main/resources/static/旧件返厂商品列表.xls differ diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java index e678db5cb9..8bfd69bbdc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java @@ -202,6 +202,18 @@ public class WmsInventoryRest { return wmsInventoryService.handleGoodsListPage(pq); } + @ApiOperation("旧件返厂商品分页列表") + @PostMapping("/returnFactGoodsListPage") + public ResultBean> returnFactGoodsListPage(@RequestBody PagerQuery pq) { + return wmsInventoryService.returnFactGoodsListPage(pq); + } + + @ApiOperation("根据维修单号和旧件图号查询旧件库存") + @PostMapping("/selBillNoAndCode") + ResultBean> selBillNoAndCode(@RequestParam("sourceBillNo") String sourceBillNo,@RequestParam("goodsSkuCode") String goodsSkuCode,@RequestParam("deptSid") String deptSid){ + return wmsInventoryService.selBillNoAndCode(sourceBillNo,goodsSkuCode,deptSid); + }; + @ApiOperation("根据Sid获取库存实体") @PostMapping("/fetchEntityBySid") ResultBean fetchEntityBySid(@RequestParam("sid") String sid) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java index 05b6f45c22..ef6ab23a80 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java @@ -1,5 +1,6 @@ package com.yxt.wms.biz.inventory.wmsinventory; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -12,16 +13,28 @@ public class WmsInventoryHandleSelectList { //商品ID private String goodsID; - //商品名称 + //商品spuSid + private String goodsSpuSid; + //商品spu名称 private String goodsSpuName; + //商品Skusid + private String goodsSkuSid; + //商品sku名称 + private String goodsSkuTitle; //图号 private String goodsSkuCode; - //供应商 - private String supplierName; //规格 private String goodsSkuOwnSpec; - //商品单位 + //厂家sid + private String manufacturerSid; + //厂家名称 + private String manufacturerName; + //单位 private String unit; + //供应商sid + private String supplierSid; + //供应商名称 + private String supplierName; //仓库sid private String warehouseSid; //仓库名称 @@ -32,4 +45,10 @@ public class WmsInventoryHandleSelectList { private String warehouseRackCode; //库存数量 private String count; + //单价 + private String price; + //维修单号 + private String sourceBillNo; + //车架号 + private String vinNo; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java index d4036753a9..e2ca47aa46 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java @@ -12,7 +12,7 @@ import lombok.Data; public class WmsInventoryHandleSelectQuery implements Query { //组织sid - private String orgSid; + private String orgPath; //商品名称 private String goodsName; //图号 @@ -23,4 +23,6 @@ public class WmsInventoryHandleSelectQuery implements Query { private String warehouseRackCode; //供应商 private String supplierName; + //厂商 + private String manufacturerName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index 7e3a39ff82..10df4ff24d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -71,6 +71,10 @@ public interface WmsInventoryMapper extends BaseMapper { IPage selInvenGoodsByUseOrgSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage returnFactGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selBillNoAndCode(@Param("sourceBillNo") String sourceBillNo,@Param("goodsSkuCode") String goodsSkuCode,@Param("deptSid") String deptSid); + IPage fittingsInventory(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List appStorage(@Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 0f6ef3e967..7718c52240 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -273,19 +273,35 @@ + + + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryReturnFactSelectList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryReturnFactSelectList.java new file mode 100644 index 0000000000..2673b9c827 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryReturnFactSelectList.java @@ -0,0 +1,51 @@ +package com.yxt.wms.biz.inventory.wmsinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WmsInventoryReturnFactSelectList { + + //商品ID + private String goodsID; + //商品spuSid + private String goodsSpuSid; + //商品spu名称 + private String goodsSpuName; + //商品Skusid + private String goodsSkuSid; + //商品sku名称 + private String goodsSkuTitle; + //图号 + private String goodsSkuCode; + //规格 + private String goodsSkuOwnSpec; + //厂家sid + private String manufacturerSid; + //厂家名称 + private String manufacturerName; + //单位 + private String unit; + //仓库sid + private String warehouseSid; + //仓库名称 + private String warehouseName; + //库区sid + private String warehouseAreaSid; + //库区名称 + private String warehouseAreaName; + //库位sid + private String warehouseRackSid; + //库位名称 + private String warehouseRackName; + //库存数量 + private String count; + //车架号 + private String vinNo; + //维修单号 + private String sourceBillNo; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryReturnFactSelectQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryReturnFactSelectQuery.java new file mode 100644 index 0000000000..ef61551207 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryReturnFactSelectQuery.java @@ -0,0 +1,22 @@ +package com.yxt.wms.biz.inventory.wmsinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WmsInventoryReturnFactSelectQuery implements Query { + + //组织sid + private String orgPath; + //图号 + private String goodsSkuCode; + //车架号 + private String vinNo; + //维修单号 + private String sourceBillNo; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index 71baf1f9fe..c14aa65234 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -32,6 +32,7 @@ import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import java.math.BigDecimal; @@ -494,6 +495,17 @@ public class WmsInventoryService extends MybatisBaseService qw = new QueryWrapper<>(); + String useOrgSid; + List split = Arrays.asList(query.getOrgPath().split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + qw.eq("wi.useOrgSid", useOrgSid); if (StringUtils.isNotBlank(query.getGoodsName())) { qw.like("wi.goodsSpuName", query.getGoodsName()); } @@ -507,8 +519,13 @@ public class WmsInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.handleGoodsListPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -904,4 +921,42 @@ public class WmsInventoryService extends MybatisBaseService> returnFactGoodsListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WmsInventoryReturnFactSelectQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + String useOrgSid; + List split = Arrays.asList(query.getOrgPath().split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + qw.eq("wi.useOrgSid", useOrgSid); + if (StringUtils.isNotBlank(query.getSourceBillNo())) { + qw.eq("ab.billNo", query.getSourceBillNo()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.eq("wi.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.eq("av.vinNo", query.getVinNo()); + } + qw.like("wi.goodsID", "-O"); + qw.gt("wi.count", 0); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.returnFactGoodsListPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean> selBillNoAndCode(String sourceBillNo, String goodsSkuCode,String deptSid) { + ResultBean rb = ResultBean.fireFail(); + List wmsInventoryReturnFactSelectListList = baseMapper.selBillNoAndCode(sourceBillNo,goodsSkuCode,deptSid); + return rb.success().setData(wmsInventoryReturnFactSelectListList); + } }