From 4b8352418088251e160ab820cc947ce06f46b5ca Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Fri, 3 Mar 2023 18:17:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E9=92=A2=E9=87=87=E8=B4=AD=E9=94=80?= =?UTF-8?q?=E5=94=AE=E7=BB=9F=E8=AE=A1=E6=98=8E=E7=BB=86=E8=A1=A8=EF=BC=88?= =?UTF-8?q?=E6=8C=89=E7=A3=85=E5=8D=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PoundlistController.java | 14 ++++- .../poundlist/entity/PoundlistTwoEntity.java | 59 +++++++++++++++++++ .../poundlist/mapper/PoundlistMapper.java | 3 +- .../poundlist/service/PoundlistService.java | 3 + .../service/impl/PoundlistServiceImpl.java | 6 ++ .../mapper/poundlist/PoundlistMapper.xml | 22 +++++++ 6 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistTwoEntity.java diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index f0cefa25..2318ec77 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -484,7 +484,19 @@ public class PoundlistController { List list=poundlistService.qureylist(poundlistSEntity); return ActionResult.success(list); } - + /** + * + * 废钢采购销售统计明细表（按磅单） + * + * @param + * @return + */ + @ApiOperation("废钢采购销售统计明细表（按磅单）") + @PostMapping("/purchasesalesPriceList") + public ActionResult purchasesalesPriceList(@RequestBody PoundlistTwoEntity poundlistTwoEntity){ + List list=poundlistService.purchasesalesPricelist(poundlistTwoEntity); + return ActionResult.success(list); + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistTwoEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistTwoEntity.java new file mode 100644 index 00000000..ffc81d83 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistTwoEntity.java @@ -0,0 +1,59 @@ +package jnpf.poundlist.entity; + +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; + + +/** + * + * 磅单档案 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-02-21 + */ +@Data +@TableName("jg_poundlist") +public class PoundlistTwoEntity { + + @TableId("ID") + private String id; + + @TableField("CREATOR_TIME") + private String creatorTime; + + @TableField("DELETE_TIME") + private String deleteTime; + + @TableField(exist = false) + private String supplierName; + + @TableField(exist = false) + private String itemName; + + @TableField(exist = false) + private String unit; + + @TableField(exist = false) + private String weight; + + @TableField(exist = false) + private String purchasePrice; + + @TableField(exist = false) + private String supplierNm; + + @TableField(exist = false) + private String salesPrice; + + + @TableField(exist = false) + private String startTime; + + @TableField(exist = false) + private String endTime; +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java index 85f694fd..b3463466 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.poundlist.entity.PoundlistEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.poundlist.entity.PoundlistSEntity; +import jnpf.poundlist.entity.PoundlistTwoEntity; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,5 +25,5 @@ public interface PoundlistMapper extends BaseMapper { //销售毛利表 List qureylist(PoundlistSEntity poundlistSEntity); //废钢采购销售统计明细表（按磅单） - List qureylist2(PoundlistSEntity poundlistSEntity); + List qureylist2(PoundlistTwoEntity poundlistTwoEntity); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java index a6547d9d..c867451b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java @@ -3,6 +3,7 @@ package jnpf.poundlist.service; import jnpf.poundlist.entity.PoundlistEntity; import com.baomidou.mybatisplus.extension.service.IService; import jnpf.poundlist.entity.PoundlistSEntity; +import jnpf.poundlist.entity.PoundlistTwoEntity; import jnpf.poundlist.model.poundlist.PoundlistPagination; import java.util.*; /** @@ -30,6 +31,8 @@ public interface PoundlistService extends IService { boolean update( String id, PoundlistEntity entity); List qureylist(PoundlistSEntity poundlistSEntity); + //废钢采购销售统计明细表（按磅单） + List purchasesalesPricelist(PoundlistTwoEntity poundlistTwoEntity); // 子表方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index de803a69..f28d8c60 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -245,6 +245,12 @@ public class PoundlistServiceImpl extends ServiceImpl purchasesalesPricelist(PoundlistTwoEntity poundlistTwoEntity) { + List list= poundlistMapper.qureylist2(poundlistTwoEntity); + return list; + } + @Override public void delete(PoundlistEntity entity){ if(entity!=null){ diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml index a740b1fb..17b67db9 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml @@ -31,6 +31,28 @@ WHERE OR a.department_id =#{departmentIdS} + + +