From 984c8bdef5e031a515b4a6648d2b63854982e4db Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Sun, 23 Apr 2023 15:49:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AF=BC=E5=85=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E3=80=81=E6=9B=BF=E6=8D=A2=E7=A3=85=E5=8D=95=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E8=BD=A6=E8=BE=86=E7=AD=9B=E9=80=89=E3=80=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=BC=80=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ContractFileServiceImpl.java | 24 ++++- .../controller/TradeuploadController.java | 10 ++ .../tradeupload/entity/TradeuploadEntity.java | 9 ++ .../model/tradeupload/TradeuploadInfoVO.java | 9 ++ .../vehicle/controller/VehicleController.java | 27 ++++- .../jnpf/vehicle/entity/VehicleEntity.java | 2 +- .../jnpf/vehicle/mapper/VehicleMapper.java | 4 + .../jnpf/vehicle/service/VehicleService.java | 3 +- .../service/impl/VehicleServiceImpl.java | 99 +++++++++++++++++++ .../mapper/poundlist/PoundlistMapper.xml | 3 +- .../mapper/tradeupload/TradeuploadMapper.xml | 6 +- .../mapper/vehicle/VehicleMapper.xml | 30 ++++++ .../poundlist/VechicleForm.vue | 11 +++ .../tradeupload/VehicleBox.vue | 2 +- 14 files changed, 229 insertions(+), 10 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java index 76921315..e8e573fb 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java @@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jnpf.util.*; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; /** @@ -358,8 +359,28 @@ public class ContractFileServiceImpl extends ServiceImpl list = contractFileMapper.selectList(queryWrapper); + String amo="0"; if (list.size() > 0) { System.out.println(list); + ContractFileEntity contractFileEntity =new ContractFileEntity(); + + contractFileEntity.setId(list.get(0).getId()); + contractFileEntity.setContractNo(model.getContractNo()); + BigDecimal amo1 =new BigDecimal(amo); + BigDecimal Num1 =new BigDecimal(model.getNum()); + BigDecimal Amount1 =new BigDecimal(model.getAmount()); + if (model.getNum()==null){ + contractFileEntity.setNum(amo1); + }else { + contractFileEntity.setNum(Num1); + } + if (model.getAmount()==null){ + contractFileEntity.setAmount(amo1); + }else { + contractFileEntity.setAmount(Amount1); + } + contractFileEntity.setLastModifyTime(new Date()); + updateById(contractFileEntity); } else { dataRowMap.put("contractCode", model.getContractCode()); dataRowMap.put("contractName", model.getContractName()); @@ -369,14 +390,11 @@ public class ContractFileServiceImpl extends ServiceImpl list= vehicleService.getList1(vehiclePagination); + //处理id字段转名称，若无需转或者为空可删除 + for(VehicleEntity entity:list){ +// entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos())); + } + List listVO=JsonUtil.getJsonToList(list,VehicleListVO.class); +// for(VehicleListVO vehicleVO:listVO){ +// } + + + PageListVO vo=new PageListVO(); + vo.setList(listVO); + PaginationVO page=JsonUtil.getJsonToBean(vehiclePagination,PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } /** * 创建 @@ -312,7 +337,7 @@ public class VehicleController { VehicleEntity entity= vehicleService.getInfo(id); if(entity!=null){ VehicleEntity subentity=JsonUtil.getJsonToBean(vehicleUpForm, VehicleEntity.class); - subentity.setCreatortime(entity.getCreatortime()); + subentity.setCreatorTime(entity.getCreatorTime()); vehicleService.update(id, subentity); return ActionResult.success("更新成功"); }else{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java index d5813309..562891d5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java @@ -28,7 +28,7 @@ public class VehicleEntity { private String creatorusername; @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT) - private Date creatortime; + private Date creatorTime; @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE) private String lastModifyUserId; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java index dd39f160..7395756f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.vehicle.entity.VehicleEntity; import jnpf.vehicle.entity.VehicleMobileEntity; +import jnpf.vehicle.model.vehicle.VehiclePagination; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,7 @@ import org.apache.ibatis.annotations.Param; */ public interface VehicleMapper extends BaseMapper { IPage getVehicleList(@Param("page") Page page, @Param("ew") Wrapper queryWrapper); + + //车辆筛选换接口 + IPage getVehicleList1(@Param("page") Page page,@Param("vehiclePagination") VehiclePagination vehiclePagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java index 49483eb8..234c0ec6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java @@ -22,9 +22,10 @@ public interface VehicleService extends IService { List getList(VehiclePagination vehiclePagination); - List getTypeList(VehiclePagination vehiclePagination,String dataType); + List getTypeList(VehiclePagination vehiclePagination,String dataType); + List getList1(VehiclePagination vehiclePagination); VehicleEntity getInfo(String id); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java index b6677d4d..d35c9d85 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.service.AuthorizeService; +import jnpf.purchaseorder.entity.PurchaseorderitemEntity; import jnpf.util.ServletUtil; import jnpf.util.StringUtil; import jnpf.util.UserProvider; @@ -134,6 +135,9 @@ public class VehicleServiceImpl extends ServiceImpl getTypeList(VehiclePagination vehiclePagination,String dataType){ String userId=userProvider.get().getUserId(); @@ -210,6 +214,101 @@ public class VehicleServiceImpl extends ServiceImpl getList1(VehiclePagination vehiclePagination){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int vehicleNum =0; + QueryWrapper vehicleQueryWrapper=new QueryWrapper<>(); + vehicleQueryWrapper.eq("a.delete_mark", "0"); + boolean pcPermission = true; + boolean appPermission = true; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle")); + if (ObjectUtil.isEmpty(vehicleObj)){ + return new ArrayList<>(); + } else { + vehicleQueryWrapper = (QueryWrapper)vehicleObj; + vehicleNum++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle")); + if (ObjectUtil.isEmpty(vehicleObj)){ + return new ArrayList<>(); + } else { + vehicleQueryWrapper = (QueryWrapper)vehicleObj; + vehicleNum++; + } + + + } + } +// if(StringUtil.isNotEmpty(vehiclePagination.getTicketno())){ +// vehicleNum++; +// vehicleQueryWrapper.lambda().like(VehicleEntity::getTicketno,vehiclePagination.getTicketno()); +// } +// +// if(StringUtil.isNotEmpty(vehiclePagination.getDrivername())){ +// vehicleNum++; +// vehicleQueryWrapper.lambda().like(VehicleEntity::getDrivername,vehiclePagination.getDrivername()); +// } +// if(StringUtil.isNotEmpty(vehiclePagination.getContact())){ +// vehicleNum++; +// vehicleQueryWrapper.lambda().like(VehicleEntity::getContact,vehiclePagination.getContact()); +// } + +// if(StringUtil.isNotEmpty(vehiclePagination.getKeyword())){ +// vehicleNum++; +// vehicleQueryWrapper.lambda().and(wq -> { +// // 拼接sql +// wq.like(VehicleEntity::getDrivername,vehiclePagination.getKeyword()) +// .or() +// .like(VehicleEntity::getTicketno,vehiclePagination.getKeyword()); +// }); +// } + + if(AllIdList.size()>0){ + vehicleQueryWrapper.lambda().in(VehicleEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(vehiclePagination.getSidx())){ +// vehicleQueryWrapper.lambda().orderByDesc(VehicleEntity::getId); + vehiclePagination.setSidx("CREATOR_TIME"); + vehiclePagination.setSort("DESC"); + }else{ + try { + String sidx = vehiclePagination.getSidx(); + VehicleEntity vehicleEntity = new VehicleEntity(); + Field declaredField = vehicleEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + vehiclePagination.setSidx(value); + // vehicleQueryWrapper="asc".equals(vehiclePagination.getSort().toLowerCase())?vehicleQueryWrapper.orderByAsc(value):vehicleQueryWrapper.orderByDesc(value); + } catch (Exception e) { + e.printStackTrace(); + } + } + Page page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize()); +// IPage userIPage=this.page(page, vehicleQueryWrapper); + IPage userIPage = vehicleMapper.getVehicleList1(page, vehiclePagination, vehicleQueryWrapper); + return vehiclePagination.setData(userIPage.getRecords(),userIPage.getTotal()); +// if((total>0 && AllIdList.size()>0) || total==0){ +// Page page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize()); +// IPage userIPage=this.page(page, vehicleQueryWrapper); +// IPage userIPage = vehicleMapper.getVehicleList1(page, vehiclePagination, vehicleQueryWrapper); +// return vehiclePagination.setData(userIPage.getRecords(),userIPage.getTotal()); +// }else{ +// List list = new ArrayList(); +// return vehiclePagination.setData(list, list.size()); +// } + } + @Override public VehicleEntity getInfo(String id){ QueryWrapper queryWrapper=new QueryWrapper<>(); diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml index 06a94012..d68f0ccc 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml @@ -57,7 +57,7 @@ WHERE a.delete_mark = 0 and + + @@ -59,4 +61,32 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue index 03dd387d..92a909a9 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue @@ -246,6 +246,7 @@ purchaseId:0, salesIdOld:0, salesId:0, + isPayment:0, }, rules: { materialId: [{ @@ -565,6 +566,7 @@ dataFormSubmit() { var purchaseStatus = this.dataForm.purchaseStatus;//采购状态 var salesStatus = this.dataForm.salesStatus;//销售状态 + var isPayment = this.dataForm.isPayment; this.dataForm.isExamine = '1'; this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0; this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0; @@ -573,7 +575,16 @@ // var purchaseName1=this.dataForm.purchaseName; var purchaseIdOld=this.dataForm.purchaseIdOld; var salesIdOld=this.dataForm.salesIdOld; + if (purchaseIdOld !=this.dataForm.purchaseId ){ + if (isPayment==1){ + this.$message({ + message: '采购订单已经提交付款申请', + type: 'success', + duration: 2500 + }) + return + } if (purchaseStatus==0){ this.$message({ message: '采购订单已经生成，现在是待开票状态', diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue b/SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue index fe9874ee..aa9cf7f3 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue @@ -100,7 +100,7 @@ this.listQuery.menuId = '380662313734134341' let listQuery = this.listQuery request({ - url: `/api/example/Vehicle/getList`, + url: `/api/example/Vehicle/getList1`, method: 'post', data: listQuery }).then(res => {