销售订单出库列表开发

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java

@@ -55,6 +55,8 @@ public class BusSalesOrderTrailerDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("销售订单sid")
     private String salesOrderSid; // 销售订单sid
 	@ApiModelProperty("挂车类型key")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java

@@ -61,7 +61,7 @@ public interface BusSalesOrderTrailerFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody
-    public ResultBean save(@RequestBody List<BusSalesOrderTrailerDto> dto);
+    public ResultBean save(@RequestBody BusSalesOrderTrailerDto dto);
         
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delete")
@@ -72,4 +72,9 @@ public interface BusSalesOrderTrailerFeign {
     @GetMapping("/fetchDetailsByOrderSid/{orderSid}")
     @ResponseBody
     public ResultBean<List<BusSalesOrderTrailerDetailsVo>> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid);
+
+    @ApiOperation("初始化")
+    @GetMapping("/fetchBySid")
+    @ResponseBody
+    ResultBean<BusSalesOrderTrailer> fetchBySid(@RequestParam("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java

@@ -49,7 +49,7 @@ import java.util.List;
 public class BusSalesOrderTrailerFeignFallback implements BusSalesOrderTrailerFeign {
 
 	@Override
-	public ResultBean save(List<BusSalesOrderTrailerDto> dto) {
+	public ResultBean save(BusSalesOrderTrailerDto dto) {
 		return null;
 	}
 
@@ -62,4 +62,9 @@ public class BusSalesOrderTrailerFeignFallback implements BusSalesOrderTrailerFe
 	public ResultBean<List<BusSalesOrderTrailerDetailsVo>> fetchDetailsByOrderSid(String orderSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<BusSalesOrderTrailer> fetchBySid(String sid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java

@@ -62,4 +62,10 @@ public interface BusSalesOrderTrailerMapper extends BaseMapper<BusSalesOrderTrai
 
 	@Select("select * from bus_sales_order_trailer where salesOrderSid = #{orderSid}")
 	List<BusSalesOrderTrailerDetailsVo> fetchAllByOrderSid(String orderSid);
+
+	@Select("select * from bus_sales_order_trailer where salesOrderSid = #{salesOrderSid}")
+	BusSalesOrderTrailerDetailsVo fetchByOrderSidOne(String salesOrderSid);
+
+	@Select("select * from bus_sales_order_trailer where salesOrderSid = #{salesOrderSid} and sid != #{dtoSid}")
+	BusSalesOrderTrailerDetailsVo fetchByOrderSidAndNotSidOne(@Param("salesOrderSid") String salesOrderSid,@Param("dtoSid") String dtoSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java

@@ -25,8 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesordertrailer;
 
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -58,8 +60,8 @@ public class BusSalesOrderTrailerRest implements BusSalesOrderTrailerFeign {
 	private BusSalesOrderTrailerService busSalesOrderTrailerService;
 
 	@Override
-	public ResultBean save(List<BusSalesOrderTrailerDto> dto) {
-		return null;
+	public ResultBean save(BusSalesOrderTrailerDto dto) {
+		return busSalesOrderTrailerService.saveOrUpdateDto(dto);
 	}
 
 	@Override
@@ -75,4 +77,11 @@ public class BusSalesOrderTrailerRest implements BusSalesOrderTrailerFeign {
 		List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(orderSid);
 		return rb.success().setData(busSalesOrderTrailerDetailsVos);
 	}
+
+	@Override
+	public ResultBean<BusSalesOrderTrailer> fetchBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(sid);
+		return rb.success().setData(busSalesOrderTrailer);
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
 import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -64,18 +65,51 @@ public class BusSalesOrderTrailerService extends MybatisBaseService<BusSalesOrde
 	@Autowired
 	private FileUploadComponent fileUploadComponent;
 	
-	public void saveOrUpdateDto(BusSalesOrderTrailerDto dto){
+	public ResultBean saveOrUpdateDto(BusSalesOrderTrailerDto dto){
+		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
+		String salesOrderSid = dto.getSalesOrderSid();
+		if (StringUtils.isBlank(dtoSid)) {
+			int i = baseMapper.fetchByOrderSid(salesOrderSid);
+			if (i == 1){
+				BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = baseMapper.fetchByOrderSidOne(salesOrderSid);
+				if (dto.getTrailerTypeKey().equals(busSalesOrderTrailerDetailsVo.getTrailerTypeKey()) && dto.getAppearanceSizeLong().compareTo(busSalesOrderTrailerDetailsVo.getAppearanceSizeLong()) == 0 && dto.getSingleFinalPrice().compareTo(busSalesOrderTrailerDetailsVo.getSingleFinalPrice()) == 0){
+					return rb.setMsg("请在挂车1中增加数量");
+				}
+			}else if (i == 2){
+				return rb.setMsg("最多增加两种挂车");
+			}
+			this.insertByDto(dto);
+            return rb.success();
+        }
+		int i = baseMapper.fetchByOrderSid(salesOrderSid);
+		if (i == 2){
+			BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = baseMapper.fetchByOrderSidAndNotSidOne(salesOrderSid,dtoSid);
+			if (dto.getTrailerTypeKey().equals(busSalesOrderTrailerDetailsVo.getTrailerTypeKey()) && dto.getAppearanceSizeLong().compareTo(busSalesOrderTrailerDetailsVo.getAppearanceSizeLong()) == 0 && dto.getSingleFinalPrice().compareTo(busSalesOrderTrailerDetailsVo.getSingleFinalPrice()) == 0){
+				return rb.setMsg("挂车1/2相同，请删除一条并修改数量");
+			}
+		}
 		this.updateByDto(dto);
+		return rb.success();
 	}
 	
 	public void insertByDto(BusSalesOrderTrailerDto dto){
 		BusSalesOrderTrailer entity = new BusSalesOrderTrailer();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		List<String> certFile = dto.getCertFile();
+		String certUrl = "";
+		for (String cert : certFile) {
+			String filePath = cert.replace(fileUploadComponent.getUrlPrefix(), "");
+			certUrl = certUrl + filePath + ",";
+		}
+		String contractUrl = "";
+		List<String> contractFile = dto.getContractFile();
+		for (String contract : contractFile) {
+			String filePath = contract.replace(fileUploadComponent.getUrlPrefix(), "");
+			contractUrl = contractUrl + filePath + ",";
+		}
+		entity.setCertFile(certUrl);
+		entity.setContractFile(contractUrl);
 		baseMapper.insert(entity);
 	}
 	
@@ -86,6 +120,20 @@ public class BusSalesOrderTrailerService extends MybatisBaseService<BusSalesOrde
         } 
 		BusSalesOrderTrailer entity = fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		List<String> certFile = dto.getCertFile();
+		String certUrl = "";
+		for (String cert : certFile) {
+			String filePath = cert.replace(fileUploadComponent.getUrlPrefix(), "");
+			certUrl = certUrl + filePath + ",";
+		}
+		String contractUrl = "";
+		List<String> contractFile = dto.getContractFile();
+		for (String contract : contractFile) {
+			String filePath = contract.replace(fileUploadComponent.getUrlPrefix(), "");
+			contractUrl = contractUrl + filePath + ",";
+		}
+		entity.setCertFile(certUrl);
+		entity.setContractFile(contractUrl);
 		baseMapper.updateById(entity);
 	}
 	

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -182,10 +182,15 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<TrailerVo> getAppTrailerListVoByOrderSid(@PathVariable(value = "orderSid") String orderSid);
 
+    @ApiOperation("根据sid初始化")
+    @GetMapping("/initAppOrderTrailer")
+    @ResponseBody
+    ResultBean<AppSalesOrderTrailerDetailsVo> initAppOrderTrailer(@RequestParam(value = "sid") String sid);
+
     @ApiOperation("保存挂车信息")
     @PostMapping("/saveOrUpdateAppOrderTrailer")
     @ResponseBody
-    ResultBean saveOrUpdateAppOrderTrailer(@RequestBody List<AppSalesOrderTrailerDto> dto);
+    ResultBean saveOrUpdateAppOrderTrailer(@RequestBody AppSalesOrderTrailerDto dto);
 
     @ApiOperation("删除挂车信息")
     @DeleteMapping("/delAppOrderTrailerBySid")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -160,7 +160,12 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean saveOrUpdateAppOrderTrailer(List<AppSalesOrderTrailerDto> dto) {
+    public ResultBean<AppSalesOrderTrailerDetailsVo> initAppOrderTrailer(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveOrUpdateAppOrderTrailer(AppSalesOrderTrailerDto dto) {
         return null;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java

@@ -54,6 +54,8 @@ public class AppSalesOrderTrailerDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("销售订单sid")
     private String salesOrderSid; // 销售订单sid
 	@ApiModelProperty("挂车类型key")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -235,7 +235,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean saveOrUpdateAppOrderTrailer(List<AppSalesOrderTrailerDto> dto) {
+    public ResultBean<AppSalesOrderTrailerDetailsVo> initAppOrderTrailer(String sid) {
+        return appBusSalesOrderService.initAppOrderTrailer(sid);
+    }
+
+    @Override
+    public ResultBean saveOrUpdateAppOrderTrailer(AppSalesOrderTrailerDto dto) {
         return appBusSalesOrderService.saveOrUpdateAppOrderTrailer(dto);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -70,10 +70,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelD
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
-import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto;
-import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign;
-import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.*;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo;
 import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeDelegateQuery;
@@ -123,6 +120,7 @@ import com.yxt.anrui.terminal.api.base.common.SystemVo;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
 import com.yxt.anrui.terminal.biz.base.common.CommonService;
 import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -195,6 +193,8 @@ public class AppBusSalesOrderService {
     private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
     @Autowired
     private BusSalesOrderTrailerFeign busSalesOrderTrailerFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -778,7 +778,7 @@ public class AppBusSalesOrderService {
                 }
 
             } else {//贷款
-                if("Activity_1ckx8lq".equals(query.getTaskDefKey())){//金融服务部经理审批
+                if ("Activity_1ckx8lq".equals(query.getTaskDefKey())) {//金融服务部经理审批
                     flowOrderVo.setShow(true);
                 }
             }
@@ -953,7 +953,7 @@ public class AppBusSalesOrderService {
         BigDecimal total = new BigDecimal("0");
         for (BusSalesOrderTrailerDetailsVo datum : data) {
             AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo();
-            BeanUtil.copyProperties(datum,appSalesOrderTrailerDetailsVo,"contractFile","certFile");
+            BeanUtil.copyProperties(datum, appSalesOrderTrailerDetailsVo, "contractFile", "certFile");
             List<BusSalesOrderTrailerFile> contractFile = datum.getContractFile();
             List<BusSalesOrderTrailerFile> certFile = datum.getCertFile();
             ArrayList<String> contractFileString = new ArrayList<>();
@@ -980,17 +980,41 @@ public class AppBusSalesOrderService {
         return rb.success().setData(trailerVo);
     }
 
-    public ResultBean saveOrUpdateAppOrderTrailer(List<AppSalesOrderTrailerDto> dto) {
-        List<BusSalesOrderTrailerDto> busSalesOrderTrailerDtos = new ArrayList<>();
-        for (AppSalesOrderTrailerDto appSalesOrderTrailerDto : dto) {
-            BusSalesOrderTrailerDto busSalesOrderTrailerDto = new BusSalesOrderTrailerDto();
-            BeanUtil.copyProperties(appSalesOrderTrailerDto,busSalesOrderTrailerDto);
-            busSalesOrderTrailerDtos.add(busSalesOrderTrailerDto);
-        }
-        return busSalesOrderTrailerFeign.save(busSalesOrderTrailerDtos);
+    public ResultBean saveOrUpdateAppOrderTrailer(AppSalesOrderTrailerDto dto) {
+        BusSalesOrderTrailerDto busSalesOrderTrailerDto = new BusSalesOrderTrailerDto();
+        BeanUtil.copyProperties(dto, busSalesOrderTrailerDto);
+        return busSalesOrderTrailerFeign.save(busSalesOrderTrailerDto);
     }
 
     public ResultBean delAppOrderTrailerBySid(String sid) {
         return busSalesOrderTrailerFeign.delete(sid);
     }
+
+    public ResultBean<AppSalesOrderTrailerDetailsVo> initAppOrderTrailer(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo();
+        BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerFeign.fetchBySid(sid).getData();
+        BeanUtil.copyProperties(busSalesOrderTrailer, appSalesOrderTrailerDetailsVo);
+        List<String> contractFiless = new ArrayList<>();
+        List<String> certFiless = new ArrayList<>();
+        String certFile = busSalesOrderTrailer.getCertFile();
+        if (StringUtils.isNotBlank(certFile)) {
+            String[] certFiles = certFile.split(",");
+            for (String file : certFiles) {
+                String url = fileUploadComponent.getUrlPrefix() + file;
+                certFiless.add(url);
+            }
+        }
+        String contractFile = busSalesOrderTrailer.getContractFile();
+        if (StringUtils.isNotBlank(contractFile)) {
+            String[] contractFiles = contractFile.split(",");
+            for (String file : contractFiles) {
+                String url = fileUploadComponent.getUrlPrefix() + file;
+                contractFiless.add(url);
+            }
+        }
+        appSalesOrderTrailerDetailsVo.setCertFile(certFiless);
+        appSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
+        return rb.success().setData(appSalesOrderTrailerDetailsVo);
+    }
 }