更改

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());

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;

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyMapper.xml

@@ -19,7 +19,7 @@
     <select id="selectList" resultType="com.yxt.anrui.oa.biz.adseatdetail.AdSeatListDetailVo">
         select sid,
                specialSeat,
-               cause,
+               cause as remarks,
                expectCost,
                costRemarks
         from ad_seat_detail

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailDto.java

@@ -38,7 +38,7 @@ public class AdSeatDetailDto implements Dto {
     @ApiModelProperty("申请交通工具特殊座席")
     private String specialSeat;
     @ApiModelProperty("申请事由及详情")
-    private String cause;
+    private String remarks;
     @ApiModelProperty("预计费用")
     private BigDecimal expectCost;
     @ApiModelProperty("费用明细")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailMapper.xml

@@ -6,7 +6,7 @@
     <select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adseatdetail.AdSeatDetailVo">
         select sid,
                specialSeat,
-               cause,
+               cause as remarks,
                expectCost,
                costRemarks
         from ad_seat_detail

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailService.java

@@ -48,6 +48,7 @@ public class AdSeatDetailService extends MybatisBaseService<AdSeatDetailMapper,
 			list.stream().forEach(details -> {
 				AdSeatDetail adSeatDetail = new AdSeatDetail();
 				BeanUtil.copyProperties(details, adSeatDetail);
+				adSeatDetail.setCause(details.getRemarks());
 				adSeatDetail.setMainSid(sid);
 				baseMapper.insert(adSeatDetail);
 			});

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("费用明细")

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("费用明细")