From ef673933fa13c6422f5ef8adf13a83f1bc102759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Wed, 8 Feb 2023 15:08:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReceiptinController.java | 209 ++++++------ .../receiptin/entity/ReceiptinEntity.java | 7 +- .../entity/Receiptin_item0Entity.java | 17 +- .../receiptin/mapper/ReceiptinMapper.java | 6 +- .../mapper/Receiptin_item0Mapper.java | 4 +- .../model/receiptin/ReceiptinCrForm.java | 66 ++-- .../model/receiptin/ReceiptinInfoVO.java | 67 ++-- .../model/receiptin/ReceiptinListQuery.java | 6 +- .../model/receiptin/ReceiptinListVO.java | 75 ++--- .../model/receiptin/ReceiptinPagination.java | 6 +- .../ReceiptinPaginationExportModel.java | 6 +- .../model/receiptin/ReceiptinUpForm.java | 76 ++--- .../model/receiptin/Receiptin_item0Model.java | 74 +++++ .../receiptin/service/ReceiptinService.java | 12 +- .../service/Receiptin_item0Service.java | 5 +- .../service/impl/ReceiptinServiceImpl.java | 66 ++-- .../impl/Receiptin_item0ServiceImpl.java | 30 +- .../scm/basicInformation/receiptin/Detail.vue | 174 +++++++--- .../scm/basicInformation/receiptin/Form.vue | 314 ++++++++++++++---- .../scm/basicInformation/receiptin/index.vue | 41 ++- 20 files changed, 783 insertions(+), 478 deletions(-) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java index 000c24bd..e32cfcba 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java @@ -1,53 +1,66 @@ package jnpf.receiptin.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.receiptin.entity.ReceiptinEntity; +import org.springframework.transaction.annotation.Transactional; +import jnpf.base.entity.ProvinceEntity; import jnpf.receiptin.model.receiptin.*; -import jnpf.receiptin.service.ReceiptinService; +import jnpf.receiptin.model.receiptin.ReceiptinPagination; +import jnpf.receiptin.entity.*; +import jnpf.receiptin.entity.Receiptin_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.receiptin.entity.ReceiptinEntity; +import jnpf.receiptin.service.ReceiptinService; +import jnpf.receiptin.entity.Receiptin_item0Entity; +import jnpf.receiptin.service.Receiptin_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; /** * - * 出库单 + * receiptin * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-11 + * @日期： 2023-02-08 */ @Slf4j @RestController -@Api(tags = "出库单" , value = "出库单") -@RequestMapping("/api/example/Receiptin") +@Api(tags = "receiptin" , value = "receiptin") +@RequestMapping("/api/receiptin/Receiptin") public class ReceiptinController { @Autowired @@ -62,6 +75,8 @@ public class ReceiptinController { @Autowired private ReceiptinService receiptinService; + @Autowired + private Receiptin_item0Service receiptin_item0Service; @@ -76,15 +91,9 @@ public class ReceiptinController { List list= receiptinService.getList(receiptinPagination); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptinEntity entity:list){ + Map soucenoMap = new HashMap<>(); + entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",entity.getSouceno(),soucenoMap)); 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,ReceiptinListVO.class); for(ReceiptinListVO receiptinVO:listVO){ @@ -110,16 +119,31 @@ public class ReceiptinController { public ActionResult create(@RequestBody @Valid ReceiptinCrForm receiptinCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); + receiptinCrForm.setDocumentno(generaterSwapUtil.getBillNumber("rukudanhao", false)); receiptinCrForm.setCreatorTime(DateUtil.getNow()); receiptinCrForm.setCreatorUserName(userInfo.getUserId()); - receiptinCrForm.setCreatorUserId(userInfo.getUserId()); - receiptinCrForm.setOrgnizeId(StringUtil.isEmpty(userInfo.getDepartmentId()) ? userInfo.getOrganizeId() : userInfo.getDepartmentId()); - if(userInfo.getPositionIds()!=null&&userInfo.getPositionIds().length>0){ - receiptinCrForm.setDepartmentId(userInfo.getPositionIds()[0]); - } ReceiptinEntity entity = JsonUtil.getJsonToBean(receiptinCrForm, ReceiptinEntity.class); entity.setId(mainId); receiptinService.save(entity); + List Receiptin_item0List = JsonUtil.getJsonToList(receiptinCrForm.getReceiptin_item0List(),Receiptin_item0Entity.class); + for(Receiptin_item0Entity entitys : Receiptin_item0List){ + entitys.setId(RandomUtil.uuId()); + entitys.setReceiptinId(entity.getId()); + + + + + + + + + + + + + receiptin_item0Service.save(entitys); + } + return ActionResult.success("创建成功"); @@ -160,15 +184,9 @@ public class ReceiptinController { List list= receiptinService.getTypeList(receiptinPagination,receiptinPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptinEntity entity:list){ + Map soucenoMap = new HashMap<>(); + entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",entity.getSouceno(),soucenoMap)); 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,ReceiptinListVO.class); for(ReceiptinListVO receiptinVO:listVO){ @@ -191,30 +209,30 @@ public class ReceiptinController { case "documentno" : entitys.add(new ExcelExportEntity("单据编号" ,"documentno")); break; - case "suppliername" : - entitys.add(new ExcelExportEntity("客户名称" ,"suppliername")); + case "type" : + entitys.add(new ExcelExportEntity("业务类型" ,"type")); break; - case "receiptamount" : - entitys.add(new ExcelExportEntity("出库金额" ,"receiptamount")); + case "souceno" : + entitys.add(new ExcelExportEntity("来源单号" ,"souceno")); break; - case "receiptnum" : - entitys.add(new ExcelExportEntity("出库数量" ,"receiptnum")); + case "receiptamount" : + entitys.add(new ExcelExportEntity("入库金额" ,"receiptamount")); break; case "currency" : entitys.add(new ExcelExportEntity("币别" ,"currency")); break; - case "warehousingdate" : - entitys.add(new ExcelExportEntity("出库日期" ,"warehousingdate")); - break; - case "souceno" : - entitys.add(new ExcelExportEntity("来源单号" ,"souceno")); + case "receiptnum" : + entitys.add(new ExcelExportEntity("入库数量" ,"receiptnum")); break; - case "type" : - entitys.add(new ExcelExportEntity("业务类型" ,"type")); + case "suppliername" : + entitys.add(new ExcelExportEntity("供应商名称" ,"suppliername")); break; case "remark" : entitys.add(new ExcelExportEntity("备注" ,"remark")); break; + case "warehousingdate" : + entitys.add(new ExcelExportEntity("入库日期" ,"warehousingdate")); + break; case "status" : entitys.add(new ExcelExportEntity("单据状态" ,"status")); break; @@ -224,24 +242,6 @@ public class ReceiptinController { 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")); - 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")); - break; default: break; } @@ -309,19 +309,12 @@ public class ReceiptinController { 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())); //子表 + List Receiptin_item0List = receiptinService.GetReceiptin_item0List(id); + for(Receiptin_item0Entity receiptin_item0Entity : Receiptin_item0List){ + } + vo.setReceiptin_item0List(JsonUtil.getJsonToList(Receiptin_item0List,Receiptin_item0Model.class )); //副表 return ActionResult.success(vo); } @@ -338,19 +331,22 @@ public class ReceiptinController { ReceiptinInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptinInfoVO.class); //子表数据转换 + List jg_receiptin_item0List = receiptinService.GetReceiptin_item0List(id); + List jg_receiptin_item0ModelList = JsonUtil.getJsonToList(jg_receiptin_item0List,Receiptin_item0Model.class); + for(Receiptin_item0Model jg_receiptin_item0Model : jg_receiptin_item0ModelList){ + Map licensenoMap = new HashMap<>(); + jg_receiptin_item0Model.setLicenseno(generaterSwapUtil.getPopupSelectValue("392933121244325765","license_num","license_num",jg_receiptin_item0Model.getLicenseno(),licensenoMap)); + Map reservoirareaIdMap = new HashMap<>(); + jg_receiptin_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptin_item0Model.getReservoirareaId(),reservoirareaIdMap)); + } + vo.setReceiptin_item0List(jg_receiptin_item0ModelList); //附表数据转换 //添加到详情表单对象中 + Map soucenoMap = new HashMap<>(); + vo.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",vo.getSouceno(),soucenoMap)); 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 +366,34 @@ public class ReceiptinController { UserInfo userInfo=userProvider.get(); ReceiptinEntity entity= receiptinService.getInfo(id); if(entity!=null){ - receiptinUpForm.setLastModifyUserName(userInfo.getUserId()); - receiptinUpForm.setLastModifyUserId(userInfo.getUserId()); - receiptinUpForm.setLastModifyTime(DateUtil.getNow()); - receiptinUpForm.setOrgnizeId(entity.getOrgnizeId()); - receiptinUpForm.setDepartmentId(entity.getDepartmentId()); ReceiptinEntity subentity=JsonUtil.getJsonToBean(receiptinUpForm, ReceiptinEntity.class); subentity.setCreatorTime(entity.getCreatorTime()); subentity.setCreatorUserName(entity.getCreatorUserName()); - subentity.setCreatorUserId(entity.getCreatorUserId()); receiptinService.update(id, subentity); + + QueryWrapper Receiptin_item0queryWrapper = new QueryWrapper<>(); + Receiptin_item0queryWrapper.lambda().eq(Receiptin_item0Entity::getReceiptinId, entity.getId()); + receiptin_item0Service.remove(Receiptin_item0queryWrapper); + + List Receiptin_item0List = JsonUtil.getJsonToList(receiptinUpForm.getReceiptin_item0List(),Receiptin_item0Entity.class); + for(Receiptin_item0Entity entitys : Receiptin_item0List){ + + + + + + + + + + + + + entitys.setId(RandomUtil.uuId()); + entitys.setReceiptinId(entity.getId()); + receiptin_item0Service.save(entitys); + } + return ActionResult.success("更新成功"); }else{ return ActionResult.fail("更新失败，数据不存在"); @@ -400,6 +414,9 @@ public class ReceiptinController { ReceiptinEntity entity= receiptinService.getInfo(id); if(entity!=null){ receiptinService.delete(entity); + QueryWrapper queryWrapperReceiptin_item0=new QueryWrapper<>(); + queryWrapperReceiptin_item0.lambda().eq(Receiptin_item0Entity::getReceiptinId,entity.getId()); + receiptin_item0Service.remove(queryWrapperReceiptin_item0); } return ActionResult.success("删除成功"); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java index 71a86fa3..fde013ff 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java @@ -1,12 +1,15 @@ package jnpf.receiptin.entity; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; +import java.math.BigDecimal; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -15,7 +18,7 @@ import java.util.Date; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-11 + * @日期： 2023-02-08 */ @Data @TableName("jg_receiptin") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java index 95806c1f..318d58ea 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-11 + * @日期： 2023-02-08 */ @Data @TableName("jg_receiptin_item0") @@ -80,12 +80,6 @@ public class Receiptin_item0Entity { @TableField("MATERIALNAME") private String materialname; - @TableField("AREACODE") - private String areacode; - - @TableField("AREANAME") - private String areaname; - @TableField("UNIT") private String unit; @@ -110,4 +104,13 @@ public class Receiptin_item0Entity { @TableField("REMARK") private String remark; + @TableField("RESERVOIRAREA_ID") + private String reservoirareaId; + + @TableField("WAREHOUSE_ID") + private String warehouseId; + + @TableField("PURCHASEORDERITEM_ID") + private String purchaseorderitemId; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java index 54b8dc4a..03fe268a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java @@ -1,16 +1,16 @@ package jnpf.receiptin.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.receiptin.entity.ReceiptinEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * - * 出库单 + * receiptin * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-11 + * 日期： 2023-02-08 */ public interface ReceiptinMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java index 3bae49a4..f5b6d29b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java @@ -1,8 +1,8 @@ package jnpf.receiptin.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.receiptin.entity.Receiptin_item0Entity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @@ -10,7 +10,7 @@ import jnpf.receiptin.entity.Receiptin_item0Entity; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-11 + * 日期： 2023-02-08 */ public interface Receiptin_item0Mapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java index 104e8a69..090653bb 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java @@ -2,6 +2,7 @@ package jnpf.receiptin.model.receiptin; +import jnpf.receiptin.model.receiptin.Receiptin_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-11 + * @日期： 2023-02-08 */ @Data public class ReceiptinCrForm { @@ -23,38 +24,38 @@ public class ReceiptinCrForm { @JsonProperty("documentno") private String documentno; - /** 客户名称 **/ - @JsonProperty("suppliername") - private String suppliername; + /** 业务类型 **/ + @JsonProperty("type") + private String type; + + /** 来源单号 **/ + @JsonProperty("souceno") + private String souceno; - /** 出库金额 **/ + /** 入库金额 **/ @JsonProperty("receiptamount") private String receiptamount; - /** 出库数量 **/ - @JsonProperty("receiptnum") - private String receiptnum; - /** 币别 **/ @JsonProperty("currency") private String currency; - /** 出库日期 **/ - @JsonProperty("warehousingdate") - private Long warehousingdate; - - /** 来源单号 **/ - @JsonProperty("souceno") - private String souceno; + /** 入库数量 **/ + @JsonProperty("receiptnum") + private String receiptnum; - /** 业务类型 **/ - @JsonProperty("type") - private String type; + /** 供应商名称 **/ + @JsonProperty("suppliername") + private String suppliername; /** 备注 **/ @JsonProperty("remark") private String remark; + /** 入库日期 **/ + @JsonProperty("warehousingdate") + private Long warehousingdate; + /** 单据状态 **/ @JsonProperty("status") private String status; @@ -67,30 +68,9 @@ public class ReceiptinCrForm { @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("receiptin_item0List") + private List receiptin_item0List; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java index bee70f16..5f5777dd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java @@ -3,6 +3,7 @@ package jnpf.receiptin.model.receiptin; +import jnpf.receiptin.model.receiptin.Receiptin_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-11 + * @日期： 2023-02-08 */ @Data public class ReceiptinInfoVO{ @@ -27,38 +28,38 @@ public class ReceiptinInfoVO{ @JsonProperty("documentno") private String documentno; - /** 客户名称 **/ - @JsonProperty("suppliername") - private String suppliername; + /** 业务类型 **/ + @JsonProperty("type") + private String type; + + /** 来源单号 **/ + @JsonProperty("souceno") + private String souceno; - /** 出库金额 **/ + /** 入库金额 **/ @JsonProperty("receiptamount") private String receiptamount; - /** 出库数量 **/ - @JsonProperty("receiptnum") - private String receiptnum; - /** 币别 **/ @JsonProperty("currency") private String currency; - /** 出库日期 **/ - @JsonProperty("warehousingdate") - private Long warehousingdate; - - /** 来源单号 **/ - @JsonProperty("souceno") - private String souceno; + /** 入库数量 **/ + @JsonProperty("receiptnum") + private String receiptnum; - /** 业务类型 **/ - @JsonProperty("type") - private String type; + /** 供应商名称 **/ + @JsonProperty("suppliername") + private String suppliername; /** 备注 **/ @JsonProperty("remark") private String remark; + /** 入库日期 **/ + @JsonProperty("warehousingdate") + private Long warehousingdate; + /** 单据状态 **/ @JsonProperty("status") private String status; @@ -72,29 +73,7 @@ public class ReceiptinInfoVO{ @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("receiptin_item0List") + private List receiptin_item0List; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java index 52f4e933..8698ee4d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-11 + * @日期： 2023-02-08 */ @Data public class ReceiptinListQuery extends Pagination { @@ -18,8 +18,8 @@ public class ReceiptinListQuery extends Pagination { /** 单据编号 */ private String documentno; - /** 客户名称 */ - private String suppliername; + /** 单据状态 */ + private String status; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java index 4a8507e5..dad97627 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-11 + * @日期： 2023-02-08 */ @Data public class ReceiptinListVO{ @@ -29,19 +29,19 @@ public class ReceiptinListVO{ private String documentno; - /** 客户名称 **/ - @JsonProperty("suppliername") - private String suppliername; + /** 业务类型 **/ + @JsonProperty("type") + private String type; - /** 出库金额 **/ - @JsonProperty("receiptamount") - private String receiptamount; + /** 来源单号 **/ + @JsonProperty("souceno") + private String souceno; - /** 出库数量 **/ - @JsonProperty("receiptnum") - private String receiptnum; + /** 入库金额 **/ + @JsonProperty("receiptamount") + private String receiptamount; /** 币别 **/ @@ -49,20 +49,14 @@ public class ReceiptinListVO{ private String currency; - /** 出库日期 **/ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @JsonProperty("warehousingdate") - private Date warehousingdate; - - - /** 来源单号 **/ - @JsonProperty("souceno") - private String souceno; + /** 入库数量 **/ + @JsonProperty("receiptnum") + private String receiptnum; - /** 业务类型 **/ - @JsonProperty("type") - private String type; + /** 供应商名称 **/ + @JsonProperty("suppliername") + private String suppliername; /** 备注 **/ @@ -70,6 +64,12 @@ public class ReceiptinListVO{ private String remark; + /** 入库日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("warehousingdate") + private Date warehousingdate; + + /** 单据状态 **/ @JsonProperty("status") private String status; @@ -86,35 +86,4 @@ public class ReceiptinListVO{ 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; - - } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java index 45255513..64b7dd0d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-11 + * @日期： 2023-02-08 */ @Data public class ReceiptinPagination extends Pagination { @@ -19,8 +19,8 @@ public class ReceiptinPagination extends Pagination { /** 单据编号 */ private String documentno; - /** 客户名称 */ - private String suppliername; + /** 单据状态 */ + private String status; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java index eb7e6ed1..2ea80f4e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-11 + * @日期： 2023-02-08 */ @Data public class ReceiptinPaginationExportModel extends Pagination { @@ -24,6 +24,6 @@ public class ReceiptinPaginationExportModel extends Pagination { /** 单据编号 */ private String documentno; - /** 客户名称 */ - private String suppliername; + /** 单据状态 */ + private String status; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java index 1543b3ed..5e72b3b9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java @@ -2,6 +2,7 @@ package jnpf.receiptin.model.receiptin; +import jnpf.receiptin.model.receiptin.Receiptin_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-11 + * @日期： 2023-02-08 */ @Data public class ReceiptinUpForm{ @@ -28,19 +29,19 @@ public class ReceiptinUpForm{ private String documentno; - /** 客户名称 **/ - @JsonProperty("suppliername") - private String suppliername; + /** 业务类型 **/ + @JsonProperty("type") + private String type; - /** 出库金额 **/ - @JsonProperty("receiptamount") - private String receiptamount; + /** 来源单号 **/ + @JsonProperty("souceno") + private String souceno; - /** 出库数量 **/ - @JsonProperty("receiptnum") - private String receiptnum; + /** 入库金额 **/ + @JsonProperty("receiptamount") + private String receiptamount; /** 币别 **/ @@ -48,19 +49,14 @@ public class ReceiptinUpForm{ private String currency; - /** 出库日期 **/ - @JsonProperty("warehousingdate") - private Long warehousingdate; - - - /** 来源单号 **/ - @JsonProperty("souceno") - private String souceno; + /** 入库数量 **/ + @JsonProperty("receiptnum") + private String receiptnum; - /** 业务类型 **/ - @JsonProperty("type") - private String type; + /** 供应商名称 **/ + @JsonProperty("suppliername") + private String suppliername; /** 备注 **/ @@ -68,6 +64,11 @@ public class ReceiptinUpForm{ private String remark; + /** 入库日期 **/ + @JsonProperty("warehousingdate") + private Long warehousingdate; + + /** 单据状态 **/ @JsonProperty("status") private String status; @@ -82,35 +83,8 @@ public class ReceiptinUpForm{ @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("receiptin_item0List") + private List receiptin_item0List; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java new file mode 100644 index 00000000..b04477a1 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java @@ -0,0 +1,74 @@ +package jnpf.receiptin.model.receiptin; + +import com.baomidou.mybatisplus.annotation.TableField; +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 Receiptin_item0Model { + + /** 车牌号 **/ + @JsonProperty("licenseno") + private String licenseno; + + /** 物料名称 **/ + @JsonProperty("materialname") + private String materialname; + + /** 库区名称 **/ + @JsonProperty("reservoirareaId") + private String reservoirareaId; + + /** 仓库名称 **/ + @JsonProperty("warehouseId") + private String warehouseId; + + /** 入库重量 **/ + @JsonProperty("num") + private String num; + + /** 计量单位 **/ + @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("lastModifyUserId") +// private String lastModifyUserId; + /** 磅单类型 **/ + @TableField(exist = false) + private String poundType; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java index 3a1804d0..0641951c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java @@ -1,17 +1,18 @@ package jnpf.receiptin.service; +import jnpf.receiptin.entity.Receiptin_item0Entity; +import jnpf.receiptin.service.Receiptin_item0Service; -import com.baomidou.mybatisplus.extension.service.IService; import jnpf.receiptin.entity.ReceiptinEntity; +import com.baomidou.mybatisplus.extension.service.IService; import jnpf.receiptin.model.receiptin.ReceiptinPagination; - -import java.util.List; +import java.util.*; /** * - * 出库单 + * receiptin * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-11 + * 日期： 2023-02-08 */ public interface ReceiptinService extends IService { @@ -30,6 +31,7 @@ public interface ReceiptinService extends IService { boolean update( String id, ReceiptinEntity entity); // 子表方法 + List GetReceiptin_item0List(String id); //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java index 78414ccf..7fa45ac6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java @@ -1,15 +1,14 @@ package jnpf.receiptin.service; -import com.baomidou.mybatisplus.extension.service.IService; import jnpf.receiptin.entity.Receiptin_item0Entity; - +import com.baomidou.mybatisplus.extension.service.IService; /** * * jg_receiptin_item0 * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-11 + * 日期： 2023-02-08 */ public interface Receiptin_item0Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java index 3170146d..7d8e1229 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java @@ -1,38 +1,47 @@ package jnpf.receiptin.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.receiptin.entity.*; +import jnpf.receiptin.mapper.ReceiptinMapper; +import jnpf.receiptin.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.receiptin.entity.ReceiptinEntity; -import jnpf.receiptin.entity.Receiptin_item0Entity; -import jnpf.receiptin.mapper.ReceiptinMapper; + + import jnpf.receiptin.model.receiptin.ReceiptinPagination; -import jnpf.receiptin.service.ReceiptinService; -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.*; /** * - * 出库单 + * receiptin * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-11 + * 日期： 2023-02-08 */ @Service -public class ReceiptinServiceImpl extends ServiceImpl implements ReceiptinService { +public class ReceiptinServiceImpl extends ServiceImpl implements ReceiptinService{ @Autowired @@ -42,6 +51,9 @@ public class ReceiptinServiceImpl extends ServiceImpl0){ @@ -191,9 +203,9 @@ public class ReceiptinServiceImpl extends ServiceImpl0){ @@ -252,6 +264,12 @@ public class ReceiptinServiceImpl extends ServiceImpl GetReceiptin_item0List(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Receiptin_item0Entity::getReceiptinId, id); + return receiptin_item0Service.list(queryWrapper); + } //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java index 497f1428..0de41731 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java @@ -1,10 +1,30 @@ package jnpf.receiptin.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jnpf.receiptin.entity.Receiptin_item0Entity; +import jnpf.receiptin.entity.*; import jnpf.receiptin.mapper.Receiptin_item0Mapper; -import jnpf.receiptin.service.Receiptin_item0Service; +import jnpf.receiptin.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-11 + * 日期： 2023-02-08 */ @Service -public class Receiptin_item0ServiceImpl extends ServiceImpl implements Receiptin_item0Service { +public class Receiptin_item0ServiceImpl extends ServiceImpl implements Receiptin_item0Service{ } \ No newline at end of file diff --git a/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue index d2f2848a..455b9318 100644 --- a/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue @@ -2,70 +2,146 @@ + width="1000px"> @@ -90,28 +166,27 @@ dataForm: { id :'', documentno : '', - suppliername : '', + type : "", + souceno : "", receiptamount : '', + currency : "0", receiptnum : '', - currency : "", - warehousingdate : '', - souceno : '', - type : "", + suppliername : '', remark : '', - status : "", + warehousingdate : '', + status : "0", creatorTime : "", creatorUserName : "", - creatorUserId : "", - lastModifyUserName : "", - lastModifyUserId : "", - lastModifyTime : "", - orgnizeId : "", - departmentId : "", + receiptin_item0List:[], }, + activevpzhms:'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"}], + poundTypeOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], } }, computed: {}, @@ -123,6 +198,9 @@ methods: { dataInfo(dataAll){ let _dataAll =dataAll + for(let i=0;i<_dataAll.receiptin_item0List.length;i++){ + var _list = _dataAll.receiptin_item0List[i]; + } this.dataForm = _dataAll }, @@ -133,7 +211,7 @@ if(this.dataForm.id){ this.loading = true request({ - url: '/api/example/Receiptin/detail/'+this.dataForm.id, + url: '/api/receiptin/Receiptin/detail/'+this.dataForm.id, method: 'get' }).then(res => { this.dataInfo(res.data) diff --git a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue index b0a68a0c..fdf1e2bd 100644 --- a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue +++ b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue @@ -2,48 +2,51 @@ + width="1000px"> @@ -122,24 +239,20 @@ isDetail: false, dataForm: { documentno : '', - suppliername : '', + type : "", + souceno : "", receiptamount : '', + currency : "0", receiptnum : '', - currency : "", - warehousingdate : '', - souceno : '', - type : "", + suppliername : '', remark : '', - status : "", + warehousingdate : '', + status : "0", creatorTime : "", creatorUserName : "", - creatorUserId : "", - lastModifyUserName : "", - lastModifyUserId : "", - lastModifyTime : "", - orgnizeId : "", - departmentId : "", + receiptin_item0List:[], }, + activevpzhms:'0', rules: { receiptamount: [ @@ -147,18 +260,62 @@ receiptnum: [ ], }, + typeOptions:[{"fullName":"采购入库","id":"0"},{"fullName":"购销入库","id":"1"}], + soucenocolumnOptions:[ {"label":"采购订单","value":"document_no"}, {"label":"供应商名称","value":"supplier_name"}, {"label":"币别","value":"currency"},], 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"}], + receiptin_item0licensenocolumnOptions:[ {"label":"车牌号","value":"license_num"}, {"label":"物料名称","value":"material_name"}, {"label":"库区名称","value":"in_area"}, {"label":"仓库名称","value":"name"}, {"label":"入库数量","value":"settlement"}, {"label":"计量单位","value":"unit"}, {"label":"单价","value":"price"}, {"label":"税率","value":"rate"}, {"label":"金额","value":"amount"}, {"label":"批次号","value":"poundlist_id"}, {"label":"磅单类型","value":"pount_type"},], + receiptin_item0reservoirareaIdcolumnOptions:[ {"label":"库区编码","value":"areacode"}, {"label":"库区名称","value":"areaname"}, {"label":"最高库存","value":"maximum"}, {"label":"安全库存","value":"safety"}, {"label":"最低库存","value":"minimum"}, {"label":"计量单位","value":"unit"}, {"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"}], + poundTypeOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], } }, computed: {}, - watch: {}, + watch: { + }, created() { }, mounted() {}, methods: { + popupSelect(e,d){ + this.dataForm.currency = d.currency; + this.dataForm.suppliername = d.supplier_name; + }, + popupSelect2(a, b){ + for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) { + if(a == this.dataForm.receiptin_item0List[i].licenseno){ + this.dataForm.receiptin_item0List[i].materialname = b.material_name; + this.dataForm.receiptin_item0List[i].reservoirareaId = b.in_area; + this.dataForm.receiptin_item0List[i].warehouseId = b.name; + this.dataForm.receiptin_item0List[i].num = b.settlement; + this.dataForm.receiptin_item0List[i].unit = b.unit; + this.dataForm.receiptin_item0List[i].price = b.price; + this.dataForm.receiptin_item0List[i].rate = b.rate; + this.dataForm.receiptin_item0List[i].amount = b.amount; + this.dataForm.receiptin_item0List[i].batchno = b.poundlist_id; + this.dataForm.receiptin_item0List[i].poundType = b.pound_type; + this.dataForm.receiptin_item0List[i].rateamount = b.amount*b.rate; + this.dataForm.receiptamount = parseFloat(this.dataForm.receiptamount) + parseFloat(b.amount); + this.dataForm.receiptnum = parseFloat(this.dataForm.receiptnum) + parseFloat(b.settlement); + } + } + }, + popupSelect3(j,k){ + for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) { + if (j == this.dataForm.receiptin_item0List[i].reservoirareaId){ + this.dataForm.receiptin_item0List[i].warehouseId = k.name; + } + } + }, + receiptin_item0Exist() { + let isOk = true; + for(let i=0;i { this.dataInfo(res.data) @@ -195,6 +352,7 @@ dataFormSubmit() { this.$refs['elForm'].validate((valid) => { if (valid) { + if (!this.receiptin_item0Exist()) return this.request() } }) @@ -203,7 +361,7 @@ var _data =this.dataList() if (!this.dataForm.id) { request({ - url: '/api/example/Receiptin', + url: '/api/receiptin/Receiptin', method: 'post', data: _data }).then((res) => { @@ -219,7 +377,7 @@ }) }else{ request({ - url: '/api/example/Receiptin/'+this.dataForm.id, + url: '/api/receiptin/Receiptin/'+this.dataForm.id, method: 'PUT', data: _data }).then((res) => { @@ -235,12 +393,38 @@ }) } }, + addreceiptin_item0List(){ + let item = { + licenseno:undefined, + materialname:undefined, + reservoirareaId:undefined, + warehouseId:undefined, + num:undefined, + unit:undefined, + price:undefined, + rate:undefined, + amount:undefined, + rateamount:undefined, + batchno:undefined, + poundType:undefined, + } + this.dataForm.receiptin_item0List.push(item) + }, + delreceiptin_item0List(index) { + this.dataForm.receiptin_item0List.splice(index, 1); + }, dataList(){ var _data = JSON.parse(JSON.stringify(this.dataForm)); + for(let i=0;i<_data.receiptin_item0List.length;i++){ + var _list = _data.receiptin_item0List[i]; + } return _data; }, dataInfo(dataAll){ let _dataAll =dataAll + for(let i=0;i<_dataAll.receiptin_item0List.length;i++){ + var _list = _dataAll.receiptin_item0List[i]; + } this.dataForm = _dataAll }, }, diff --git a/SC-web/src/views/scm/basicInformation/receiptin/index.vue b/SC-web/src/views/scm/basicInformation/receiptin/index.vue index 235bcada..4ba9ae28 100644 --- a/SC-web/src/views/scm/basicInformation/receiptin/index.vue +++ b/SC-web/src/views/scm/basicInformation/receiptin/index.vue @@ -10,8 +10,13 @@ - - + + + + @@ -56,6 +61,8 @@ + @@ -63,19 +70,17 @@ {{ scope.row.type | dynamicText(typeOptions) }} + - - - - @@ -115,7 +120,7 @@ width="150" > detailVisible: false, query: { documentno:undefined, - suppliername:undefined, + status:undefined, }, treeProps: { children: 'children', @@ -140,17 +145,17 @@ width="150" > {prop: 'receiptnum', label: '入库数量'}, {prop: 'currency', label: '币别'}, {prop: 'warehousingdate', label: '入库日期'}, + {prop: 'souceno', label: '来源单号'}, {prop: 'type', label: '业务类型'}, + {prop: 'remark', label: '备注'}, {prop: 'status', label: '单据状态'}, + {prop: 'creatorTime', label: '创建日期'}, {prop: 'creatorUserName', label: '创建人'}, - {prop: 'creatorTime', label: '创建时间'}, - {prop: 'remark', label: '备注'}, - {prop: 'souceno', 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"}, } @@ -183,7 +188,7 @@ width="150" > menuId:this.menuId }; request({ - url: `/api/example/Receiptin/getList`, + url: `/api/receiptin/Receiptin/getList`, method: 'post', data: _query }).then(res => { @@ -203,7 +208,7 @@ width="150" > type: 'warning' }).then(() => { request({ - url: `/api/example/Receiptin/${id}`, + url: `/api/receiptin/Receiptin/${id}`, method: 'DELETE' }).then(res => { this.$message({ @@ -235,7 +240,7 @@ width="150" > type: 'warning' }).then(() => { request({ - url: `/api/example/Receiptin/batchRemove/${ids}`, + url: `/api/receiptin/Receiptin/batchRemove/${ids}`, method: 'DELETE' }).then(res => { this.$message({ @@ -264,7 +269,7 @@ width="150" > download(data) { let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} request({ - url: `/api/example/Receiptin/Actions/Export`, + url: `/api/receiptin/Receiptin/Actions/Export`, method: 'GET', data: query }).then(res => {