更改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java

@@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-base(内申请管理) <br/>
- * File: BaseInternalPurchase.java <br/>
- * Class: com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase <br/>
- * Description: 内购表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-16 13:46:25 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "内购表", description = "内购表")
 @TableName("base_internal_purchase")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfig.java

@@ -30,51 +30,28 @@ import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-base(车型信息) <br/>
- * File: BaseVehmodelConfig.java <br/>
- * Class: com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig <br/>
- * Description: 车型与简述配置关联表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-01-15 10:51:33 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "车型与简述配置关联表", description = "车型与简述配置关联表")
 @Data
 @TableName("base_vehmodel_config")
 public class BaseVehmodelConfig extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    
     @ApiModelProperty("车型sid")
     private String modelSid; // 车型sid
-
     @ApiModelProperty("简述配置sid")
     private String configurationItemsSid; // 简述配置sid
-
     @ApiModelProperty("厂家结算价")
     private BigDecimal manufactorSettlementPrice; // 厂家结算价
-
     @ApiModelProperty("销售参考价")
     private BigDecimal salesReferencePrice; // 销售参考价
-
     @ApiModelProperty("价格有效期")
     private String priceValidity; // 价格有效期
-
     @ApiModelProperty("销售指导价")
     private BigDecimal guidedPrice; // 销售指导价
-
     @ApiModelProperty(value = "是否常用车型")
     private Integer isCommonModel;
-
     @ApiModelProperty(value = "使用组织sid（分公司）")
     private String useOrgSid;
     @ApiModelProperty(value = "内部编码")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java

@@ -44,21 +44,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-base(内申请管理) <br/>
- * File: BaseInternalPurchaseFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseRest <br/>
- * Description: 内购表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-16 13:46:25 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "内购表")
-@RestController("com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseRest")
+@RestController
 @RequestMapping("v1/baseinternalpurchase")
 public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
 
@@ -68,7 +55,7 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseInternalPurchaseVo>> listPage(@RequestBody PagerQuery<BaseInternalPurchaseQuery> pq){
+    public ResultBean<PagerVo<BaseInternalPurchaseVo>> listPage(@RequestBody PagerQuery<BaseInternalPurchaseQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<BaseInternalPurchaseVo> pv = baseInternalPurchaseService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -77,21 +64,21 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody BaseInternalPurchaseDto dto){
+    public ResultBean save(@RequestBody BaseInternalPurchaseDto dto) {
         return baseInternalPurchaseService.saveAll(dto);
     }
 
     @Override
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         return baseInternalPurchaseService.delAll(sids);
     }
 
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BaseInternalPurchaseDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<BaseInternalPurchaseDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         return baseInternalPurchaseService.fetchDetailsVoBySid(sid);
     }
 
@@ -102,8 +89,8 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
 
     @Override
     public ResultBean complete(BaseInterNalPurchaseCompleteDto bvd) {
-		BusinessVariables bv=new BusinessVariables();
-		BeanUtil.copyProperties(bvd,bv);
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(bvd, bv);
         //bv.setFormVariables(BeanUtil.beanToMap(bvd));
         bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId());
         return baseInternalPurchaseService.complete(bv);
@@ -111,16 +98,16 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
 
     @Override
     public ResultBean InitiatorToAnswer(BaseInterNalPurchaseCompleteDto bvd) {
-		BusinessVariables bv=new BusinessVariables();
-		BeanUtil.copyProperties(bvd,bv);
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(bvd, bv);
         bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId());
-		return baseInternalPurchaseService.InitiatorToAnswer(bv,bvd.getId());
+        return baseInternalPurchaseService.InitiatorToAnswer(bv, bvd.getId());
     }
 
     @Override
     public ResultBean companyToDivisionOperate(BaseInterNalPurchaseCompleteDto bvd) {
-		BusinessVariables bv=new BusinessVariables();
-		BeanUtil.copyProperties(bvd,bv);
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(bvd, bv);
         bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId());
         return baseInternalPurchaseService.companyToDivisionOperate(bv);
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -41,7 +41,6 @@ import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVe
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
@@ -86,25 +85,11 @@ import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
-/**
- * Project: anrui-base(内申请管理) <br/>
- * File: BaseInternalPurchaseService.java <br/>
- * Class: com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseService <br/>
- * Description: 内购表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-16 13:46:25 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternalPurchaseMapper, BaseInternalPurchase> {
 
@@ -559,6 +544,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                             baseVehmodelConfig.setConfigurationItemsSid(configSid);
                             baseVehmodelConfig.setUseOrgSid(buyerOrgSid);
                             baseVehmodelConfig.setGuidedPrice(new BigDecimal(booad.getGuidedPrice()));
+                            baseVehmodelConfig.setManufactorSettlementPrice(new BigDecimal(booad.getGuidedPrice()));
+                            baseVehmodelConfig.setInsideCode(baseVehicle.getInsideCode());
                             baseVehmodelConfigService.save(baseVehmodelConfig);
                         }
                     } else if (baseInternalPurchase.getShuntingTypeValue().equals("调出")) {
@@ -572,6 +559,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                             baseVehmodelConfig.setConfigurationItemsSid(configSid);
                             baseVehmodelConfig.setUseOrgSid(buyerOrgSid);
                             baseVehmodelConfig.setGuidedPrice(new BigDecimal(booad.getGuidedPrice()));
+                            baseVehmodelConfig.setManufactorSettlementPrice(new BigDecimal(booad.getGuidedPrice()));
                             baseVehmodelConfig.setInsideCode(baseVehicle.getInsideCode());
                             baseVehmodelConfigService.save(baseVehmodelConfig);
                         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -46,12 +46,10 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
-import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
@@ -62,7 +60,6 @@ import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
 import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
-import com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryService;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -75,54 +72,32 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-/**
- * Project: scm(scm) <br/>
- * File: ScmVehicleEnterlibraryService.java <br/>
- * Class: scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryService <br/>
- * Description: 入库单 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-06 09:53:39 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicleEnterlibraryMapper, ScmVehicleEnterlibrary> {
 
     @Autowired
-    SysUserFeign sysUserFeign;
-
+    private SysUserFeign sysUserFeign;
     @Autowired
-    SysStaffOrgFeign sysStaffOrgFeign;
-
+    private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
-    ScmFileService scmFileService;
-
+    private ScmFileService scmFileService;
     @Autowired
-    BaseVehicleFeign baseVehicleFeign;
-
+    private BaseVehicleFeign baseVehicleFeign;
     @Autowired
-    FileUploadComponent fileUploadComponent;
-
+    private FileUploadComponent fileUploadComponent;
     @Autowired
-    BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign;
-
+    private BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign;
     @Autowired
-    BaseInternalPurchaseFeign baseInternalPurchaseFeign;
-
+    private BaseInternalPurchaseFeign baseInternalPurchaseFeign;
     @Autowired
-    BaseInternalPurchaseVehicleFeign baseInternalPurchaseVehicleFeign;
-
+    private BaseInternalPurchaseVehicleFeign baseInternalPurchaseVehicleFeign;
     @Autowired
-    FinKingDeeFeign finKingDeeFeign;
+    private FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
@@ -135,10 +110,6 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
     private BaseManufacturerBankFeign baseManufacturerBankFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
-    @Autowired
-    private BaseVehicleModelFeign baseVehicleModelFeign;
-    @Autowired
-    private ScmApplyInboundQueryService scmApplyInboundQueryService;
 
     private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
         // todo: 这里根据具体业务调整查询条件