Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java

@@ -28,4 +28,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER)QueryWrapper<BaseVehicleOut> qw);
 
     BaseVehicleOutDetailsVo details(String sid);
+
+    int selectCountBySidVin(String vinSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -80,4 +80,8 @@
         from base_vehicle_out
         where sid = #{sid}
     </select>
+
+    <select id="selectCountBySidVin" resultType="int">
+        select count(*) from base_vehicle_out where vinSid = #{vinSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -61,6 +61,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         if (count > 0) {
             return rb.setMsg(dto.getVinNo() + "车辆不满足出库条件");
         }
+        //查询是否已出库
+        int counts = baseMapper.selectCountBySidVin(dto.getVinSid());
+        if (counts > 0) {
+            return rb.setMsg("该车辆已出库，不允许重复出库");
+        }
         BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
         BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
         if (StringUtils.isNotBlank(dto.getPrice())) {
@@ -186,42 +191,42 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //返利金额
         fEntity.setF_PAEZ_Decimal("0");//dto.getRebateMoneyOne()
         String remarks = dto.getRemarks();
-        String note=remarks;
+        String note = remarks;
         //备注
-        if(StringUtils.isNotBlank(dto.getMiddleOne())){
-            if(StringUtils.isNotBlank(dto.getMiddleTwo())){
-                if(StringUtils.isNotBlank(dto.getRebateMoneyOne())){
-                    if(StringUtils.isNotBlank(dto.getRebateMoneyTwo())){
-                        note=note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"," +  dto.getMiddleTwo()+":"+dto.getRebateMoneyTwo()+"。";
+        if (StringUtils.isNotBlank(dto.getMiddleOne())) {
+            if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                        note = note + "。返利情况：" + dto.getMiddleOne() + ":" + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + ":" + dto.getRebateMoneyTwo() + "。";
                         fEntity.setFEntrynote(note);
                         //返利金额
                         fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
-                    }else{
-                        fEntity.setFEntrynote(note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"。");
+                    } else {
+                        fEntity.setFEntrynote(note + "。返利情况：" + dto.getMiddleOne() + ":" + dto.getRebateMoneyOne() + "。");
                         //返利金额
                         fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
                     }
 
-                }else{
+                } else {
                     if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
-                        fEntity.setFEntrynote( note+"。返利情况："+dto.getMiddleTwo()+":"+dto.getRebateMoneyTwo()+"。");
+                        fEntity.setFEntrynote(note + "。返利情况：" + dto.getMiddleTwo() + ":" + dto.getRebateMoneyTwo() + "。");
                         //返利金额
                         fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
                     }
                 }
 
-            }else{
-                if(StringUtils.isNotBlank(dto.getRebateMoneyOne())){
-                    note=note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"。";
+            } else {
+                if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                    note = note + "。返利情况：" + dto.getMiddleOne() + ":" + dto.getRebateMoneyOne() + "。";
                     fEntity.setFEntrynote(note);
                     //返利金额
                     fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
                 }
             }
-        }else{
-            if(StringUtils.isNotBlank(dto.getMiddleTwo())){
-                if(StringUtils.isNotBlank(dto.getRebateMoneyTwo())){
-                    note=note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"。";
+        } else {
+            if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                    note = note + "。返利情况：" + dto.getMiddleOne() + ":" + dto.getRebateMoneyOne() + "。";
                     fEntity.setFEntrynote(note);
                     //返利金额
                     fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
@@ -282,7 +287,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(params.getCustomerName())) {
                 qw.like("bvo.customerName", params.getCustomerName());
             }
-            qw.eq("bvo.createOrgSid",params.getCreateOrgSid());
+            qw.eq("bvo.createOrgSid", params.getCreateOrgSid());
         }
         IPage<BaseVehicleOutVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<BaseVehicleOutVo> p = PagerUtil.pageToVo(pagging, null);