Merge remote-tracking branch 'origin/master'

oms/src/main/java/com/yxt/oms/biz/func/basebrandinfo/BaseBrandInfoService.java

@@ -9,6 +9,7 @@ import com.yxt.oms.biz.func.commonmethod.CommonMethod;
 import com.yxt.oms.biz.func.commonmethod.DataRule;
 import com.yxt.oms.feign.goods.basebrandinfo.*;
 import com.yxt.oms.utils.OrgPathQuery;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,8 +51,10 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
 }
     public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {
         String urlPrefix = fileUploadComponent.getUrlPrefix();
-        String path = dto.getImage().substring(urlPrefix.length());
-        dto.setImage(path);
+        if (StringUtils.isNotBlank(dto.getImage())){
+            String path = dto.getImage().substring(urlPrefix.length());
+            dto.setImage(path);
+        }
         return baseBrandInfoFeign.saveOrUpdate(dto);
     }
 

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java

@@ -31,6 +31,7 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.oms.biz.func.commonmethod.CommonMethod;
 import com.yxt.oms.biz.func.commonmethod.DataRule;
 import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl;
@@ -209,6 +210,8 @@ public class PurchaseBillService {
                 wmsAnsBillDetailDto.setPrice(purchaseBillDetailDto.getCost().doubleValue());
                 wmsAnsBillDetailDto.setTotalPrice(purchaseBillDetailDto.getCost().doubleValue()*purchaseBillDetailDto.getCount().doubleValue());
                 wmsAnsBillDetailDto.setBatch(purchaseBillDetailDto.getBatchNumber());
+                BaseGoodsSkuVo vo=goodsSkuFeign.initialization(purchaseBillDetailDto.getGoodsSkuSid()).getData();
+                wmsAnsBillDetailDto.setGoodsSpuSid(vo.getGoodsSpuSid());
                 wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto);
             }
             wmsAnsBillDto.setStorageAnsBillDetailList(wmsAnsBillDetailDtos);

oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java

@@ -15,6 +15,7 @@ public class WarehouseAnsBillDetailDto {
     private String sourceBillSid;
     @ApiModelProperty("图示")
     private String illustration;
+    private String goodsSpuSid;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
     @ApiModelProperty("商品名称")

oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java

@@ -9,6 +9,8 @@ import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectQuery;
 import com.yxt.oms.utils.OrgPathQuery;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -31,4 +33,7 @@ public interface BaseGoodsSkuFeign {
     @ApiOperation("采购单选择商品")
     @PostMapping("/purGoodsListPage")
     public ResultBean<PagerVo<GoodsSkuPurSelectList>> purGoodsListPage(@RequestBody PagerQuery<GoodsSkuPurSelectQuery> pq);
+    @ApiOperation("初始化")
+    @GetMapping("/initialization/{sid}")
+    public ResultBean<BaseGoodsSkuVo> initialization(@PathVariable("sid") String sid);
 }

oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java

@@ -27,6 +27,11 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{
         return null;
     }
 
+    @Override
+    public ResultBean<BaseGoodsSkuVo> initialization(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(OrgPathQuery query) {
         return null;