From 688519a599a1b2930efed612189964dd16ab097a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Fri, 3 Mar 2023 09:39:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReceiptoutController.java | 18 +++++------ .../model/receiptout/ReceiptoutCrForm.java | 4 +-- .../model/receiptout/ReceiptoutInfoVO.java | 4 +-- .../model/receiptout/ReceiptoutListVO.java | 4 +-- .../model/receiptout/ReceiptoutUpForm.java | 4 +-- .../scm/basicInformation/poundlist/index.vue | 32 +++++++++---------- .../basicInformation/receiptout/Detail.vue | 5 +-- .../scm/basicInformation/receiptout/Form.vue | 9 +++--- .../scm/basicInformation/receiptout/index.vue | 4 +-- 9 files changed, 43 insertions(+), 41 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java index 27416b8a..70d78c56 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java @@ -107,7 +107,7 @@ public class ReceiptoutController { receiptoutCrForm.setCreatorUserName(userInfo.getUserId()); ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(SaleorderitemEntity::getId,entity.getSalesId()); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,entity.getSourceNo()); SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); saleorderitemEntity.setStatus("1");//修改销售订单状态 saleorderitemService.updateById(saleorderitemEntity); @@ -147,8 +147,8 @@ public class ReceiptoutController { List list= receiptoutService.getList(receiptoutPagination); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ - Map salesIdMap = new HashMap<>(); - entity.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesId(),salesIdMap)); + Map sourceNoMap = new HashMap<>(); + entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap)); Map customerIdMap = new HashMap<>(); entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); @@ -228,8 +228,8 @@ public class ReceiptoutController { List list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ - Map salesIdMap = new HashMap<>(); - entity.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesId(),salesIdMap)); + Map sourceNoMap = new HashMap<>(); + entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap)); Map customerIdMap = new HashMap<>(); entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); @@ -259,8 +259,8 @@ public class ReceiptoutController { case "type" : entitys.add(new ExcelExportEntity("业务类型" ,"type")); break; - case "salesId" : - entitys.add(new ExcelExportEntity("来源单号" ,"salesId")); + case "source" : + entitys.add(new ExcelExportEntity("来源单号" ,"source")); break; case "amount" : entitys.add(new ExcelExportEntity("出库金额" ,"amount")); @@ -405,8 +405,8 @@ public class ReceiptoutController { //附表数据转换 //添加到详情表单对象中 - Map salesIdMap = new HashMap<>(); - vo.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",vo.getSalesId(),salesIdMap)); + Map sourceNoMap = new HashMap<>(); + vo.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",vo.getSourceNo(),sourceNoMap)); Map customerIdMap = new HashMap<>(); vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java index 6ec024cd..db9178a2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java @@ -30,8 +30,8 @@ public class ReceiptoutCrForm { private String type; /** 来源单号 **/ - @JsonProperty("salesId") - private String salesId; + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ @JsonProperty("amount") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java index 1a3f9357..51e74a26 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java @@ -34,8 +34,8 @@ public class ReceiptoutInfoVO{ private String type; /** 来源单号 **/ - @JsonProperty("salesId") - private String salesId; + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ @JsonProperty("amount") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java index 61d05ad6..ac4165c8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java @@ -36,8 +36,8 @@ public class ReceiptoutListVO{ /** 来源单号 **/ - @JsonProperty("salesId") - private String salesId; + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java index c3bc057e..da7e9838 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java @@ -36,8 +36,8 @@ public class ReceiptoutUpForm{ /** 来源单号 **/ - @JsonProperty("salesId") - private String salesId; + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue index 8b78d8c5..c1f491c8 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue @@ -42,12 +42,12 @@ - - - - - - + + + + + +