From e8522430674a15463630208e4a2af5861b416614 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 24 May 2023 17:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/packaginginventory/PackagingInventoryDto.java | 2 ++ .../cyf/api/packagingstorage/PackagingStorageDto.java | 4 ++-- .../cyf/api/packagingstorage/PackagingStorageVo.java | 2 ++ .../materialinventory/MaterialInventoryMapper.java | 3 +++ .../biz/materialinventory/MaterialInventoryRest.java | 5 +++++ .../materialinventory/MaterialInventoryService.java | 6 ++++++ .../packaginginventory/PackagingInventoryRest.java | 2 +- .../biz/packagingoutbound/PackagingOutboundMapper.xml | 2 +- .../packagingoutbound/PackagingOutboundService.java | 11 +++++++---- .../biz/packagingstorage/PackagingStorageMapper.xml | 4 +++- .../biz/packagingstorage/PackagingStorageService.java | 10 ++++++---- 11 files changed, 38 insertions(+), 13 deletions(-) diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java index 23f1b145..bc5fc860 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java @@ -23,5 +23,7 @@ public class PackagingInventoryDto implements Dto { private double initialInventory=0; //包装物类型 private String typeSid; + //备注 + private String remarks; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDto.java index 0e9a391e..e7dc665f 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDto.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDto.java @@ -32,6 +32,6 @@ public class PackagingStorageDto implements Dto { private String warehousingDate; //油罐库存 private double inventory=0; - //1 原料 2 包装物 - private String type; + //备注 + private String remarks; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageVo.java index c10b32a8..6ec47db1 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageVo.java @@ -18,6 +18,8 @@ public class PackagingStorageVo implements Vo { private String contractNumber; //供应商sid private String supplierSid; + //供应商名称 + private String supplierName; //签订日期 private String contractSigningDate; //发货车牌号 diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.java index 154e8fb1..6d893577 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory; import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventory; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -27,4 +28,6 @@ public interface MaterialInventoryMapper extends BaseMapper { List inventoryList(); @Select("select * from material_inventory where sid=#{sid}") MaterialInventory getInventoryBySid(@Param("sid")String sid); + @Select("select * from material_inventory where typeSid=#{sid}") + List getInventory(@Param("sid")String sid); } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryRest.java index 9a8d6ecd..5ecb0969 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryRest.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryRest.java @@ -53,6 +53,11 @@ public class MaterialInventoryRest { public ResultBean getTankBySid(@PathVariable String sid){ return RawMaterialInventoryService.getInventoryBySid(sid); } + @ApiOperation("根据typeSid查询") + @GetMapping("/getInventory/{typeSid}") + public ResultBean getInventory(@PathVariable String typeSid){ + return RawMaterialInventoryService.getInventory(typeSid); + } @ApiOperation("删除") @DeleteMapping("/delete/{sid}") public ResultBean delete(@PathVariable String sid ){ diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java index 1c429c77..999d8bba 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java @@ -13,6 +13,7 @@ import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory; import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryDto; import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryQuery; import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventory; import org.springframework.stereotype.Service; import java.util.List; @@ -61,6 +62,11 @@ public class MaterialInventoryService extends MybatisBaseService RawPackagingInventory=baseMapper.getInventory(sid); + return rb.success().setData(RawPackagingInventory); + } public ResultBean del(String sid){ ResultBean rb=new ResultBean(); baseMapper.delete(new QueryWrapper().eq("sid",sid)); diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryRest.java index 147fa52f..62f8c474 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryRest.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryRest.java @@ -54,7 +54,7 @@ public class PackagingInventoryRest { return packagingPackagingInventoryService.getInventoryBySid(sid); } @ApiOperation("根据typeSid查询") - @GetMapping("/getInventory/{sid}") + @GetMapping("/getInventory/{typeSid}") public ResultBean getInventory(@PathVariable String typeSid){ return packagingPackagingInventoryService.getInventory(typeSid); } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml index 7c446eae..ffba8530 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml @@ -9,7 +9,7 @@ FROM packaging_outbound o left join packaging_inventory i on i.sid=o.inventorySid - left join packaging_type t on t.sid=i.typeSid") + left join packaging_type t on t.sid=i.typeSid ${ew.sqlSegment} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java index 044b3ff6..997ca8af 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java @@ -10,11 +10,14 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventory; import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutbound; import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundDto; import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundQuery; import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundVo; import com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper; +import com.yxt.supervise.cyf.biz.packaginginventory.PackagingInventoryMapper; +import com.yxt.supervise.cyf.biz.packaginginventory.PackagingInventoryService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,7 +33,7 @@ import java.util.List; public class PackagingOutboundService extends MybatisBaseService { @Autowired - MaterialInventoryMapper rawMaterialInventoryMapper; + PackagingInventoryMapper packagingInventoryMapper; public PagerVo listPageVo(PagerQuery pq) { PackagingOutboundQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -57,9 +60,9 @@ public class PackagingOutboundService extends MybatisBaseService().eq("sid",dto.getInventorySid())); - rawMaterialInventory.setInventory(rawMaterialInventory.getInventory()-dto.getWeight()); - rawMaterialInventoryMapper.updateById(rawMaterialInventory); + PackagingInventory packagingInventory=packagingInventoryMapper.selectOne(new QueryWrapper().eq("sid",dto.getInventorySid())); + packagingInventory.setInventory(packagingInventory.getInventory()-dto.getWeight()); + packagingInventoryMapper.updateById(packagingInventory); return rb.success().setMsg("新增成功"); } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml index 521967c4..1fc0ed9f 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml @@ -5,11 +5,13 @@