From 6ba103368bb69214e386a526a3a6e85120f8ecb6 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Thu, 2 Mar 2023 10:53:38 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/shopping/components/collection.vue | 254 ++++++++++++++++++ .../views/shopping/pages/gerenzhongxin.vue | 4 +- 2 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 ant-design-vue-jeecg/src/views/shopping/components/collection.vue diff --git a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue new file mode 100644 index 00000000..b8a9c455 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue @@ -0,0 +1,254 @@ + + + + + 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 33863bc7..7266bd37 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue @@ -122,6 +122,7 @@ --> +
@@ -168,9 +169,10 @@ import { getFileAccessHttpUrl} from "@/api/manage" import { httpAction, getAction } from '@/api/manage' import PasswordModal from '../../system/modules/PasswordModal' + import Collection from "../components/collection"; export default { name: "gerenzhongxin", - components: { Header,Footer,PasswordModal }, + components: { Header,Footer,PasswordModal ,Collection}, data() {0 return { model:{ From 94d3795ff1a155917c123ee8646b69215f6f66a3 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Thu, 2 Mar 2023 11:01:23 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/shopping/components/collection.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue index b8a9c455..19d5e007 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue @@ -239,9 +239,18 @@ width: 300px; border-right: 1px solid #E7E7E7; .iconfont{ + width: 24px; + height: 24px; + text-align: center; + box-sizing: border-box; + border: 1px dashed #fff; position: absolute; + transition: all 0.1s; top: 5%; right: 5%; + &:hover{ + border-color: #999; + } } img{ width: 200px; From 529bdbe0c3e6a69123ea9b3f3134db0902b6ac87 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Fri, 3 Mar 2023 09:37:39 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/shopping/components/collection.vue | 209 +++++++++++------- .../controller/ApeopersionController.java | 103 ++++++++- .../modules/system/mapper/SysUserMapper.java | 9 + .../system/mapper/xml/SysUserMapper.xml | 10 + .../system/service/ISysUserService.java | 8 + .../service/impl/SysUserServiceImpl.java | 16 ++ 6 files changed, 264 insertions(+), 91 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue index b8a9c455..eefc27d1 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue @@ -1,16 +1,16 @@ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java index cce126b6..82f70adc 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java @@ -3,24 +3,34 @@ package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.google.common.base.Joiner; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.aspectj.apache.bcel.generic.RET; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.base.service.BaseCommonService; +import org.jeecg.modules.demo.customercollectgoods.entity.Customercollectgoods; +import org.jeecg.modules.demo.customercollectgoods.service.ICustomercollectgoodsService; +import org.jeecg.modules.demo.customershoppingcart.entity.CustomerShoppingCart; +import org.jeecg.modules.demo.customershoppingcart.service.ICustomerShoppingCartService; +import org.jeecg.modules.demo.zygoods.entity.ZyGoods; +import org.jeecg.modules.demo.zygoods.service.IZyGoodsService; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.vo.Grzx1; +import org.jeecg.modules.system.vo.Grzx2; +import org.jeecg.modules.system.vo.Grzx3; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpRequest; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.lang.reflect.Field; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /* 这个是个人中心专用控制器，之前全都写在SysUserController（用户控制器里面，感觉不妥）因此就专门拖出来一个 @@ -34,6 +44,15 @@ public class ApeopersionController { @Autowired private ISysUserService sysUserService; + @Autowired + private ICustomercollectgoodsService customercollectgoodsService; + + @Autowired + private IZyGoodsService zyGoodsService; + + @Autowired + private ICustomerShoppingCartService customerShoppingCartService; + /* 个人中心，我的账户的数据获取 @@ -44,15 +63,15 @@ public class ApeopersionController { String id = loginUser.getId(); SysUser syu = new SysUser(); syu = sysUserService.getneeduser(id); + findgoods(); return Result.ok(syu); } - +//个人中心的我的账户页面需要的数据 @RequestMapping(value = "/updateneeduser", method = RequestMethod.GET) public Result updateneeduser(@RequestParam(name = "form", required = true) String form) { Map map = JSON.parseObject(form,Map.class); - System.out.println(map); String id = (String) map.get("id"); String sex= map.get("sex").toString(); String birthday= (String) map.get("birthday"); @@ -60,6 +79,80 @@ public class ApeopersionController { String phone= (String) map.get("phone"); String email= (String) map.get("email"); sysUserService.updateneed(id,sex,birthday,realname,phone,email); + return Result.ok("success"); } + + //个人中心的我的收藏的首页需要的数据 + @RequestMapping(value = "/findallcg", method = RequestMethod.GET) + public Result findgoods() { + //获取当前登人的信息 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userid = loginUser.getUsername(); + List g3 = new ArrayList<>(); + //根据当前登的人获取收藏夹里面的搜藏的商品的名称及其款式 + g3 = sysUserService.getscgoods(userid); + //获取的是辅料 + List s1 =new ArrayList<>(); + //获取的是面料 + List s2 =new ArrayList<>(); + //把获取的商品信息导入到新的list里面 + for (int i=0;i findgoods(@RequestParam(name = "id", required = true) String id) { + //这里方便获取当前登陆信息 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //这里获取当前登陆的id + String userid = loginUser.getId(); + //这里获取当前登陆的真实姓名 + String rlname = loginUser.getRealname(); + //这个是根据goodid查询收藏的场频的信息 + Customercollectgoods ccs = customercollectgoodsService.getById(id); + String goodid= ccs.getGoodsId(); + //根据goodid查询goods的对象 + ZyGoods zyd =zyGoodsService.getById(goodid); + //初始化购物车对象 + CustomerShoppingCart cst =new CustomerShoppingCart(); + //开始组装购物车对象 + cst.setUserId(userid); + cst.setUsername(rlname); + cst.setGoodsId(zyd.getId()); + cst.setGoodsname(zyd.getGoodsName()); + cst.setNumber(1); + cst.setPrice(zyd.getPromotionPrice()); + cst.setZj(zyd.getPromotionPrice() * 1); + cst.setPlaceorigin(zyd.getPlaceOrigin()); + cst.setGoodimg(zyd.getDefaultPicture()); + cst.setStyleId(zyd.getStyleId()); + /* customerShoppingCartService.save(cst);*/ + System.out.println(cst); + return Result.ok("添加完成"); + } + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index ea734259..0708aed7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx2; +import org.jeecg.modules.system.vo.Grzx3; import org.jeecg.modules.system.vo.SysUserDepVo; import java.util.List; @@ -178,4 +179,12 @@ public interface SysUserMapper extends BaseMapper { //个人中心我的账户修改个人信息 @Update("UPDATE sys_user SET realname = #{realname},sex=#{sex},birthday=#{birthday},phone=#{phone},email=#{email} WHERE id = #{id} ") void updateneed(String id, String sex, String birthday, String realname, String phone, String email); + + List getscgoods(String userid); + + @Select("SELECT zf.name FROM customercollectgoods AS crg LEFT JOIN goods_fabric AS gf ON crg.goods_id = gf.goods_id LEFT JOIN zy_fabric AS zf ON gf.fabric_id = zf.id WHERE crg.id=#{id}") + List getscgoodml(String id); + + @Select("SELECT za.contents FROM customercollectgoods AS crg LEFT JOIN goods_accessories AS ga ON crg.goods_id = ga.goods_id LEFT JOIN zy_accessories AS za ON ga.accessories_id = za.id where crg.id=#{id}") + List getscgoodfi(String id); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml index fb4af157..933fa6d0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml @@ -198,4 +198,14 @@ WHERE og.id=#{id} + + + + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index ff1d60e5..3c7fb2d7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -12,6 +12,7 @@ import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx2; +import org.jeecg.modules.system.vo.Grzx3; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; @@ -272,4 +273,11 @@ public interface ISysUserService extends IService { SysUser getneeduser(String id); void updateneed(String id, String sex, String birthday, String realname, String phone, String email); + + //此处用于个人中心获取收藏商品的信息 + List getscgoods(String userid); + //此处用于个人中心获取收藏商品的面料 + List getscgoodml(String id); + //此处用于个人中心获取收藏商品的辅料 + List getscgoodfi(String id); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 3d1f8dcd..a76e56a1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -23,6 +23,7 @@ import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx2; +import org.jeecg.modules.system.vo.Grzx3; import org.jeecg.modules.system.vo.SysUserDepVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -588,4 +589,19 @@ public class SysUserServiceImpl extends ServiceImpl impl userMapper.updateneed(id,sex,birthday,realname,phone,email); } + @Override + public List getscgoods(String userid) { + return userMapper.getscgoods(userid); + } + + @Override + public List getscgoodml(String id) { + return userMapper.getscgoodml(id); + } + + @Override + public List getscgoodfi(String id) { + return userMapper.getscgoodfi(id); + } + } From 25bc1c582d4f19c99b73a85beefda5e95db27554 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Fri, 3 Mar 2023 09:39:59 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/system/controller/ApeopersionController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java index 82f70adc..b1fd59ac 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java @@ -150,8 +150,7 @@ public class ApeopersionController { cst.setPlaceorigin(zyd.getPlaceOrigin()); cst.setGoodimg(zyd.getDefaultPicture()); cst.setStyleId(zyd.getStyleId()); - /* customerShoppingCartService.save(cst);*/ - System.out.println(cst); + customerShoppingCartService.save(cst); return Result.ok("添加完成"); } From ddbfc8fe2627ba5e4df3289b6d43ac7652dbc95c Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Fri, 3 Mar 2023 10:36:17 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/shopping/components/collection.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue index 1426097c..2a2646ec 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue @@ -13,8 +13,9 @@
加入购物袋
- 点击进入衣橱 - 查看更多收藏 + + 点击进入选款 +
From ab52cfc1225a05556773423343ccd2258e62d46e Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Fri, 3 Mar 2023 14:21:16 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=203.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZyProductPlanAutoController.java | 14 +- .../service/IZyProductPlanAutoService.java | 4 +- .../impl/IZyProductPlanAutoServiceImpl.java | 183 +++++++++++++----- 3 files changed, 144 insertions(+), 57 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanAutoController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanAutoController.java index 134e8e83..092fa021 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanAutoController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanAutoController.java @@ -30,6 +30,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.List; /** * @Description: 生产计划自动化 @@ -46,10 +47,17 @@ public class ZyProductPlanAutoController extends JeecgController productPlanAuto4Mock(List workOrderIds) { + iZyProductPlanAutoService.doAuto(workOrderIds); + return Result.OK(); + } + @ApiOperation(value = "生产计划自动化", notes = "生产计划自动化") - @GetMapping(value = "/auto") - public Result auto(HttpServletRequest req) { - iZyProductPlanAutoService.doAuto(req); + @GetMapping(value = "/productPlanAuto") + public Result productPlanAuto() { + iZyProductPlanAutoService.doAuto(null); return Result.OK(); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyProductPlanAutoService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyProductPlanAutoService.java index d68eb088..d8963946 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyProductPlanAutoService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyProductPlanAutoService.java @@ -3,8 +3,10 @@ package org.jeecg.modules.productplan.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.productplan.entity.ZyProductPlan; import org.jeecg.modules.productplan.entity.vo.PaiWeiTuVo; +import org.jeecg.modules.workorder.entity.WorkOrder; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * @Description: 生产计划 @@ -14,7 +16,7 @@ import javax.servlet.http.HttpServletRequest; */ public interface IZyProductPlanAutoService extends IService { - void doAuto(HttpServletRequest req); + void doAuto(List workOrderList); boolean filling4Auto(String planId); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java index 56cf578c..a854b4f2 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java @@ -37,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -89,8 +90,7 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl saveProductPlan(List workOrderList) { if (ObjectUtils.isEmpty(workOrderList)) return Collections.EMPTY_LIST; @@ -109,8 +109,14 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl productPlanList = iZyProductPlanService.list(new LambdaQueryWrapper() + .eq(ZyProductPlan::getStatus, ProductPlanStatusEnum.UNAUDITED.getCode()) + .in(ZyProductPlan::getStatus, zyProductPlanProductCodes)); + return productPlanList; + } + + /** + * 模拟测试方法 + * + * @param workOrderList + * @return + */ + @Transactional(rollbackFor = Exception.class, readOnly = false) + List saveProductPlan4Mock(List workOrderList) { + if (ObjectUtils.isEmpty(workOrderList)) return Collections.EMPTY_LIST; + + Set zyProductPlanProductCodes = new LinkedHashSet<>(); + /** + * 模拟测试 车间、负责人、班组、组长使用固定值 + */ + + workOrderList.stream().forEach(e -> { + String productCode = e.getProductCode(); + ZyProduct zyProduct = iZyProductService.getOne(new LambdaQueryWrapper() + .eq(ZyProduct::getWorkOrderId, productCode)); + Optional.ofNullable(zyProduct).orElseThrow(() -> new JeecgBootException(productCode + ":产品不存在")); + + //2,保存生产计划 + ZyProductPlan zyProductPlan = new ZyProductPlan(); + zyProductPlan.setProductCode(productCode); + zyProductPlan.setProductNo(zyProduct.getProductCode()); + zyProductPlan.setProductName(zyProduct.getProductName()); + + if (StringUtils.isNotBlank(zyProduct.getEnterprisesId())) { + SysDepart sysDepart = iSysDepartService.getById(zyProduct.getEnterprisesId()); + //生产企业 + zyProductPlan.setProductOrg(StringUtils.isNotBlank(sysDepart.getDepartName()) ? sysDepart.getDepartName() : ""); + } + //生产时长，取zy_product表生产时间 + zyProductPlan.setDuration(zyProduct.getProduceTime()); + + SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper() + .eq(SysDepart::getOrgCategory, "2") + .eq(SysDepart::getDepartName, "测试生产企业")); + if (ObjectUtils.isEmpty(sysDepart)) throw new JeecgBootException("生产计划自动化-mock-[企业信息]数据异常!"); + + //车间 + zyProductPlan.setWorkshopId(sysDepart.getId()); + List sysDepartIds = new LinkedList<>(); + sysDepartIds.add(sysDepart.getId()); + List sysUserList = iSysUserService.getUserByDepIds(sysDepartIds, null); + //车间负责人 + zyProductPlan.setResponsiblePerson(sysUserList.get(0).getUsername()); + Groupx groupx = iGroupxService.getOne(new LambdaQueryWrapper().eq(Groupx::getDepartId, sysDepart.getId()).eq(Groupx::getGroupName, "测试班组")); + if (ObjectUtils.isEmpty(groupx)) throw new JeecgBootException("生产计划自动化-mock-[班组]数据异常!"); + //班组 + zyProductPlan.setTeamId(groupx.getId()); + //班长 + SysUser sysUser = iSysUserService.getById(groupx.getEnterprisesManager()); + zyProductPlan.setTeamLeader(sysUser.getUsername()); + Date date = new Date(); + //开始时间 + zyProductPlan.setWorkTime(date); + //审核人 + zyProductPlan.setAuditBy("admin"); + //审核时间 + zyProductPlan.setAuditTimr(date); + //生产计划状态为未审核 zyProductPlan.setStatus(new Integer(ProductPlanStatusEnum.UNAUDITED.getCode())); + //保存生产计划 iZyProductPlanService.save(zyProductPlan); + //更新work_order表work_order_status为“1” (不能为其新增生产计划) iWorkOrderService.lambdaUpdate().set(WorkOrder::getWorkOrderStatus, WorkOrderStatusEnum.REVIEWED.getCode()).update(); zyProductPlanProductCodes.add(productCode); }); + //根据productCode，查询本次创建生产计划 List productPlanList = iZyProductPlanService.list(new LambdaQueryWrapper() .eq(ZyProductPlan::getStatus, ProductPlanStatusEnum.UNAUDITED.getCode()) @@ -162,50 +257,28 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl sysDepartList2 = new LinkedList<>(); - sysDepartList2.addAll(list2); - int size2 = sysDepartList2.size(); - - while (size2 < size) { - sysDepartList2.addAll(list2); - size2 = sysDepartList2.size(); - } - - System.out.println("sysDepartList2 = " + sysDepartList2.size()); - System.out.println("list2 = " + list2.size()); - System.out.println("list = " + list.size()); - - } - @Override - public void doAuto(HttpServletRequest req) { + @Transactional(rollbackFor = Exception.class, readOnly = false) + public void doAuto(List workOrderList4Mock) { //1，获取未排产工单 - List workOrderList = iWorkOrderService.list(new LambdaQueryWrapper() - .eq(WorkOrder::getWorkOrderStatus, WorkOrderStatusEnum.UNAUDITED.getCode())); + List workOrderList; + if (ObjectUtils.isEmpty(workOrderList4Mock)) { + workOrderList = iWorkOrderService.list(new LambdaQueryWrapper() + .eq(WorkOrder::getWorkOrderStatus, WorkOrderStatusEnum.UNAUDITED.getCode())); + } else { + workOrderList = iWorkOrderService.list(new LambdaQueryWrapper() + .eq(WorkOrder::getWorkOrderStatus, WorkOrderStatusEnum.UNAUDITED.getCode()) + .in(WorkOrder::getId, workOrderList4Mock)); + } + +// List workOrderList = iWorkOrderService.list(new LambdaQueryWrapper() +// .eq(WorkOrder::getWorkOrderStatus, WorkOrderStatusEnum.UNAUDITED.getCode())); + if (ObjectUtils.isEmpty(workOrderList)) return; //2,保存生产计划 - List productPlanList = this.saveProductPlan(workOrderList); +// List productPlanList = this.saveProductPlan(workOrderList); + List productPlanList = this.saveProductPlan4Mock(workOrderList); if (ObjectUtils.isEmpty(productPlanList)) return; //3,同步计划生产工序、同步生产计划工序面料、同步生产计划辅料 @@ -219,21 +292,24 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl { + //TODO 数据不完整，测试时注释 // boolean b = this.filling4Auto(k.getId()); // if (b) { - List planProcessList = zyPlanProcessService.list(new LambdaQueryWrapper().eq(ZyPlanProcess::getPlanId, k.getId())); - Optional.ofNullable(planProcessList).orElse(new LinkedList<>()).forEach(e -> { - // 5，生成物料单 - zyPlanProcessService.createMaterialBill(e); - // 5，发送到仓库 - zyPlanProcessService.sendToRepository(e); - }); + List planProcessList = zyPlanProcessService.list(new LambdaQueryWrapper().eq(ZyPlanProcess::getPlanId, k.getId())); + Optional.ofNullable(planProcessList).orElse(new LinkedList<>()).forEach(e -> { + // 5，生成物料单 + zyPlanProcessService.createMaterialBill(e); + // 5，发送到仓库 + zyPlanProcessService.sendToRepository(e); + }); // } }); } /** + * 匹配设备&工具&工人 + *

* 匹配车间工位设备与工序设备，工位设备包含工序设备即匹配成功，匹配失败做异常处理 * 匹配车间工位工具与工序设备，工位设备包含工序设备即匹配成功，匹配失败做异常处理 * @@ -265,8 +341,9 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl planProcessList2 = zyPlanProcessService.list(new LambdaQueryWrapper().eq(ZyPlanProcess::getPlanId, planId)); //匹配工人 - this.diffWorker(planProcessList, planId); + this.diffWorker(planProcessList2, planId); return true; } From b0f02453f76317e566e5eeb80a334293dbd5bec1 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Fri, 3 Mar 2023 16:07:27 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/system/mapper/SysUserMapper.java | 1 - .../java/org/jeecg/modules/system/service/ISysUserService.java | 1 - .../jeecg/modules/system/service/impl/SysUserServiceImpl.java | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index 0708aed7..bca8cea8 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx2; -import org.jeecg.modules.system.vo.Grzx3; import org.jeecg.modules.system.vo.SysUserDepVo; import java.util.List; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 3c7fb2d7..e7e12a85 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -12,7 +12,6 @@ import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx2; -import org.jeecg.modules.system.vo.Grzx3; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index a76e56a1..095598c2 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -23,7 +23,7 @@ import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx2; -import org.jeecg.modules.system.vo.Grzx3; + import org.jeecg.modules.system.vo.SysUserDepVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; From bcbbd8b52c6c15f1cdf9bd7aae42c43379ca4a34 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Fri, 3 Mar 2023 16:09:28 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/system/controller/ApeopersionController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java index b1fd59ac..bd2b350b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java @@ -22,7 +22,6 @@ import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx2; -import org.jeecg.modules.system.vo.Grzx3; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpRequest; import org.springframework.web.bind.annotation.*; From ccad7efe2d5a10083abee99dc96d2f2db69a311c Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Mon, 6 Mar 2023 14:59:29 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=85=88?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/shopping/components/collection.vue | 24 ++++++++++++++++--- .../controller/ApeopersionController.java | 7 ++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue index 2a2646ec..b4eee799 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue @@ -9,7 +9,10 @@

{{item.styleNames}}
{{item.address}}
{{item.ordersNum}}
- 删除 + + + 删除 +
加入购物袋
@@ -146,7 +149,8 @@ url: { findallcg: "/getuserpersion/findallcg", - ingwc: "/getuserpersion/ingwc" + ingwc: "/getuserpersion/ingwc", + delteys: "/getuserpersion/delteys" }, @@ -160,6 +164,20 @@ console.log(item) item.flag = !item.flag }, + + + + delteys(id){ + getAction(this.url.delteys,{id,id}).then((res) => { + if(res.success) { + alert('宝贝已经添加到购物了，请查收'); + } else { + } + }); + }, + + + findallcg(){ getAction(this.url.findallcg).then((res) => { if(res.success) { @@ -175,7 +193,7 @@ ingwc(id){ getAction(this.url.ingwc,{id,id}).then((res) => { if(res.success) { - alert('宝贝已经添加到购物了，请查收'); + this.loadData(1); } else { } }); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java index bd2b350b..5b04390d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java @@ -153,4 +153,11 @@ public class ApeopersionController { return Result.ok("添加完成"); } + //个人中心的我的收藏的首页需要的数据 + @RequestMapping(value = "/delteys", method = RequestMethod.GET) + public Result delteys(@RequestParam(name = "id", required = true) String id) { + customercollectgoodsService.removeById(id); + return Result.ok("添加完成"); + } + } From 43887b2e229a4848e08bdbaf8888944c2c992891 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Mon, 6 Mar 2023 15:00:50 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=85=88?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/shopping/components/collection.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue index b4eee799..14da641c 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue @@ -170,7 +170,7 @@ delteys(id){ getAction(this.url.delteys,{id,id}).then((res) => { if(res.success) { - alert('宝贝已经添加到购物了，请查收'); + this.loadData(1); } else { } }); @@ -193,6 +193,7 @@ ingwc(id){ getAction(this.url.ingwc,{id,id}).then((res) => { if(res.success) { + alert('宝贝已经添加到购物了，请查收'); this.loadData(1); } else { } From cee9ac73f5d3ef148bfcdd2108f56e341d4b61ea Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Mon, 6 Mar 2023 15:23:06 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=85=88?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/shopping/components/collection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue index 14da641c..62ab5511 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/collection.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/collection.vue @@ -13,7 +13,7 @@ 删除 -
加入购物袋
+
加入购物车
From ad5580e30718c6193e7bd58d68b0a3efdcda5110 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Tue, 7 Mar 2023 14:48:41 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/shopping/assets/erweima.png | Bin 0 -> 10599 bytes .../views/shopping/components/addrView.vue | 355 ++++++++++++++++++ .../views/shopping/pages/gerenzhongxin.vue | 6 +- 3 files changed, 359 insertions(+), 2 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/shopping/assets/erweima.png create mode 100644 ant-design-vue-jeecg/src/views/shopping/components/addrView.vue diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/erweima.png b/ant-design-vue-jeecg/src/views/shopping/assets/erweima.png new file mode 100644 index 0000000000000000000000000000000000000000..f22381bdc22d2aecc0fea996f3c3aa32400d15d4 GIT binary patch literal 10599 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 G_ +

+
+

您还未注册地址。

+
+
+
创建新地址
+
+
+
+

默认地址

+
+
{{item.name}}女士先生
+
+ 编辑 + 删除 + 将其设置为默认地址 + +
+
+

+ {{item.detailed}} +

+

+
+
+ + + + + +
+ + + + + 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 7266bd37..a8d7e95f 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue @@ -123,6 +123,7 @@
+
@@ -170,10 +171,11 @@ import { httpAction, getAction } from '@/api/manage' import PasswordModal from '../../system/modules/PasswordModal' import Collection from "../components/collection"; + import AddrView from "../components/addrView" export default { name: "gerenzhongxin", - components: { Header,Footer,PasswordModal ,Collection}, - data() {0 + components: { Header,Footer,PasswordModal ,Collection,AddrView}, + data() { return { model:{ username1: "" From b291587a4431aa8eb6e136db0f6d734fa57d8d69 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Tue, 7 Mar 2023 18:03:26 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/shopping/assets/common.css | 4 +- .../views/shopping/pages/gerenzhongxin.vue | 157 +++++++++++++++++- 2 files changed, 151 insertions(+), 10 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/common.css b/ant-design-vue-jeecg/src/views/shopping/assets/common.css index 049bc78c..f4463678 100644 --- a/ant-design-vue-jeecg/src/views/shopping/assets/common.css +++ b/ant-design-vue-jeecg/src/views/shopping/assets/common.css @@ -71,7 +71,9 @@ a { .fw_600 { font-weight: 600; } - +.fw_500 { + font-weight: 500; +} .c_333 { color: #333; } 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 a8d7e95f..12c413cc 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue @@ -18,16 +18,16 @@ 发票管理 - Option 1 + 全部发票 - Option 2 + 已开发票 - Option 3 + 待开发票 - Option 4 + 抬头管理 @@ -124,6 +124,35 @@
+
+ +
+
+ {{item.date}} + 已开票 + 待开票 +
+
+
+ +
+
+
订单编号：{{item.orderNum}}
+
发票类型：{{item.type}}
+
发票内容：{{item.content}}
+
发票抬头：{{item.title}}
+
开票金额：{{item.price}}
+
+
+
申请换开
+
查看详情
+
+
+
+ +
+ +
@@ -180,8 +209,7 @@ model:{ username1: "" }, - - current: ['allorders'],//目前打开的菜单 + current: ['invoice1'],//目前打开的菜单 key:'',//当前选择的订单状态（待支付、待收货等） allOrders2:[], allOrders1:[ @@ -229,7 +257,42 @@ } ],//所有订单，包括未支付、未收获等 allOrders:[],//目前展示的订单 - + invoiceList:[],//目前展示的发票列表 + invoiceList1:[ + { + id:1, + date:'2022-08-19 14:09:13', + billing:true,//是否已开票 + imgUrl:require("../assets/cloth001.png"), + orderNum:1237943879,//订单编号 + type:"1",//为1为普通发票 + content:"商品明细",//发票内容 + title:"易创网络科技有限公司",//抬头 + price:2456,//价格 + }, + { + id:2, + date:'2022-08-20 14:09:13', + billing:false,//是否已开票 + imgUrl:require("../assets/cloth002.png"), + orderNum:1237943880,//订单编号 + type:"1",//为1为普通发票 + content:"商品明细",//发票内容 + title:"易创网络科技有限公司",//抬头 + price:2456,//价格 + }, + { + id:3, + date:'2022-08-30 14:09:13', + billing:true,//是否已开票 + imgUrl:require("../assets/cloth003.png"), + orderNum:1237943881,//订单编号 + type:"1",//为1为普通发票 + content:"商品明细",//发票内容 + title:"易创网络科技有限公司",//抬头 + price:2456,//价格 + }, + ],//全部发票数据 url: { list: "/starehouse/starehouse/list", @@ -420,9 +483,18 @@ else if(key.key == 'yiwancheng'){ /*this.allOrders = this.allOrders1.filter(item=>item.receipt == true)*/ this.allOrders = this.allOrders2.filter(item=>item.receipt == true) - }else{ - this.allOrders=[] + }else if(key.key == 'invoice1'){//选择全部发票选项 + this.invoiceList = this.invoiceList1 + } + else if(key.key == 'invoice2'){//选择已开发票选项 + this.invoiceList = this.invoiceList1.filter(item=>item.billing == true) + } + else if(key.key == 'invoice3'){//选择未开发票选项 + this.invoiceList = this.invoiceList1.filter(item=>item.billing == false) } + // else{ + // this.allOrders=[] + // } } }, }; @@ -438,6 +510,18 @@ line-height: 40px; transition: all 0.2s; } + .default { + border: 2px solid #1b1b1b; + color: #1b1b1b; + margin-right: 20px; + + &:hover { + border: 2px solid #1b1b1b; + color: #fff; + opacity: 0.8; + background-color: #1b1b1b; + } + } .primary { background: #1b1b1b; border: 2px solid #1b1b1b; @@ -447,6 +531,15 @@ } } } +.font_01{ + color: #333; + font-size: 16px; + font-weight: 500; +} + .font_02{ + color: #333; + font-size: 16px; + } .bg{ width: 100%; height: 250px; @@ -474,6 +567,52 @@ /deep/ .ant-menu{ display: flex; justify-content: space-between; + } + .invoiceList{ + padding-left: 20px; + padding-right: 20px; + width: 1114px;margin:0 auto; + .d-flex{ + justify-content: space-between; + } + .invoice{ + padding-top: 40px; + padding-bottom: 20px; + border-bottom: 1px solid #DADADA; + .title{ + margin-bottom: 25px; + } + .img{ + width: 232px; + height: 232px; + img{ + width: 232px; + height: 232px; + } + } + .invoiceInfo{ + width: 483px; + .font_01{ + margin-bottom: 26px; + } + .font_02{ + margin-bottom: 12px; + } + } + .btnDiv{ + width: 145px; + flex-direction: column; + justify-content: flex-end; + padding-bottom: 26px; + .dialogButton{ + width: 100%; + margin-bottom: 17px; + } + } + } + + + } .orderList{ /*margin-top: 60px;*/ From 5a213bff3a8f7732021043423e12355a8281e84c Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Wed, 8 Mar 2023 16:56:29 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/shopping/components/addrView.vue | 73 +++++++++++++++---- .../CustomerReceivingAddressMapper.java | 13 ++++ .../ICustomerReceivingAddressService.java | 12 +++ .../CustomerReceivingAddressServiceImpl.java | 27 +++++++ .../controller/ApeopersionController.java | 69 ++++++++++++++++++ 5 files changed, 181 insertions(+), 13 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/shopping/components/addrView.vue b/ant-design-vue-jeecg/src/views/shopping/components/addrView.vue index c717d4f6..f0732432 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/addrView.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/addrView.vue @@ -1,16 +1,16 @@