接口修改

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;
 
 }

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;
 }

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;
     //发货车牌号

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<MaterialInventory> {
     List<MaterialInventoryVo> inventoryList();
     @Select("select * from material_inventory where sid=#{sid}")
     MaterialInventory getInventoryBySid(@Param("sid")String sid);
+    @Select("select * from material_inventory where typeSid=#{sid}")
+    List<PackagingInventory> getInventory(@Param("sid")String sid);
 }

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 ){

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<MaterialInvento
         MaterialInventory RawMaterialInventory=baseMapper.getInventoryBySid(sid);
         return  rb.success().setData(RawMaterialInventory);
     }
+    public ResultBean getInventory(String sid){
+        ResultBean rb=new ResultBean();
+        List<PackagingInventory> RawPackagingInventory=baseMapper.getInventory(sid);
+        return  rb.success().setData(RawPackagingInventory);
+    }
     public ResultBean del(String sid){
         ResultBean rb=new ResultBean();
         baseMapper.delete(new QueryWrapper<MaterialInventory>().eq("sid",sid));

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);
     }

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
         <where>
             ${ew.sqlSegment}
         </where>

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<PackagingOutboundMapper, PackagingOutbound> {
 
     @Autowired
-    MaterialInventoryMapper rawMaterialInventoryMapper;
+    PackagingInventoryMapper packagingInventoryMapper;
     public PagerVo<PackagingOutboundVo> listPageVo(PagerQuery<PackagingOutboundQuery> pq) {
         PackagingOutboundQuery query = pq.getParams();
         QueryWrapper<PackagingOutbound> qw = new QueryWrapper<>();
@@ -57,9 +60,9 @@ public class PackagingOutboundService extends MybatisBaseService<PackagingOutbou
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         entity.setDeliveryDate(dfmt);
         baseMapper.insert(entity);
-        MaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper<MaterialInventory>().eq("sid",dto.getInventorySid()));
+        PackagingInventory packagingInventory=packagingInventoryMapper.selectOne(new QueryWrapper<PackagingInventory>().eq("sid",dto.getInventorySid()));
-        rawMaterialInventory.setInventory(rawMaterialInventory.getInventory()-dto.getWeight());
+        packagingInventory.setInventory(packagingInventory.getInventory()-dto.getWeight());
-        rawMaterialInventoryMapper.updateById(rawMaterialInventory);
+        packagingInventoryMapper.updateById(packagingInventory);
         return rb.success().setMsg("新增成功");
     }
 

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml

@@ -5,11 +5,13 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        *,t.name as typeName,i.inventory as inventory,
+        u.sid as supplierSid, u.supplierName as supplierName
         FROM
         packaging_storage s
         left join packaging_inventory i on i.sid=s.inventorySid
         left join packaging_type t on t.sid=i.typeSid
+        left join supplier_information u on u.sid=s.supplierSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java

@@ -10,11 +10,13 @@ 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.packagingstorage.PackagingStorage;
 import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageDto;
 import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageQuery;
 import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo;
 import com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper;
+import com.yxt.supervise.cyf.biz.packaginginventory.PackagingInventoryMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,7 +32,7 @@ import java.util.List;
 public class PackagingStorageService extends MybatisBaseService<PackagingStorageMapper, PackagingStorage> {
 
     @Autowired
-    MaterialInventoryMapper rawMaterialInventoryMapper;
+    PackagingInventoryMapper packagingInventoryMapper;
     public PagerVo<PackagingStorageVo> listPageVo(PagerQuery<PackagingStorageQuery> pq) {
         PackagingStorageQuery query = pq.getParams();
         QueryWrapper<PackagingStorage> qw = new QueryWrapper<>();
@@ -56,9 +58,9 @@ public class PackagingStorageService extends MybatisBaseService<PackagingStorage
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         entity.setWarehousingDate(dfmt);
         baseMapper.insert(entity);
-        MaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper<MaterialInventory>().eq("sid",dto.getInventorySid()));
+        PackagingInventory packagingInventory=packagingInventoryMapper.selectOne(new QueryWrapper<PackagingInventory>().eq("sid",dto.getInventorySid()));
-        rawMaterialInventory.setInventory(rawMaterialInventory.getInventory()+dto.getWeight());
+        packagingInventory.setInventory(packagingInventory.getInventory()+dto.getWeight());
-        rawMaterialInventoryMapper.updateById(rawMaterialInventory);
+        packagingInventoryMapper.updateById(packagingInventory);
         return rb.success().setMsg("新增成功");
     }