diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/controller/StIvtStructivtflowController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/controller/StIvtStructivtflowController.java index dae0537e..44a8a35b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/controller/StIvtStructivtflowController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/controller/StIvtStructivtflowController.java @@ -1,6 +1,14 @@ package org.nl.wms.stor_manage.record.controller; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.stor_manage.record.service.IStIvtStructivtflowService; +import org.nl.wms.stor_manage.record.service.dto.StructIvtFlowQuery; +import org.nl.wms.stor_manage.struct.service.dto.StructattrQuery; +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,15 @@ import org.springframework.web.bind.annotation.RestController; * @since 2024-05-23 */ @RestController -@RequestMapping("/stIvtStructivtflow") +@RequestMapping("/api/stIvtStructivtflow") public class StIvtStructivtflowController { + @Autowired + private IStIvtStructivtflowService stIvtStructivtflowService; + + @GetMapping + public ResponseEntity query(StructIvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(stIvtStructivtflowService.pageQuery(query, page), HttpStatus.OK); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/IStIvtStructivtflowService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/IStIvtStructivtflowService.java index f6f4f247..b88e769b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/IStIvtStructivtflowService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/IStIvtStructivtflowService.java @@ -1,7 +1,9 @@ package org.nl.wms.stor_manage.record.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.stor_manage.record.service.dao.StIvtStructivtflow; +import org.nl.wms.stor_manage.record.service.dto.StructIvtFlowQuery; /** *

@@ -13,4 +15,5 @@ import org.nl.wms.stor_manage.record.service.dao.StIvtStructivtflow; */ public interface IStIvtStructivtflowService extends IService { + Object pageQuery(StructIvtFlowQuery query, PageQuery page); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/StIvtStructivtflowMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/StIvtStructivtflowMapper.java index 6c03a325..a0e91e85 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/StIvtStructivtflowMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/StIvtStructivtflowMapper.java @@ -1,7 +1,13 @@ package org.nl.wms.stor_manage.record.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.stor_manage.record.service.dao.StIvtStructivtflow; +import org.nl.wms.stor_manage.record.service.dto.StructIvtFlowQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +19,5 @@ import org.nl.wms.stor_manage.record.service.dao.StIvtStructivtflow; */ public interface StIvtStructivtflowMapper extends BaseMapper { + List getPageQuery(@Param("query") StructIvtFlowQuery query, PageQuery pageQuery); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/xml/StIvtStructivtflowMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/xml/StIvtStructivtflowMapper.xml index 705ae526..d1fd88d8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/xml/StIvtStructivtflowMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/xml/StIvtStructivtflowMapper.xml @@ -1,5 +1,23 @@ - - + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dto/StructIvtFlowQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dto/StructIvtFlowQuery.java new file mode 100644 index 00000000..1b569820 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dto/StructIvtFlowQuery.java @@ -0,0 +1,17 @@ +package org.nl.wms.stor_manage.record.service.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.stor_manage.record.service.dao.StIvtStructivtflow; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class StructIvtFlowQuery extends BaseQuery { + + private String search; +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/impl/StIvtStructivtflowServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/impl/StIvtStructivtflowServiceImpl.java index 4c563469..f73458b0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/impl/StIvtStructivtflowServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/impl/StIvtStructivtflowServiceImpl.java @@ -2,11 +2,19 @@ package org.nl.wms.stor_manage.record.service.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.entity.PageQuery; import org.nl.wms.stor_manage.record.service.IStIvtStructivtflowService; import org.nl.wms.stor_manage.record.service.dao.StIvtStructivtflow; import org.nl.wms.stor_manage.record.service.dao.mapper.StIvtStructivtflowMapper; +import org.nl.wms.stor_manage.record.service.dto.StructIvtFlowQuery; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** *

* 仓位库存变动记录表 服务实现类 @@ -18,4 +26,13 @@ import org.springframework.stereotype.Service; @Service public class StIvtStructivtflowServiceImpl extends ServiceImpl implements IStIvtStructivtflowService { + @Override + public Object pageQuery(StructIvtFlowQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + page.setOrderBy("update_time DESC"); + List mst_detail = this.baseMapper.getPageQuery(query, pageQuery); + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java index 673bce4d..dbd5b800 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java @@ -65,4 +65,8 @@ public class StIvtStructattrController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @GetMapping("/getStructIvt") + public ResponseEntity getStructIvt(StructattrQuery query, PageQuery page) { + return new ResponseEntity<>(structattrService.getStructIvt(query,page), HttpStatus.OK); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java index 93926195..d826a9f9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java @@ -45,4 +45,6 @@ public interface IStIvtStructattrService extends IService { List collectVechicle(Map query); List structVehicle(Map query); + + Object getStructIvt(StructattrQuery query, PageQuery page); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java index 419e817c..f0a77366 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java @@ -25,4 +25,6 @@ public interface StIvtStructattrMapper extends BaseMapper { List collectVehicle(Map query); List structVehicle(Map query); + + List getStructIvt(@Param("query")StructattrQuery query, PageQuery pageQuery); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml index 46c76fb1..ce971d14 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml @@ -38,19 +38,19 @@ + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java index 1332176d..dc16eaf6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java @@ -18,6 +18,7 @@ public class StructattrQuery extends BaseQuery { private String sect_code; private String lock_type; private Boolean is_used; + private String vehicle_code; @Override public void paramMapping() { super.doP.put("search", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java index cdc8258e..657d0319 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java @@ -146,6 +146,15 @@ public class StIvtStructattrServiceImpl extends ServiceImpl structVehicle(Map query) { List structVehicle = this.baseMapper.structVehicle(query); return structVehicle; + } + @Override + public Object getStructIvt(StructattrQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + page.setOrderBy("struct.create_time DESC"); + List mst_detail = this.baseMapper.getStructIvt(query, pageQuery); + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; } } diff --git a/wms_pro/qd/src/views/wms/stor_manage/record/curdStructIvtFlow.js b/wms_pro/qd/src/views/wms/stor_manage/record/curdStructIvtFlow.js new file mode 100644 index 00000000..c38c0a19 --- /dev/null +++ b/wms_pro/qd/src/views/wms/stor_manage/record/curdStructIvtFlow.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/stIvtStructivtflow', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/stIvtStructivtflow', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/stIvtStructivtflow', + method: 'put', + data + }) +} + + +export default {add, edit, del} diff --git a/wms_pro/qd/src/views/wms/stor_manage/record/index.vue b/wms_pro/qd/src/views/wms/stor_manage/record/index.vue new file mode 100644 index 00000000..6164b44e --- /dev/null +++ b/wms_pro/qd/src/views/wms/stor_manage/record/index.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue new file mode 100644 index 00000000..f4c1bcfe --- /dev/null +++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue @@ -0,0 +1,187 @@ + + + + +