diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js index 9031de02..9a5f5124 100644 --- a/ant-design-vue-jeecg/src/config/router.config.js +++ b/ant-design-vue-jeecg/src/config/router.config.js @@ -646,4 +646,8 @@ export const constantRouterMap = [ path: '/shopping/views/person',//这里是你需要设置新窗口打开的页面的路径s component: () => import('@/views/shopping/pages/gerenzhongxin'), }, + { + path: '/shopping/views/order',//这里是你需要设置新窗口打开的页面的路径s + component: () => import('@/views/shopping/pages/orderDetails'), + }, ] diff --git a/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue b/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue index 2677c4df..2dade959 100644 --- a/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue @@ -112,7 +112,15 @@ 下载 - + + + 详情 @@ -279,6 +287,21 @@ align:"center", dataIndex: 'payTotalPrice' }, + { + title: '订单商品模块', + align: "center", + scopedSlots: {customRender: 'mk'} + }, + { + title: '订单商品面料', + align: "center", + scopedSlots: {customRender: 'ml'} + }, + { + title: '订单商品辅料', + align: "center", + scopedSlots: {customRender: 'fl'} + }, { title: '操作', dataIndex: 'action', @@ -289,7 +312,7 @@ } ], url: { - list: "/ordergoods/orderGoods/list", + list: "/ordergoods/orderGoods/list?orderid="+this.$route.query.orderid+"&ischild="+this.$route.query.ischild, delete: "/ordergoods/orderGoods/delete", deleteBatch: "/ordergoods/orderGoods/deleteBatch", exportXlsUrl: "/ordergoods/orderGoods/exportXls", @@ -309,6 +332,36 @@ }, }, methods: { + goodsModule(record) + { + this.$router.push({ + path: '/ordergoodsmodule/OrderGoodsModuleList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, + goodsModule2(record) + { + this.$router.push({ + path: '/ordergoodsfabric/OrderGoodsFabricList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, + goodsModule3(record) + { + this.$router.push({ + path: '/ordergoodsaccessories/OrderGoodsAccessoriesList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue b/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue index 90646e4a..632e2380 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue @@ -1,34 +1,19 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -174,12 +138,12 @@ } ], url: { - list: "/ordergoodsaccessories/orderGoodsAccessories/list", + list: "/ordergoodsaccessories/orderGoodsAccessories/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsaccessories/orderGoodsAccessories/delete", deleteBatch: "/ordergoodsaccessories/orderGoodsAccessories/deleteBatch", exportXlsUrl: "/ordergoodsaccessories/orderGoodsAccessories/exportXls", importExcelUrl: "ordergoodsaccessories/orderGoodsAccessories/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -187,6 +151,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品辅料管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue b/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue index 3defa2a9..4a8be7ea 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue @@ -1,34 +1,19 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -174,12 +138,12 @@ } ], url: { - list: "/ordergoodsfabric/orderGoodsFabric/list", + list: "/ordergoodsfabric/orderGoodsFabric/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsfabric/orderGoodsFabric/delete", deleteBatch: "/ordergoodsfabric/orderGoodsFabric/deleteBatch", exportXlsUrl: "/ordergoodsfabric/orderGoodsFabric/exportXls", importExcelUrl: "ordergoodsfabric/orderGoodsFabric/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -187,6 +151,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品面料管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue b/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue index 082ef795..0c40654e 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue @@ -1,44 +1,24 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -148,6 +107,7 @@ return { description: '订单商品模块表管理页面', // 表头 + biaoTi: '', columns: [ { title: '#', @@ -189,7 +149,7 @@ } ], url: { - list: "/ordergoodsmodule/orderGoodsModule/list", + list: "/ordergoodsmodule/orderGoodsModule/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsmodule/orderGoodsModule/delete", deleteBatch: "/ordergoodsmodule/orderGoodsModule/deleteBatch", exportXlsUrl: "/ordergoodsmodule/orderGoodsModule/exportXls", @@ -202,6 +162,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品模块管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue index 7fd1dc3b..f2345571 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue @@ -38,8 +38,8 @@

计划面料清单

- +

计划辅料清单

@@ -71,11 +71,11 @@ import {mixinDevice} from '@/utils/mixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin' import {filterObj} from "@/utils/util"; const columns1 = [ - { - title: '计划ID', - align: "center", - dataIndex: 'planId' - }, + // { + // title: '计划ID', + // align: "center", + // dataIndex: 'planId' + // }, { title: '面料', align: "center", @@ -89,11 +89,11 @@ const columns1 = [ ]; const columns2 = [ - { - title: '计划ID', - align: "center", - dataIndex: 'planId' - }, + // { + // title: '计划ID', + // align: "center", + // dataIndex: 'planId' + // }, { title: '辅料', align: "center", @@ -244,23 +244,7 @@ export default { this.loadRouteType = true; } }, - // showModal(id) { - // this.visible = true; - // this.id = id - // this.getDetailData() - // }, - // getDetailData() { - // getAction(this.url.detail, {id: this.id}).then((res) => { - // if (res.success) { - // this.data = res.result.records || res.result.records; - // console.log("data------------:" + JSON.stringify(this.data)); - // } else { - // this.$message.warning(res.message) - // } - // }).finally(() => { - // this.confirmLoading = false - // }) - // }, + handleOk(e) { this.confirmLoading = true; setTimeout(() => { diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue index 824682e7..64ce25d0 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue @@ -8,28 +8,75 @@ 量体数据
- - - 我的账户 - - - 我的收藏 - - - 地址管理 - - - 发票管理 - - - - 全部订单 - - - 全部订单 - - + + 我的账户 + 我的收藏 + 地址管理 + + 发票管理 + + Option 1 + + + Option 2 + + + Option 3 + + + Option 4 + + + + 全部订单 + + 待支付 + + + 待收货 + + + 已完成 + + + 退换服务 + + + + +
+
+
+ 订单编号：{{item.orderNum}} + + 删除 + 未支付 + 已支付 + +
+
+
+ +
+
+

{{item.name}}

+

+ 款式：{{item.type}}|尺码：{{item.size}}|数量：{{item.num}}件 + ¥ {{item.price}} +

+

主辅料：{{item.material}}

+

+ 总计：¥ {{item.total}} + + 立即支付 + 查看详情 + +

+
+
+
+
@@ -42,6 +89,35 @@ components: { Header,Footer }, data() { return { + current: ['mail'], + allOrders:[ + { + id:1, + orderNum:'CN172839729', + pay:false, + url:require("../assets/cloth001.png"), + name:'商品名商品名商品名商品名商品', + type:'衬衫', + size:'XXL', + num:2, + price:2456, + material:'主料1，辅料2，辅料3，辅料4，辅料5，辅料6', + total:5912 + }, + { + id:2, + orderNum:'CN172839730', + pay:true, + url:require("../assets/cloth002.png"), + name:'商品名商品名商品名商品名商品', + type:'衬衫', + size:'XXL', + num:3, + price:2456, + material:'主料1，辅料2，辅料3，辅料4，辅料5，辅料6', + total:5912 + } + ], }; }, @@ -49,6 +125,11 @@ callback(key) { console.log(key); }, + menuChange(key){ + if(key == daizhifu){ + // this.allOrders.forEach() + } + } }, }; @@ -82,12 +163,83 @@ margin-bottom: 60px; } } - /*/deep/ .ant-tabs-nav{*/ - /* width: 100%;*/ - /* & >div{*/ - /* display: flex;*/ - /* justify-content: space-around;*/ - /* }*/ - /*}*/ + .menu{width: 1114px;margin:0 auto} + /deep/ .ant-menu{ + display: flex; + justify-content: space-between; + } + .orderList{ + /*margin-top: 60px;*/ + width: 1114px;margin:0 auto; + padding: 20px; + .item{ + border-bottom: 1px solid #DADADA; + padding-top: 30px; + .top{ + justify-content: space-between; + color: #333; + .delete{ + text-decoration: underline; + color: #1B1B1B; + margin-right: 20px; + } + .pay{ + color: #E53E41; + } + } + .bottom{ + justify-content: space-between; + .l{ + img{ + width: 230px; + height: 230px; + } + } + .r{ + min-width: 800px; + padding-top: 30px; + .name{ + font-weight: 500; + } + .kuanshi{ + justify-content: space-between; + } + .line{ + margin-left: 30px; + margin-right: 30px; + } + .heji{ + justify-content: space-between; + .btn{ + display: inline-block; + width: 145px; + height: 40px; + line-height: 40px; + text-align: center; + } + .ljzf{ + background: #333333; + color: #fff; + margin-right: 20px; + border: 1px solid #333333; + + &:hover{ + background: rgba(0,0,0,0.7); + /*color: #333;*/ + } + } + .ckxq{ + color: #333; + border: 1px solid #333333; + &:hover{ + background: #333; + color: #fff; + } + } + } + } + } + } + } diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue new file mode 100644 index 00000000..e2c370cd --- /dev/null +++ b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue b/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue index 355cc426..5bcc5c1d 100644 --- a/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue +++ b/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue @@ -141,6 +141,8 @@ 生产 + 商品 + 详情 @@ -188,6 +190,14 @@ return parseInt(index)+1; } }, + { + title:'下单时间', + align:"center", + dataIndex: 'orderTime', + customRender:function (text) { + return !text?"":(text.length>10?text.substr(0,10):text) + } + }, { title:'是否子单', align:"center", @@ -198,14 +208,6 @@ align:"center", dataIndex: 'orderId_dictText' }, - { - title:'下单时间', - align:"center", - dataIndex: 'orderTime', - customRender:function (text) { - return !text?"":(text.length>10?text.substr(0,10):text) - } - }, { title:'订单编号', align:"center", @@ -424,6 +426,15 @@ } }, + shangpin(record){ + this.$router.push({ + path: '/ordergoods/OrderGoodsList', + query: { // 路由携带参数 + 'orderid': record.id, + 'ischild':record.ischild, + } + }); + }, getPcaText(code){ return this.pcaData.getText(code); }, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java index b2830be6..07941a6f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.delivery.service; import org.jeecg.modules.demo.delivery.entity.Delivery; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.productplan.entity.ZyPlanProcess; /** * @Description: 出库表 @@ -12,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IDeliveryService extends IService { + void sendToRepository(String planId); + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java index f866ebc4..7aa4f2bd 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java @@ -1,20 +1,97 @@ package org.jeecg.modules.demo.delivery.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.modules.demo.accessories.entity.ZyAccessories; +import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService; import org.jeecg.modules.demo.delivery.entity.Delivery; import org.jeecg.modules.demo.delivery.mapper.DeliveryMapper; import org.jeecg.modules.demo.delivery.service.IDeliveryService; +import org.jeecg.modules.demo.fabric.entity.ZyFabric; +import org.jeecg.modules.demo.fabric.service.IZyFabricService; +import org.jeecg.modules.productplan.entity.ZyPlanAccessories; +import org.jeecg.modules.productplan.entity.ZyPlanFabric; +import org.jeecg.modules.productplan.entity.ZyProductPlan; +import org.jeecg.modules.productplan.service.IZyPlanAccessoriesService; +import org.jeecg.modules.productplan.service.IZyPlanFabricService; +import org.jeecg.modules.productplan.service.IZyProductPlanService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; /** * @Description: 出库表 * @Author: jeecg-boot - * @Date: 2023-01-10 + * @Date: 2023-01-10 * @Version: V1.0 */ @Service public class DeliveryServiceImpl extends ServiceImpl implements IDeliveryService { + @Autowired + private IZyProductPlanService iZyProductPlanService; + + @Autowired + private IZyPlanFabricService iZyPlanFabricService; + + @Autowired + private IZyPlanAccessoriesService iZyPlanAccessoriesService; + + @Autowired + IZyFabricService iZyFabricService; + + @Autowired + private IZyAccessoriesService iZyAccessoriesService; + + @Override + public void sendToRepository(String planId) { + ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId); + Optional.ofNullable(zyProductPlan).orElseThrow(() -> new JeecgBootException("生产计划不存在!")); + + List fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() + .eq(ZyPlanFabric::getPlanId, planId)); + List deliveryList4Fabric = new LinkedList<>(); + Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { + Delivery delivery = new Delivery(); + delivery.setDeliveryReason("0"); + delivery.setItemType("0"); + delivery.setAmount(e.getAmount().doubleValue()); +// delivery.setDeliveryTime(new Date()); +// delivery.setCarrierId("TODO"); +// delivery.setAdminId("TODO"); +// delivery.setStorehouseId("TODO"); + ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); + if (!ObjectUtils.isEmpty(zyFabric)) { + delivery.setItemCode(zyFabric.getFabricNumber()); + } + deliveryList4Fabric.add(delivery); + }); + this.saveBatch(deliveryList4Fabric); + + List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() + .eq(ZyPlanAccessories::getPlanId, planId)); + List deliveryList4accessories = new LinkedList<>(); + Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { + Delivery delivery2 = new Delivery(); + delivery2.setDeliveryReason("0"); + delivery2.setItemType("1"); + delivery2.setAmount(e.getAmount().doubleValue()); +// delivery2.setDeliveryTime(new Date()); +// delivery2.setCarrierId("TODO"); +// delivery2.setAdminId("TODO"); +// delivery2.setStorehouseId("TODO"); + ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); + if (!ObjectUtils.isEmpty(zyAccessories)) { + delivery2.setItemCode(zyAccessories.getNums()); + } + deliveryList4accessories.add(delivery2); + }); + this.saveBatch(deliveryList4accessories); + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java index 1a241bd3..1317f815 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java @@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.demo.zyorders.entity.ZyOrders; +import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -49,6 +51,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class OrderGoodsController extends JeecgController { @Autowired private IOrderGoodsService orderGoodsService; + @Autowired + private IZyOrdersService zyOrdersService; /** * 分页列表查询 @@ -65,11 +69,34 @@ public class OrderGoodsController extends JeecgController queryPageList(OrderGoods orderGoods, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = orderGoodsService.page(page, queryWrapper); - return Result.OK(pageList); + HttpServletRequest req,@RequestParam(name="orderid",required=true)String orderid,@RequestParam(name="ischild",required=true)String ischild) { + if(orderid.equals("undefined")&&ischild.equals("undefined")){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper); + return Result.OK(pageList); + }else if(ischild.equals("0")){ + ZyOrders zyOrders = new ZyOrders(); + QueryWrapper queryWrapper1 = QueryGenerator.initQueryWrapper(zyOrders, req.getParameterMap()); + queryWrapper1.eq("order_id",orderid); + List list = zyOrdersService.list(queryWrapper1); + String ids = ""; + for (int i = 0 ; i < list.size() ; i++){ + ids = ids + list.get(i).getId()+","; + } + QueryWrapper queryWrapper2 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + queryWrapper2.in("orders_id",ids.substring(0,ids.length()-1).split(",")); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper2); + return Result.OK(pageList); + }else { + QueryWrapper queryWrapper3 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + queryWrapper3.eq("orders_id",orderid); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper3); + return Result.OK(pageList); + } + } /** diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java index 9ee06198..b0cacb91 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java @@ -65,8 +65,9 @@ public class OrderGoodsAccessoriesController extends JeecgController queryPageList(OrderGoodsAccessories orderGoodsAccessories, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsAccessories, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsAccessoriesService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java index c3f1f71e..7eeda25f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java @@ -65,8 +65,9 @@ public class OrderGoodsFabricController extends JeecgController queryPageList(OrderGoodsFabric orderGoodsFabric, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsFabric, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsFabricService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java index caf05345..f8c834e7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java @@ -65,8 +65,9 @@ public class OrderGoodsModuleController extends JeecgController queryPageList(OrderGoodsModule orderGoodsModule, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsModule, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsModuleService.page(page, queryWrapper); return Result.OK(pageList);