From 983dcf58d94beea15c5362da02264817b511ed58 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Mon, 3 Jul 2023 13:45:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=A2=E5=8E=82=E7=A3=85=E5=8D=95=E6=89=A3?= =?UTF-8?q?=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PoundlistController.java | 69 + .../poundlist/entity/PoundlistEntity.java | 3 + .../poundlist/mapper/PoundlistMapper.java | 4 + .../model/poundlist/PoundlistCrForm.java | 4 +- .../model/poundlist/PoundlistInfoVO.java | 4 + .../model/poundlist/PoundlistListVO.java | 3 + .../model/poundlist/PoundlistUpForm.java | 4 + .../poundlist/service/PoundlistService.java | 4 +- .../service/impl/PoundlistServiceImpl.java | 60 + .../mapper/poundlist/PoundlistMapper.xml | 101 ++ .../poundlistSourceId/Detail.vue | 780 +++++++++ .../poundlistSourceId/ExportBox.vue | 68 + .../poundlistSourceId/Form.vue | 789 +++++++++ .../poundlistSourceId/ImportForm.vue | 247 +++ .../poundlistSourceId/PurchaseOrderForm.vue | 1173 ++++++++++++++ .../poundlistSourceId/VechicleForm.vue | 855 ++++++++++ .../poundlistSourceId/index.vue | 1426 +++++++++++++++++ .../poundlistSourceId/salesForm.vue | 1349 ++++++++++++++++ 18 files changed, 6940 insertions(+), 3 deletions(-) create mode 100644 SC-web/src/views/scm/basicInformation/poundlistSourceId/Detail.vue create mode 100644 SC-web/src/views/scm/basicInformation/poundlistSourceId/ExportBox.vue create mode 100644 SC-web/src/views/scm/basicInformation/poundlistSourceId/Form.vue create mode 100644 SC-web/src/views/scm/basicInformation/poundlistSourceId/ImportForm.vue create mode 100644 SC-web/src/views/scm/basicInformation/poundlistSourceId/PurchaseOrderForm.vue create mode 100644 SC-web/src/views/scm/basicInformation/poundlistSourceId/VechicleForm.vue create mode 100644 SC-web/src/views/scm/basicInformation/poundlistSourceId/index.vue create mode 100644 SC-web/src/views/scm/basicInformation/poundlistSourceId/salesForm.vue diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 044bf37b..a70672d3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -205,6 +205,75 @@ public class PoundlistController { return ActionResult.success(vo); } + /** + * 钢厂磅单扣结 + * + * @param poundlistPagination + * @return + */ + @PostMapping("/getListSourceId") + public ActionResult listsourceid(@RequestBody PoundlistPagination poundlistPagination)throws IOException{ + List list= poundlistService.getListSourceid(poundlistPagination); + //处理id字段转名称,若无需转或者为空可删除 + for(PoundlistEntity entity:list){ + entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); + entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); + entity.setOriginPlace(generaterSwapUtil.provinceData(entity.getOriginPlace())); + } + List listVO=JsonUtil.getJsonToList(list,PoundlistListVO.class); + for(PoundlistListVO poundlistListVO:listVO){ + if(StringUtils.isEmpty(poundlistListVO.getSettlement())){ + poundlistListVO.setSettlement(poundlistListVO.getNetWeight()); + if(StringUtils.isEmpty(poundlistListVO.getSettlement())){ + poundlistListVO.setSettlement("0"); + } + } + if(StringUtils.isEmpty(poundlistListVO.getPrice())){ + poundlistListVO.setPrice(poundlistListVO.getPurchasePrice()); + if(StringUtils.isEmpty(poundlistListVO.getPrice())){ + poundlistListVO.setPrice("0"); + } + } + if(StringUtils.isEmpty(poundlistListVO.getSalesPrice())){ + poundlistListVO.setSalesPrice("0"); + } + if(StringUtils.isEmpty(poundlistListVO.getSaleRate())){ + poundlistListVO.setSaleRate("0"); + } + poundlistListVO.setPrice(poundlistListVO.getPurchasePrice()); + poundlistListVO.setRate("0"); + poundlistListVO.setPountType(poundlistListVO.getPoundType()); + poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString()); + poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).divide(new BigDecimal("1.13"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); + poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toPlainString()); + switch (poundlistListVO.getSaleRate()) { + case "1": + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.09"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); + break; + case "2": + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.06"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); + break; + case "3": + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.05"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); + break; + case "4": + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.03"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); + break; + case "5": + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); + break; + default: + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.13"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); + break; + } + poundlistListVO.setRateAmount(String.valueOf(Double.parseDouble(poundlistListVO.getAmount()) - Double.parseDouble(poundlistListVO.getNotAmount()))); + } + PageListVO vo=new PageListVO(); + vo.setList(listVO); + PaginationVO page=JsonUtil.getJsonToBean(poundlistPagination,PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } /** * 创建 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index dbadaf6a..047ed204 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -221,6 +221,9 @@ public class PoundlistEntity { @TableField("COLLECTION_AMOUNTS") private BigDecimal collectionAmounts; + @TableField("SOURCE_ID") + private String sourceId; + @TableField(exist = false) private String materialName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java index 3aca7e9f..e524f2bf 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.contractfile.entity.ContractFileEntity; +import jnpf.contractfile.model.contractfile.ContractFilePagination; import jnpf.poundlist.entity.PoundlistEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.poundlist.entity.PoundlistSEntity; @@ -40,4 +42,6 @@ public interface PoundlistMapper extends BaseMapper { List queryByKeywordNotPage(@Param("poundlistPagination") PoundlistPagination poundlistPagination, @Param("ew") Wrapper queryWrapper); List queryCreateSale(@Param("idList") List idList); + //钢厂磅单扣结 + IPage querypoundlistsourceid(@Param("page") Page page, @Param("poundlistPagination") PoundlistPagination poundlistPagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java index 67386b47..8ed42d77 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java @@ -163,6 +163,8 @@ public class PoundlistCrForm { @JsonProperty("collectionAmounts") private String collectionAmounts; - + /** 回款金额 **/ + @JsonProperty("sourceId") + private String sourceId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java index 026d3483..a5ae86c6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java @@ -168,4 +168,8 @@ public class PoundlistInfoVO{ @JsonProperty("collectionAmounts") private String collectionAmounts; + /** 回款金额 **/ + @JsonProperty("sourceId") + private String sourceId; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java index f709f28a..aa4b0430 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java @@ -286,4 +286,7 @@ public class PoundlistListVO{ @JsonProperty("collectionAmounts") private String collectionAmounts; + /** 回款金额 **/ + @JsonProperty("sourceId") + private String sourceId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java index a4094de4..55ed9d6d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java @@ -192,4 +192,8 @@ public class PoundlistUpForm{ /** 回款金额 **/ @JsonProperty("collectionAmounts") private String collectionAmounts; + + /** 回款金额 **/ + @JsonProperty("sourceId") + private String sourceId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java index ad03563f..fd64a955 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java @@ -27,8 +27,8 @@ public interface PoundlistService extends IService { List getList(PoundlistPagination poundlistPagination); List getTypeList(PoundlistPagination poundlistPagination,String dataType); - - + //钢厂磅单扣结 + List getListSourceid(PoundlistPagination poundlistPagination); PoundlistEntity getInfo(String id); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index 8ee75b9d..39045823 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -493,5 +493,65 @@ public class PoundlistServiceImpl extends ServiceImpl getListSourceid(PoundlistPagination poundlistPagination) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + int total = 0; + int poundlistNum = 0; + QueryWrapper poundlistQueryWrapper = new QueryWrapper<>(); + poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine, "1"); + boolean pcPermission = true; + boolean appPermission = true; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object poundlistObj = authorizeService.getCondition2(new AuthorizeConditionModel(poundlistQueryWrapper, poundlistPagination.getMenuId(), "jg_poundlist")); + if (ObjectUtil.isEmpty(poundlistObj)) { + return new ArrayList<>(); + } else { + poundlistQueryWrapper = (QueryWrapper) poundlistObj; + poundlistNum++; + } + } + } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object poundlistObj = authorizeService.getCondition2(new AuthorizeConditionModel(poundlistQueryWrapper, poundlistPagination.getMenuId(), "jg_poundlist")); + if (ObjectUtil.isEmpty(poundlistObj)) { + return new ArrayList<>(); + } else { + poundlistQueryWrapper = (QueryWrapper) poundlistObj; + poundlistNum++; + } + } + } + if (StringUtil.isNotEmpty(poundlistPagination.getPoundDate())) { + List PoundDateList = poundlistPagination.getPoundDate(); + Long fir = Long.valueOf(PoundDateList.get(0)); + Long sec = Long.valueOf(PoundDateList.get(1)); + poundlistPagination.setStartDate(new Date(fir)); + poundlistPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + } + if (StringUtil.isEmpty(poundlistPagination.getSidx())) { + poundlistPagination.setSidx("CREATOR_TIME"); + poundlistPagination.setSort("DESC"); + } else { + try { + String sidx = poundlistPagination.getSidx(); + PoundlistEntity poundlistEntity = new PoundlistEntity(); + Field declaredField = poundlistEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + poundlistPagination.setSidx(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + Page page = new Page<>(poundlistPagination.getCurrentPage(), poundlistPagination.getPageSize()); + IPage iPage = poundlistMapper.querypoundlistsourceid(page, poundlistPagination, poundlistQueryWrapper); + + return poundlistPagination.setData(iPage.getRecords(), iPage.getTotal()); + } } \ No newline at end of file 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 77cc01e2..731165cf 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 @@ -311,4 +311,105 @@ WHERE a.delete_mark = 0 and #{item} + + + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlistSourceId/Detail.vue b/SC-web/src/views/scm/basicInformation/poundlistSourceId/Detail.vue new file mode 100644 index 00000000..c1372b55 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/poundlistSourceId/Detail.vue @@ -0,0 +1,780 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlistSourceId/ExportBox.vue b/SC-web/src/views/scm/basicInformation/poundlistSourceId/ExportBox.vue new file mode 100644 index 00000000..72fc9252 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/poundlistSourceId/ExportBox.vue @@ -0,0 +1,68 @@ + + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlistSourceId/Form.vue b/SC-web/src/views/scm/basicInformation/poundlistSourceId/Form.vue new file mode 100644 index 00000000..d3128650 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/poundlistSourceId/Form.vue @@ -0,0 +1,789 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlistSourceId/ImportForm.vue b/SC-web/src/views/scm/basicInformation/poundlistSourceId/ImportForm.vue new file mode 100644 index 00000000..313b0465 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/poundlistSourceId/ImportForm.vue @@ -0,0 +1,247 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlistSourceId/PurchaseOrderForm.vue b/SC-web/src/views/scm/basicInformation/poundlistSourceId/PurchaseOrderForm.vue new file mode 100644 index 00000000..63fa5669 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/poundlistSourceId/PurchaseOrderForm.vue @@ -0,0 +1,1173 @@ + + diff --git a/SC-web/src/views/scm/basicInformation/poundlistSourceId/VechicleForm.vue b/SC-web/src/views/scm/basicInformation/poundlistSourceId/VechicleForm.vue new file mode 100644 index 00000000..78006984 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/poundlistSourceId/VechicleForm.vue @@ -0,0 +1,855 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlistSourceId/index.vue b/SC-web/src/views/scm/basicInformation/poundlistSourceId/index.vue new file mode 100644 index 00000000..6a03f025 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/poundlistSourceId/index.vue @@ -0,0 +1,1426 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlistSourceId/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlistSourceId/salesForm.vue new file mode 100644 index 00000000..4cb69412 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/poundlistSourceId/salesForm.vue @@ -0,0 +1,1349 @@ + +