From e3187edd3ddf759d54af33704cd1fd333fb6b151 Mon Sep 17 00:00:00 2001 From: tengxi <971623072@qq.com> Date: Wed, 8 Feb 2023 16:06:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=87=BA=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PaymentdocController.java | 2 +- .../controller/ReceiptoutController.java | 196 ++++++----- .../receiptout/entity/ReceiptoutEntity.java | 2 +- .../entity/Receiptout_item0Entity.java | 13 +- .../receiptout/mapper/ReceiptoutMapper.java | 4 +- .../mapper/Receiptout_item0Mapper.java | 4 +- .../model/receiptout/ReceiptoutCrForm.java | 64 ++-- .../model/receiptout/ReceiptoutInfoVO.java | 64 ++-- .../model/receiptout/ReceiptoutListQuery.java | 5 +- .../model/receiptout/ReceiptoutListVO.java | 70 ++-- .../receiptout/ReceiptoutPagination.java | 5 +- .../ReceiptoutPaginationExportModel.java | 5 +- .../model/receiptout/ReceiptoutUpForm.java | 72 ++-- .../receiptout/Receiptout_item0Model.java | 70 ++++ .../receiptout/service/ReceiptoutService.java | 10 +- .../service/Receiptout_item0Service.java | 6 +- .../service/impl/ReceiptoutServiceImpl.java | 70 ++-- .../impl/Receiptout_item0ServiceImpl.java | 30 +- .../basicInformation/receiptout/Detail.vue | 162 ++++++--- .../scm/basicInformation/receiptout/Form.vue | 327 ++++++++++++++---- .../scm/basicInformation/receiptout/index.vue | 29 +- 21 files changed, 800 insertions(+), 410 deletions(-) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java index f1f82aba..81a00832 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java @@ -18,7 +18,7 @@ import jnpf.exception.DataException; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; import jnpf.paymentdoc.model.paymentdoc.*; -import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination; + import jnpf.paymentdoc.entity.*; import jnpf.paymentdoc.entity.Paymentdoc_item0Entity; import jnpf.util.*; 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 09f31696..3d126320 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 @@ -1,40 +1,53 @@ package jnpf.receiptout.controller; - import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jnpf.base.ActionResult; -import jnpf.base.UserInfo; -import jnpf.base.vo.DownloadVO; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; +import jnpf.base.UserInfo; +import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; -import jnpf.receiptout.entity.ReceiptoutEntity; +import org.springframework.transaction.annotation.Transactional; +import jnpf.base.entity.ProvinceEntity; import jnpf.receiptout.model.receiptout.*; -import jnpf.receiptout.service.ReceiptoutService; +import jnpf.receiptout.model.receiptout.ReceiptoutPagination; +import jnpf.receiptout.entity.*; +import jnpf.receiptout.entity.Receiptout_item0Entity; import jnpf.util.*; -import jnpf.util.enums.FileTypeEnum; -import jnpf.util.file.UploadUtil; -import lombok.Cleanup; +import jnpf.base.util.*; +import jnpf.base.vo.ListVO; +import jnpf.util.context.SpringContext; +import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; +import lombok.Cleanup; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import jnpf.receiptout.entity.ReceiptoutEntity; +import jnpf.receiptout.service.ReceiptoutService; +import jnpf.receiptout.entity.Receiptout_item0Entity; +import jnpf.receiptout.service.Receiptout_item0Service; import org.springframework.web.bind.annotation.*; - +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import jnpf.util.GeneraterSwapUtil; +import java.util.*; + +import jnpf.util.file.UploadUtil; +import jnpf.util.enums.FileTypeEnum; /** * @@ -42,7 +55,7 @@ import java.util.Map; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Slf4j @RestController @@ -62,6 +75,8 @@ public class ReceiptoutController { @Autowired private ReceiptoutService receiptoutService; + @Autowired + private Receiptout_item0Service receiptout_item0Service; @@ -76,15 +91,10 @@ public class ReceiptoutController { List list= receiptoutService.getList(receiptoutPagination); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ + Map sourceNoMap = new HashMap<>(); + entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId())); entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); - entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId())); - if (StringUtil.isNotBlank(entity.getOrgnizeId())){ - entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "all")); - } - - entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId())); } List listVO=JsonUtil.getJsonToList(list,ReceiptoutListVO.class); for(ReceiptoutListVO receiptoutVO:listVO){ @@ -110,16 +120,31 @@ public class ReceiptoutController { public ActionResult create(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); + receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false)); receiptoutCrForm.setCreatorTime(DateUtil.getNow()); receiptoutCrForm.setCreatorUserName(userInfo.getUserId()); - receiptoutCrForm.setCreatorUserId(userInfo.getUserId()); - receiptoutCrForm.setOrgnizeId(StringUtil.isEmpty(userInfo.getDepartmentId()) ? userInfo.getOrganizeId() : userInfo.getDepartmentId()); - if(userInfo.getPositionIds()!=null&&userInfo.getPositionIds().length>0){ - receiptoutCrForm.setDepartmentId(userInfo.getPositionIds()[0]); - } ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class); entity.setId(mainId); receiptoutService.save(entity); + List Receiptout_item0List = JsonUtil.getJsonToList(receiptoutCrForm.getReceiptout_item0List(),Receiptout_item0Entity.class); + for(Receiptout_item0Entity entitys : Receiptout_item0List){ + entitys.setId(RandomUtil.uuId()); + entitys.setReceiptinId(entity.getId()); + + + + + + + + + + + + + receiptout_item0Service.save(entitys); + } + return ActionResult.success("创建成功"); @@ -160,15 +185,10 @@ public class ReceiptoutController { List list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ + Map sourceNoMap = new HashMap<>(); + entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId())); entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); - entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId())); - if (StringUtil.isNotBlank(entity.getOrgnizeId())){ - entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "all")); - - } - entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId())); } List listVO=JsonUtil.getJsonToList(list,ReceiptoutListVO.class); for(ReceiptoutListVO receiptoutVO:listVO){ @@ -191,30 +211,30 @@ public class ReceiptoutController { case "documentNo" : entitys.add(new ExcelExportEntity("单据编号" ,"documentNo")); break; - case "customerName" : - entitys.add(new ExcelExportEntity("客户名称" ,"customerName")); + case "type" : + entitys.add(new ExcelExportEntity("业务类型" ,"type")); + break; + case "sourceNo" : + entitys.add(new ExcelExportEntity("来源单号" ,"sourceNo")); break; case "amount" : entitys.add(new ExcelExportEntity("出库金额" ,"amount")); break; - case "num" : - entitys.add(new ExcelExportEntity("出库数量" ,"num")); - break; case "currency" : entitys.add(new ExcelExportEntity("币别" ,"currency")); break; - case "issueDate" : - entitys.add(new ExcelExportEntity("出库日期" ,"issueDate")); - break; - case "sourceNo" : - entitys.add(new ExcelExportEntity("来源单号" ,"sourceNo")); + case "num" : + entitys.add(new ExcelExportEntity("出库数量" ,"num")); break; - case "type" : - entitys.add(new ExcelExportEntity("业务类型" ,"type")); + case "customerName" : + entitys.add(new ExcelExportEntity("客户名称" ,"customerName")); break; case "remark" : entitys.add(new ExcelExportEntity("备注" ,"remark")); break; + case "issueDate" : + entitys.add(new ExcelExportEntity("出库日期" ,"issueDate")); + break; case "status" : entitys.add(new ExcelExportEntity("单据状态" ,"status")); break; @@ -222,25 +242,13 @@ public class ReceiptoutController { entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime")); break; case "creatorUserName" : - entitys.add(new ExcelExportEntity("创建人" ,"creatorUserName")); - break; - case "creatorUserId" : - entitys.add(new ExcelExportEntity("创建人id" ,"creatorUserId")); - break; - case "lastModifyUserName" : - entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName")); - break; - case "lastModifyUserId" : - entitys.add(new ExcelExportEntity("修改人id" ,"lastModifyUserId")); + entitys.add(new ExcelExportEntity("创建人名称" ,"creatorUserName")); break; case "lastModifyTime" : entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime")); break; - case "orgnizeId" : - entitys.add(new ExcelExportEntity("组织id" ,"orgnizeId")); - break; - case "departmentId" : - entitys.add(new ExcelExportEntity("部门id" ,"departmentId")); + case "lastModifyUserName" : + entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName")); break; default: break; @@ -309,19 +317,16 @@ public class ReceiptoutController { vo.setCreatorTime(vo.getCreatorTime()); } vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); - vo.setCreatorUserId(generaterSwapUtil.userSelectValue(vo.getCreatorUserId())); - vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName())); - vo.setLastModifyUserId(generaterSwapUtil.userSelectValue(vo.getLastModifyUserId())); if(vo.getLastModifyTime()!=null){ vo.setLastModifyTime(vo.getLastModifyTime()); } - if (StringUtil.isNotBlank(vo.getOrgnizeId())){ - vo.setOrgnizeId(generaterSwapUtil.comSelectValue(vo.getOrgnizeId(), "all")); - } - - vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId())); + vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName())); //子表 + List Receiptout_item0List = receiptoutService.GetReceiptout_item0List(id); + for(Receiptout_item0Entity receiptout_item0Entity : Receiptout_item0List){ + } + vo.setReceiptout_item0List(JsonUtil.getJsonToList(Receiptout_item0List,Receiptout_item0Model.class )); //副表 return ActionResult.success(vo); } @@ -338,19 +343,23 @@ public class ReceiptoutController { ReceiptoutInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptoutInfoVO.class); //子表数据转换 + List jg_receiptout_item0List = receiptoutService.GetReceiptout_item0List(id); + List jg_receiptout_item0ModelList = JsonUtil.getJsonToList(jg_receiptout_item0List,Receiptout_item0Model.class); + for(Receiptout_item0Model jg_receiptout_item0Model : jg_receiptout_item0ModelList){ + Map licenseNoMap = new HashMap<>(); + jg_receiptout_item0Model.setLicenseNo(generaterSwapUtil.getPopupSelectValue("392933248017164229","license_no","license_no",jg_receiptout_item0Model.getLicenseNo(),licenseNoMap)); + Map reservoirareaIdMap = new HashMap<>(); + jg_receiptout_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptout_item0Model.getReservoirareaId(),reservoirareaIdMap)); + } + vo.setReceiptout_item0List(jg_receiptout_item0ModelList); //附表数据转换 //添加到详情表单对象中 + Map sourceNoMap = new HashMap<>(); + vo.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",vo.getSourceNo(),sourceNoMap)); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); - vo.setCreatorUserId(generaterSwapUtil.userSelectValue(vo.getCreatorUserId())); vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName())); - vo.setLastModifyUserId(generaterSwapUtil.userSelectValue(vo.getLastModifyUserId())); - if (StringUtil.isNotBlank(vo.getOrgnizeId())){ - vo.setOrgnizeId(generaterSwapUtil.comSelectValue(vo.getOrgnizeId(), "all")); - } - - vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId())); return ActionResult.success(vo); } @@ -370,16 +379,36 @@ public class ReceiptoutController { UserInfo userInfo=userProvider.get(); ReceiptoutEntity entity= receiptoutService.getInfo(id); if(entity!=null){ - receiptoutUpForm.setLastModifyUserName(userInfo.getUserId()); - receiptoutUpForm.setLastModifyUserId(userInfo.getUserId()); receiptoutUpForm.setLastModifyTime(DateUtil.getNow()); - receiptoutUpForm.setOrgnizeId(entity.getOrgnizeId()); - receiptoutUpForm.setDepartmentId(entity.getDepartmentId()); + receiptoutUpForm.setLastModifyUserName(userInfo.getUserId()); ReceiptoutEntity subentity=JsonUtil.getJsonToBean(receiptoutUpForm, ReceiptoutEntity.class); subentity.setCreatorTime(entity.getCreatorTime()); subentity.setCreatorUserName(entity.getCreatorUserName()); - subentity.setCreatorUserId(entity.getCreatorUserId()); receiptoutService.update(id, subentity); + + QueryWrapper Receiptout_item0queryWrapper = new QueryWrapper<>(); + Receiptout_item0queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId, entity.getId()); + receiptout_item0Service.remove(Receiptout_item0queryWrapper); + + List Receiptout_item0List = JsonUtil.getJsonToList(receiptoutUpForm.getReceiptout_item0List(),Receiptout_item0Entity.class); + for(Receiptout_item0Entity entitys : Receiptout_item0List){ + + + + + + + + + + + + + entitys.setId(RandomUtil.uuId()); + entitys.setReceiptinId(entity.getId()); + receiptout_item0Service.save(entitys); + } + return ActionResult.success("更新成功"); }else{ return ActionResult.fail("更新失败，数据不存在"); @@ -400,6 +429,9 @@ public class ReceiptoutController { ReceiptoutEntity entity= receiptoutService.getInfo(id); if(entity!=null){ receiptoutService.delete(entity); + QueryWrapper queryWrapperReceiptout_item0=new QueryWrapper<>(); + queryWrapperReceiptout_item0.lambda().eq(Receiptout_item0Entity::getReceiptinId,entity.getId()); + receiptout_item0Service.remove(queryWrapperReceiptout_item0); } return ActionResult.success("删除成功"); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java index d58188ae..da03c904 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data @TableName("jg_receiptout") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java index be3531fe..a47f25b7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data @TableName("jg_receiptout_item0") @@ -80,11 +80,11 @@ public class Receiptout_item0Entity { @TableField("MATERIAL_NAME") private String materialName; - @TableField("AREA_CODE") - private String areaCode; + @TableField("WAREHOUSE_ID") + private String warehouseId; - @TableField("AREA_NAME") - private String areaName; + @TableField("RESERVOIRAREA_ID") + private String reservoirareaId; @TableField("UNIT") private String unit; @@ -110,4 +110,7 @@ public class Receiptout_item0Entity { @TableField("REMARK") private String remark; + @TableField("SALESORDERITEM_ID") + private String salesorderitemId; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java index cb1424e9..a6b3423a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java @@ -1,8 +1,8 @@ package jnpf.receiptout.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.receiptout.entity.ReceiptoutEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @@ -10,7 +10,7 @@ import jnpf.receiptout.entity.ReceiptoutEntity; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-02-08 */ public interface ReceiptoutMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java index d0f16de1..38720ef1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java @@ -1,8 +1,8 @@ package jnpf.receiptout.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.receiptout.entity.Receiptout_item0Entity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @@ -10,7 +10,7 @@ import jnpf.receiptout.entity.Receiptout_item0Entity; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-02-08 */ public interface Receiptout_item0Mapper extends BaseMapper { 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 1b576ead..10bf0986 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 @@ -2,6 +2,7 @@ package jnpf.receiptout.model.receiptout; +import jnpf.receiptout.model.receiptout.Receiptout_item0Model; import lombok.Data; import java.util.List; import java.math.BigDecimal; @@ -14,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data public class ReceiptoutCrForm { @@ -23,38 +24,38 @@ public class ReceiptoutCrForm { @JsonProperty("documentNo") private String documentNo; - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + /** 业务类型 **/ + @JsonProperty("type") + private String type; + + /** 来源单号 **/ + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ @JsonProperty("amount") private String amount; - /** 出库数量 **/ - @JsonProperty("num") - private String num; - /** 币别 **/ @JsonProperty("currency") private String currency; - /** 出库日期 **/ - @JsonProperty("issueDate") - private Long issueDate; - - /** 来源单号 **/ - @JsonProperty("sourceNo") - private String sourceNo; + /** 出库数量 **/ + @JsonProperty("num") + private String num; - /** 业务类型 **/ - @JsonProperty("type") - private String type; + /** 客户名称 **/ + @JsonProperty("customerName") + private String customerName; /** 备注 **/ @JsonProperty("remark") private String remark; + /** 出库日期 **/ + @JsonProperty("issueDate") + private Long issueDate; + /** 单据状态 **/ @JsonProperty("status") private String status; @@ -63,34 +64,21 @@ public class ReceiptoutCrForm { @JsonProperty("creatorTime") private String creatorTime; - /** 创建人 **/ + /** 创建人名称 **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 创建人id **/ - @JsonProperty("creatorUserId") - private String creatorUserId; - - /** 修改人名称 **/ - @JsonProperty("lastModifyUserName") - private String lastModifyUserName; - - /** 修改人id **/ - @JsonProperty("lastModifyUserId") - private String lastModifyUserId; - /** 修改时间 **/ @JsonProperty("lastModifyTime") private String lastModifyTime; - /** 组织id **/ - @JsonProperty("orgnizeId") - private String orgnizeId; - - /** 部门id **/ - @JsonProperty("departmentId") - private String departmentId; + /** 修改人名称 **/ + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; + /** 子表数据 **/ + @JsonProperty("receiptout_item0List") + private List receiptout_item0List; } \ No newline at end of file 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 851f9d83..abacb887 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 @@ -3,6 +3,7 @@ package jnpf.receiptout.model.receiptout; +import jnpf.receiptout.model.receiptout.Receiptout_item0Model; import lombok.Data; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -15,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data public class ReceiptoutInfoVO{ @@ -27,38 +28,38 @@ public class ReceiptoutInfoVO{ @JsonProperty("documentNo") private String documentNo; - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + /** 业务类型 **/ + @JsonProperty("type") + private String type; + + /** 来源单号 **/ + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ @JsonProperty("amount") private String amount; - /** 出库数量 **/ - @JsonProperty("num") - private String num; - /** 币别 **/ @JsonProperty("currency") private String currency; - /** 出库日期 **/ - @JsonProperty("issueDate") - private Long issueDate; - - /** 来源单号 **/ - @JsonProperty("sourceNo") - private String sourceNo; + /** 出库数量 **/ + @JsonProperty("num") + private String num; - /** 业务类型 **/ - @JsonProperty("type") - private String type; + /** 客户名称 **/ + @JsonProperty("customerName") + private String customerName; /** 备注 **/ @JsonProperty("remark") private String remark; + /** 出库日期 **/ + @JsonProperty("issueDate") + private Long issueDate; + /** 单据状态 **/ @JsonProperty("status") private String status; @@ -68,33 +69,20 @@ public class ReceiptoutInfoVO{ @JsonProperty("creatorTime") private Date creatorTime; - /** 创建人 **/ + /** 创建人名称 **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 创建人id **/ - @JsonProperty("creatorUserId") - private String creatorUserId; - - /** 修改人名称 **/ - @JsonProperty("lastModifyUserName") - private String lastModifyUserName; - - /** 修改人id **/ - @JsonProperty("lastModifyUserId") - private String lastModifyUserId; - /** 修改时间 **/ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("lastModifyTime") private Date lastModifyTime; - /** 组织id **/ - @JsonProperty("orgnizeId") - private String orgnizeId; - - /** 部门id **/ - @JsonProperty("departmentId") - private String departmentId; + /** 修改人名称 **/ + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; + /** 子表数据 **/ + @JsonProperty("receiptout_item0List") + private List receiptout_item0List; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java index 365a13df..a9059788 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data public class ReceiptoutListQuery extends Pagination { @@ -18,6 +18,9 @@ public class ReceiptoutListQuery extends Pagination { /** 单据编号 */ private String documentNo; + /** 业务类型 */ + private String type; + /** 客户名称 */ private String customerName; /** 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 905cc4aa..9e1a6ce9 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 @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data public class ReceiptoutListVO{ @@ -29,9 +29,14 @@ public class ReceiptoutListVO{ private String documentNo; - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + /** 业务类型 **/ + @JsonProperty("type") + private String type; + + + /** 来源单号 **/ + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ @@ -39,30 +44,19 @@ public class ReceiptoutListVO{ private String amount; - /** 出库数量 **/ - @JsonProperty("num") - private String num; - - /** 币别 **/ @JsonProperty("currency") private String currency; - /** 出库日期 **/ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @JsonProperty("issueDate") - private Date issueDate; - - - /** 来源单号 **/ - @JsonProperty("sourceNo") - private String sourceNo; + /** 出库数量 **/ + @JsonProperty("num") + private String num; - /** 业务类型 **/ - @JsonProperty("type") - private String type; + /** 客户名称 **/ + @JsonProperty("customerName") + private String customerName; /** 备注 **/ @@ -70,6 +64,12 @@ public class ReceiptoutListVO{ private String remark; + /** 出库日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("issueDate") + private Date issueDate; + + /** 单据状态 **/ @JsonProperty("status") private String status; @@ -81,40 +81,20 @@ public class ReceiptoutListVO{ private Date creatorTime; - /** 创建人 **/ + /** 创建人名称 **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 创建人id **/ - @JsonProperty("creatorUserId") - private String creatorUserId; - - - /** 修改人名称 **/ - @JsonProperty("lastModifyUserName") - private String lastModifyUserName; - - - /** 修改人id **/ - @JsonProperty("lastModifyUserId") - private String lastModifyUserId; - - /** 修改时间 **/ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("lastModifyTime") private Date lastModifyTime; - /** 组织id **/ - @JsonProperty("orgnizeId") - private String orgnizeId; - - - /** 部门id **/ - @JsonProperty("departmentId") - private String departmentId; + /** 修改人名称 **/ + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java index 80a875a0..6659852d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data public class ReceiptoutPagination extends Pagination { @@ -19,6 +19,9 @@ public class ReceiptoutPagination extends Pagination { /** 单据编号 */ private String documentNo; + /** 业务类型 */ + private String type; + /** 客户名称 */ private String customerName; /** diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java index cb3d7e73..0e349632 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data public class ReceiptoutPaginationExportModel extends Pagination { @@ -24,6 +24,9 @@ public class ReceiptoutPaginationExportModel extends Pagination { /** 单据编号 */ private String documentNo; + /** 业务类型 */ + private String type; + /** 客户名称 */ private String customerName; } \ No newline at end of file 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 5c1def00..700f4bb9 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 @@ -2,6 +2,7 @@ package jnpf.receiptout.model.receiptout; +import jnpf.receiptout.model.receiptout.Receiptout_item0Model; import lombok.Data; import java.util.List; import java.math.BigDecimal; @@ -15,7 +16,7 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-02-08 */ @Data public class ReceiptoutUpForm{ @@ -28,9 +29,14 @@ public class ReceiptoutUpForm{ private String documentNo; - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + /** 业务类型 **/ + @JsonProperty("type") + private String type; + + + /** 来源单号 **/ + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ @@ -38,29 +44,19 @@ public class ReceiptoutUpForm{ private String amount; - /** 出库数量 **/ - @JsonProperty("num") - private String num; - - /** 币别 **/ @JsonProperty("currency") private String currency; - /** 出库日期 **/ - @JsonProperty("issueDate") - private Long issueDate; - - - /** 来源单号 **/ - @JsonProperty("sourceNo") - private String sourceNo; + /** 出库数量 **/ + @JsonProperty("num") + private String num; - /** 业务类型 **/ - @JsonProperty("type") - private String type; + /** 客户名称 **/ + @JsonProperty("customerName") + private String customerName; /** 备注 **/ @@ -68,6 +64,11 @@ public class ReceiptoutUpForm{ private String remark; + /** 出库日期 **/ + @JsonProperty("issueDate") + private Long issueDate; + + /** 单据状态 **/ @JsonProperty("status") private String status; @@ -78,39 +79,22 @@ public class ReceiptoutUpForm{ private String creatorTime; - /** 创建人 **/ + /** 创建人名称 **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 创建人id **/ - @JsonProperty("creatorUserId") - private String creatorUserId; - - - /** 修改人名称 **/ - @JsonProperty("lastModifyUserName") - private String lastModifyUserName; - - - /** 修改人id **/ - @JsonProperty("lastModifyUserId") - private String lastModifyUserId; - - /** 修改时间 **/ @JsonProperty("lastModifyTime") private String lastModifyTime; - /** 组织id **/ - @JsonProperty("orgnizeId") - private String orgnizeId; - - - /** 部门id **/ - @JsonProperty("departmentId") - private String departmentId; + /** 修改人名称 **/ + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; + /** 子表数据 **/ + @JsonProperty("receiptout_item0List") + private List receiptout_item0List; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java new file mode 100644 index 00000000..ca2adcda --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java @@ -0,0 +1,70 @@ +package jnpf.receiptout.model.receiptout; + +import lombok.Data; +import java.util.List; +import java.util.Date; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.alibaba.fastjson.annotation.JSONField; + +/** + * + * + * 版本： V3.2.0 + * 版权: LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-02-08 + */ +@Data +public class Receiptout_item0Model { + + /** 车牌号 **/ + @JsonProperty("licenseNo") + private String licenseNo; + + /** 物料名称 **/ + @JsonProperty("materialName") + private String materialName; + + /** 库区id **/ + @JsonProperty("reservoirareaId") + private String reservoirareaId; + + /** 仓库id **/ + @JsonProperty("warehouseId") + private String warehouseId; + + /** 出库数量 **/ + @JsonProperty("deliveryNum") + private String deliveryNum; + + /** 计量单位 **/ + @JsonProperty("unit") + private String unit; + + /** 单价 **/ + @JsonProperty("price") + private String price; + + /** 税率 **/ + @JsonProperty("rate") + private String rate; + + /** 金额 **/ + @JsonProperty("amount") + private String amount; + + /** 税额 **/ + @JsonProperty("rateAmount") + private String rateAmount; + + /** 批次号 **/ + @JsonProperty("batchNo") + private String batchNo; + + /** 磅单类型 **/ + @JsonProperty("deleteUserId") + private String deleteUserId; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java index 9d0cf4bb..a5f3c511 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java @@ -1,17 +1,18 @@ package jnpf.receiptout.service; +import jnpf.receiptout.entity.Receiptout_item0Entity; +import jnpf.receiptout.service.Receiptout_item0Service; -import com.baomidou.mybatisplus.extension.service.IService; import jnpf.receiptout.entity.ReceiptoutEntity; +import com.baomidou.mybatisplus.extension.service.IService; import jnpf.receiptout.model.receiptout.ReceiptoutPagination; - -import java.util.List; +import java.util.*; /** * * receiptout * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-02-08 */ public interface ReceiptoutService extends IService { @@ -30,6 +31,7 @@ public interface ReceiptoutService extends IService { boolean update( String id, ReceiptoutEntity entity); // 子表方法 + List GetReceiptout_item0List(String id); //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java index 12580a38..1b5afc15 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java @@ -1,16 +1,14 @@ package jnpf.receiptout.service; - -import com.baomidou.mybatisplus.extension.service.IService; import jnpf.receiptout.entity.Receiptout_item0Entity; - +import com.baomidou.mybatisplus.extension.service.IService; /** * * jg_receiptout_item0 * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-02-08 */ public interface Receiptout_item0Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java index 090514a0..4f0f11ca 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java @@ -1,27 +1,36 @@ package jnpf.receiptout.service.impl; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.annotation.TableField; -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.receiptout.entity.*; +import jnpf.receiptout.mapper.ReceiptoutMapper; +import jnpf.receiptout.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.util.RandomUtil; +import java.math.BigDecimal; +import cn.hutool.core.util.ObjectUtil; import jnpf.permission.model.authorize.AuthorizeConditionModel; -import jnpf.permission.service.AuthorizeService; -import jnpf.receiptout.entity.ReceiptoutEntity; -import jnpf.receiptout.entity.Receiptout_item0Entity; -import jnpf.receiptout.mapper.ReceiptoutMapper; + + import jnpf.receiptout.model.receiptout.ReceiptoutPagination; -import jnpf.receiptout.service.ReceiptoutService; -import jnpf.util.ServletUtil; -import jnpf.util.StringUtil; -import jnpf.util.UserProvider; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +import jnpf.permission.service.AuthorizeService; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; +import com.baomidou.mybatisplus.annotation.TableField; +import java.util.stream.Collectors; + + + + + + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; /** * @@ -29,10 +38,10 @@ import java.util.List; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-02-08 */ @Service -public class ReceiptoutServiceImpl extends ServiceImpl implements ReceiptoutService { +public class ReceiptoutServiceImpl extends ServiceImpl implements ReceiptoutService{ @Autowired @@ -42,6 +51,9 @@ public class ReceiptoutServiceImpl extends ServiceImpl GetReceiptout_item0List(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId, id); + return receiptout_item0Service.list(queryWrapper); + } //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java index 7cd926c3..b5eab109 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java @@ -1,10 +1,30 @@ package jnpf.receiptout.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jnpf.receiptout.entity.Receiptout_item0Entity; +import jnpf.receiptout.entity.*; import jnpf.receiptout.mapper.Receiptout_item0Mapper; -import jnpf.receiptout.service.Receiptout_item0Service; +import jnpf.receiptout.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.util.RandomUtil; +import java.math.BigDecimal; +import cn.hutool.core.util.ObjectUtil; +import jnpf.permission.model.authorize.AuthorizeConditionModel; + + + + + + + + import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; /** * @@ -12,10 +32,10 @@ import org.springframework.stereotype.Service; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-02-08 */ @Service -public class Receiptout_item0ServiceImpl extends ServiceImpl implements Receiptout_item0Service { +public class Receiptout_item0ServiceImpl extends ServiceImpl implements Receiptout_item0Service{ } \ No newline at end of file diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue index 6fc6062d..ec073a6b 100644 --- a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue @@ -6,66 +6,142 @@ @@ -90,28 +166,29 @@ dataForm: { id :'', documentNo : '', - customerName : '', + type : "0", + sourceNo : "XS002", amount : '', + currency : "0", num : '', - currency : "", - issueDate : '', - sourceNo : '', - type : "", + customerName : '', remark : '', - status : "", + issueDate : '', + status : "0", creatorTime : "", creatorUserName : "", - creatorUserId : "", - lastModifyUserName : "", - lastModifyUserId : "", lastModifyTime : "", - orgnizeId : "", - departmentId : "", + lastModifyUserName : "", + receiptout_item0List:[], }, + activefqhgdj:'0', + typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}], currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], - typeOptions:[{"fullName":"采购入库","id":"0"},{"fullName":"购赊入库","id":"1"}], statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}], + unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], + rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}], + deleteUserIdOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其它","id":"1"}], } }, computed: {}, @@ -123,6 +200,9 @@ methods: { dataInfo(dataAll){ let _dataAll =dataAll + for(let i=0;i<_dataAll.receiptout_item0List.length;i++){ + var _list = _dataAll.receiptout_item0List[i]; + } this.dataForm = _dataAll }, diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue index ba46809b..e7745830 100644 --- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue +++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue @@ -2,103 +2,220 @@ + width="1000px"> @@ -122,35 +239,49 @@ isDetail: false, dataForm: { documentNo : '', - customerName : '', + type : "0", + sourceNo : "XS002", amount : '', + currency : "0", num : '', - currency : "", - issueDate : '', - sourceNo : '', - type : "", + customerName : '', remark : '', - status : "", + issueDate : '', + status : "0", creatorTime : "", creatorUserName : "", - creatorUserId : "", - lastModifyUserName : "", - lastModifyUserId : "", lastModifyTime : "", - orgnizeId : "", - departmentId : "", + lastModifyUserName : "", + receiptout_item0List:[], }, + activefqhgdj:'0', rules: { - amount: [ + type: [ + { + required: true, + message: '请至少选择一个', + trigger: 'change' + }, ], - num: [ + sourceNo: [ + { + required: true, + message: '请至少选择一个', + trigger: 'change' + }, ], }, + typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}], + sourceNocolumnOptions:[ {"label":"单据编号","value":"document_no"}, {"label":"币别","value":"currency"}, {"label":"客户名称","value":"costomer_name"},], currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], - typeOptions:[{"fullName":"采购入库","id":"0"},{"fullName":"购赊入库","id":"1"}], statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}], + receiptout_item0licenseNocolumnOptions:[ {"label":"车辆号","value":"license_no"}, {"label":"物料名称","value":"material_name"}, {"label":"出库数量","value":"settlement"}, {"label":"计量单位","value":"unit"}, {"label":"含税单价","value":"unit_price"}, {"label":"税率","value":"rate"}, {"label":"金额","value":"price"}, {"label":"批次号","value":"poundlist_id"}, {"label":"磅单类型","value":"pound_type"},], + receiptout_item0reservoirareaIdcolumnOptions:[ {"label":"库区名称","value":"areaname"}, {"label":"最高库存","value":"maximum"}, {"label":"安全库存","value":"safety"}, {"label":"最低库存","value":"minimum"}, {"label":"仓库名称","value":"name"},], + unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], + rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}], + deleteUserIdOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其它","id":"1"}], } }, computed: {}, @@ -159,6 +290,45 @@ }, mounted() {}, methods: { + popupSelectChangeSourceNo(e,d){ + this.dataForm.customerName = d.costomer_name; + this.dataForm.currency = d.currency; + }, + popupSelectlicenseNo(a, b){ + for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) { + if(a == this.dataForm.receiptout_item0List[i].licenseNo){ + this.dataForm.receiptout_item0List[i].materialName = b.material_name; + this.dataForm.receiptout_item0List[i].deliveryNum = b.settlement; + this.dataForm.receiptout_item0List[i].unit = b.unit; + this.dataForm.receiptout_item0List[i].price = b.unit_price; + this.dataForm.receiptout_item0List[i].rate = b.rate; + this.dataForm.receiptout_item0List[i].amount = b.price; + this.dataForm.receiptout_item0List[i].batchNo = b.poundlist_id; + this.dataForm.receiptout_item0List[i].deleteUserId = b.pound_type; + this.dataForm.receiptout_item0List[i].rateAmount = b.price * b.rate; + + + } + } + }, + + popupSelectChangeReservoirarea(a,b){ + for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) { + if(a == this.dataForm.receiptout_item0List[i].reservoirareaId){ + this.dataForm.receiptout_item0List[i].warehouseId = b.name; + + } + } + }, + + + receiptout_item0Exist() { + let isOk = true; + for(let i=0;i { if (valid) { + if (!this.receiptout_item0Exist()) return this.request() } }) @@ -235,12 +406,38 @@ }) } }, + addreceiptout_item0List(){ + let item = { + licenseNo:undefined, + materialName:undefined, + reservoirareaId:undefined, + warehouseId:undefined, + deliveryNum:undefined, + unit:undefined, + price:undefined, + rate:undefined, + amount:undefined, + rateAmount:undefined, + batchNo:undefined, + deleteUserId:undefined, + } + this.dataForm.receiptout_item0List.push(item) + }, + delreceiptout_item0List(index) { + this.dataForm.receiptout_item0List.splice(index, 1); + }, dataList(){ var _data = JSON.parse(JSON.stringify(this.dataForm)); + for(let i=0;i<_data.receiptout_item0List.length;i++){ + var _list = _data.receiptout_item0List[i]; + } return _data; }, dataInfo(dataAll){ let _dataAll =dataAll + for(let i=0;i<_dataAll.receiptout_item0List.length;i++){ + var _list = _dataAll.receiptout_item0List[i]; + } this.dataForm = _dataAll }, }, diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue index 8ded7352..10473865 100644 --- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue +++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue @@ -9,6 +9,16 @@ + + + + + + + @@ -46,9 +56,9 @@ +/> +/> - + @@ -115,6 +125,7 @@ width="150" > detailVisible: false, query: { documentNo:undefined, + type:undefined, customerName:undefined, }, treeProps: { @@ -129,7 +140,7 @@ width="150" > currentPage: 1, pageSize: 20, sort: "desc", - sidx: "creatorTime", + sidx: "", }, formVisible: false, exportBoxVisible: false, @@ -145,12 +156,12 @@ width="150" > {prop: 'remark', label: '备注'}, {prop: 'status', label: '单据状态'}, {prop: 'creatorTime', label: '创建时间'}, - {prop: 'creatorUserName', label: '创建人'}, + {prop: 'creatorUserName', label: '创建人名称'}, ], + typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}], + typeProps:{"label":"fullName","value":"id"}, currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], currencyProps:{"label":"fullName","value":"id"}, - typeOptions:[{"fullName":"采购入库","id":"0"},{"fullName":"购赊入库","id":"1"}], - typeProps:{"label":"fullName","value":"id"}, statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}], statusProps:{"label":"fullName","value":"id"}, } @@ -279,7 +290,7 @@ width="150" > currentPage: 1, pageSize: 20, sort: "desc", - sidx: "creatorTime", + sidx: "", } this.initData() },