From b7eb8e8432d2fb9eae101c0a9e8ee032c7dc19ad Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 28 Feb 2025 15:00:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/biz/as/firstshelves/AppFirstShelvesService.java | 3 +++ .../oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java | 2 -- .../com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyMapper.xml | 2 +- .../com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailDto.java | 2 +- .../com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailMapper.xml | 2 +- .../com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailService.java | 1 + .../java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailVo.java | 2 +- .../com/yxt/anrui/oa/biz/adseatdetail/AdSeatListDetailVo.java | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java index cacb4f3cc7..08d47d3dde 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java @@ -179,6 +179,9 @@ public class AppFirstShelvesService { for (AppFirstShelvesGoodsDto appFirstShelvesGoodsDto : goodsList) { WmsGoodsTag wmsGoodsTag = wmsGoodsTagFeign.selectByGoodsId(appFirstShelvesGoodsDto.getGoodsID()).getData(); WmsInitialDetail wmsInitialDetail = wmsInitialDetailFeign.selBySid(wmsGoodsTag.getBillDetailSid()).getData(); + if (wmsInitialDetail == null){ + return rb.setMsg("商品" + appFirstShelvesGoodsDto.getGoodsID() + "不存在"); + } WmsHouseInfoVo wmsHouseInfoVo = wmsWarehouseRackFeign.selHouseInfoByFullCode(appFirstShelvesGoodsDto.getHouseCode()).getData(); wmsInventorySaveDto.setGoodsSpuSid(wmsGoodsTag.getGoodsSpuSid()); wmsInventorySaveDto.setGoodsSpuName(wmsGoodsTag.getGoodsSpuName()); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java index 6e66899c54..cb6c210628 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java @@ -26,8 +26,6 @@ package com.yxt.anrui.oa.biz.adsalecarpulapply; import cn.hutool.core.bean.BeanUtil; -import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo; -import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo; import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailDto; import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailService; import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailVo; diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyMapper.xml index 9dea791528..d9e2750590 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyMapper.xml @@ -19,7 +19,7 @@ select sid, specialSeat, - cause, + cause as remarks, expectCost, costRemarks from ad_seat_detail diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailService.java index a239692ff9..9634bf077f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailService.java @@ -48,6 +48,7 @@ public class AdSeatDetailService extends MybatisBaseService { AdSeatDetail adSeatDetail = new AdSeatDetail(); BeanUtil.copyProperties(details, adSeatDetail); + adSeatDetail.setCause(details.getRemarks()); adSeatDetail.setMainSid(sid); baseMapper.insert(adSeatDetail); }); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailVo.java index bb354b2519..614e4059e6 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailVo.java @@ -40,7 +40,7 @@ public class AdSeatDetailVo implements Vo { @ApiModelProperty("申请交通工具特殊座席") private String specialSeat; @ApiModelProperty("申请事由及详情") - private String cause; + private String remarks; @ApiModelProperty("预计费用") private BigDecimal expectCost; @ApiModelProperty("费用明细") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatListDetailVo.java index c9d8dcbf42..e9272beb65 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatListDetailVo.java @@ -40,7 +40,7 @@ public class AdSeatListDetailVo implements Vo { @ApiModelProperty("申请交通工具特殊座席") private String specialSeat; @ApiModelProperty("申请事由及详情") - private String cause; + private String remarks; @ApiModelProperty("预计费用") private BigDecimal expectCost; @ApiModelProperty("费用明细")