From cb78d9a38b7231bd258a0e6bf9f9a97bd1e3baa4 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sun, 25 Jun 2023 21:13:57 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E3=80=81=E5=8D=8A=E6=88=90=E5=93=81=E3=80=81=E6=88=90=E5=93=81?= =?UTF-8?q?=20=E5=BA=93=E5=AD=98=E5=8F=98=E5=8A=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StIvtStructivtflowBcpController.java | 21 ++- .../mapper/StIvtStructivtflowBcpMapper.java | 6 + .../xml/StIvtStructivtflowBcpMapper.xml | 40 ++++ .../service/IStIvtStructivtflowService.java | 4 + .../impl/StIvtStructivtflowServiceImpl.java | 15 +- .../StIvtStructivtflowCpController.java | 22 ++- .../IStIvtStructivtflowCpService.java | 3 + .../mapper/StIvtStructivtflowCpMapper.java | 6 + .../dao/mapper/StIvtStructivtflowCpMapper.xml | 40 ++++ .../service/structIvt/dto/IvtFlowQuery.java | 33 ++++ .../impl/StIvtStructivtflowCpServiceImpl.java | 12 ++ .../StIvtIostorinvYlOutController.java | 2 +- .../StIvtStructivtflowYlController.java | 22 ++- .../mapper/xml/StIvtIostorinvOutYlMapper.xml | 4 +- .../dao/mapper/xml/StIvtIostorinvYlMapper.xml | 3 +- .../impl/StIvtIostorinvOutYlServiceImpl.java | 8 + .../impl/StIvtIostorinvYlServiceImpl.java | 3 + .../IStIvtStructivtflowYlService.java | 4 + .../mapper/StIvtStructivtflowYlMapper.java | 6 + .../mapper/xml/StIvtStructivtflowYlMapper.xml | 39 ++++ .../impl/StIvtStructivtflowYlServiceImpl.java | 15 +- .../product/productIvtFlow/index.vue | 172 ++++++++++++++++++ .../product/productIvtFlow/productivtFlow.js | 31 ++++ .../rawproduct/rawproductIvtFlow/index.vue | 172 ++++++++++++++++++ .../rawproductIvtFlow/productivtFlow.js | 31 ++++ .../semiproduct/semiproductIvt/index.vue | 2 +- .../semiproduct/semiproductIvtFlow/index.vue | 172 ++++++++++++++++++ .../semiproductIvtFlow/productivtFlow.js | 31 ++++ 28 files changed, 908 insertions(+), 11 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java create mode 100644 mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue create mode 100644 mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js create mode 100644 mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue create mode 100644 mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java index 0e32614c..682e083e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java @@ -1,8 +1,16 @@ package org.nl.wms.storage_manage.basedata.controller.record; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; /** @@ -14,8 +22,17 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtStructivtflowBcp") +@RequestMapping("/api/stIvtStructivtflowBcp") public class StIvtStructivtflowBcpController { + @Autowired + private IStIvtStructivtflowService iStIvtStructivtflowService; + + @GetMapping + @Log("查询库存变动记录") + @ApiOperation("查询库存变动记录") + public ResponseEntity query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowService.queryAll(query,page), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java index d099a168..f80ecdb5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java @@ -1,7 +1,12 @@ package org.nl.wms.storage_manage.basedata.service.record.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtStructivtflowBcpMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml index 0b9f8883..8eefcdcb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml @@ -2,4 +2,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java index ffcef334..be1d7478 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java @@ -1,9 +1,11 @@ package org.nl.wms.storage_manage.basedata.service.record.service; import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; /** *

@@ -18,4 +20,6 @@ public interface IStIvtStructivtflowService extends IService void recordStructivtFlow(StIvtStructivtflowDto flowDto); void insetIvtChange(JSONObject json); + + Object queryAll(IvtFlowQuery query, PageQuery page); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java index 51c07b9a..845129a3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java @@ -3,6 +3,10 @@ package org.nl.wms.storage_manage.basedata.service.record.service.impl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; @@ -16,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -96,7 +101,7 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java index 44d6d7ba..57fdcb8b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java @@ -1,5 +1,15 @@ package org.nl.wms.storage_manage.productmanage.controller.structIvt; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-04 */ @RestController -@RequestMapping("/stIvtStructivtflowCp") +@RequestMapping("/api/stIvtStructivtflowCp") public class StIvtStructivtflowCpController { + @Autowired + private IStIvtStructivtflowCpService iStIvtStructivtflowCpService; + + @GetMapping + @Log("查询库存变动记录") + @ApiOperation("查询库存变动记录") + public ResponseEntity query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowCpService.queryAll(query,page), HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java index 8bbdc523..be92d509 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java @@ -1,7 +1,9 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; /** *

@@ -13,4 +15,5 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStruct */ public interface IStIvtStructivtflowCpService extends IService { + Object queryAll(IvtFlowQuery query, PageQuery page); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java index b6eb6948..7cdba28b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java @@ -1,7 +1,12 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +18,5 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStruct */ public interface StIvtStructivtflowCpMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml index b113c5f6..28c7d3c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml @@ -2,4 +2,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java new file mode 100644 index 00000000..ca8aa330 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java @@ -0,0 +1,33 @@ +package org.nl.wms.storage_manage.productmanage.service.structIvt.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; + +/* + * @author LXY + * @Date 2023/5/4 19:49 + */ +@Data +public class IvtFlowQuery extends BaseQuery { + + + private String struct_code; + + private String bill_code; + + private String change_type_scode; + + private String material_code; + + private String stor_id; + + @Override + public void paramMapping() { + super.doP.put("struct_code", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java index 4f1585a6..faf0a298 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java @@ -1,9 +1,14 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtflowCpMapper; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.springframework.stereotype.Service; /** @@ -17,4 +22,11 @@ import org.springframework.stereotype.Service; @Service public class StIvtStructivtflowCpServiceImpl extends ServiceImpl implements IStIvtStructivtflowCpService { + @Override + public Object queryAll(IvtFlowQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java index c647d3f2..606eb7ac 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java @@ -50,7 +50,7 @@ public class StIvtIostorinvYlOutController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @PostMapping("/delete") + @DeleteMapping @Log("删除入库单") @ApiOperation("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java index a52d0663..b5c568dd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java @@ -1,8 +1,16 @@ package org.nl.wms.storage_manage.rawmanage.controller.structIvt; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; /** @@ -14,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtStructivtflowYl") +@RequestMapping("/api/stIvtStructivtflowYl") public class StIvtStructivtflowYlController { + @Autowired + private IStIvtStructivtflowYlService iStIvtStructivtflowYlService; + + @GetMapping + @Log("查询库存变动记录") + @ApiOperation("查询库存变动记录") + public ResponseEntity query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowYlService.queryAll(query,page), HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml index 830120d0..44f34c69 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml @@ -3,7 +3,7 @@ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml index 53fb1399..98290f81 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml @@ -3,7 +3,7 @@ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java index 93c84768..3a445077 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java @@ -143,6 +143,14 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl dtl_list = iostorinvdtlYlService.list(new QueryWrapper().eq("iostorinv_id", iostorinv_id)); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java index 11a168e1..37785ddb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java @@ -233,6 +233,9 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl * 仓位库存变动记录表 Mapper 接口 @@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtStructivtflowYlMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml index 6a06028d..0ba99204 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml @@ -2,4 +2,43 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java index 4da0a5ff..38758536 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java @@ -2,11 +2,16 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.impl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtflowYl; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtflowYlMapper; import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; @@ -44,7 +49,7 @@ public class StIvtStructivtflowYlServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue new file mode 100644 index 00000000..ee541af1 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue @@ -0,0 +1,172 @@ + + + + diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js new file mode 100644 index 00000000..994463b0 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtStructivtflowCp', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtStructivtflowCp/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtStructivtflowCp/update', + method: 'post', + data + }) +} + +export default { + add, + edit, + del +} diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue new file mode 100644 index 00000000..c8fba9c9 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue @@ -0,0 +1,172 @@ + + + + diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js new file mode 100644 index 00000000..bec90c03 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtStructivtflowYl', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtStructivtflowYl/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtStructivtflowYl/update', + method: 'post', + data + }) +} + +export default { + add, + edit, + del +} diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue index 82cfc1b5..0b3ef331 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue @@ -133,7 +133,7 @@ export default { } }, created() { - crudStorattr.getStor({ 'stor_type': '4' }).then(res => { + crudStorattr.getStor({ 'stor_type': '2' }).then(res => { this.storlist = res.content }) }, diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue new file mode 100644 index 00000000..a7605385 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue @@ -0,0 +1,172 @@ + + + + diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js new file mode 100644 index 00000000..b004d075 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtStructivtflowBcp', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtStructivtflowBcp/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtStructivtflowBcp/update', + method: 'post', + data + }) +} + +export default { + add, + edit, + del +}