-
- 详情页衣服id{{ this.$route.query.id }} 详情页衣服title{{
- this.$route.query.title
- }}
+
+
+
+
+
+
+
+
+ 
+
+
+
![]()
+
+
+
+
{{title}}
+
销量：{{sales}}件
+
价格：¥{{price}}
+
优惠：{{favour}}
+
促销：{{sell}}详情>>>
+
+
颜色:{{color}}
+
+
+ 黑
+
+
+ 灰
+
+
+ 橙
+
+
+
+
+ {{item.size}}
+
+
+
免费配送与退货服务更多详情
+
+
使用花呗分期，最低每月¥1182.50。详细说明
+
+
+
+
+
+
+
已选
+
+
+
![]()
+
{{item.text}}
+
+
+
+
+
+ 商品介绍
+ 加入购物车
+
+
+
+ | 商品名称：{{clothDetail.name}} |
+ 商品编号：{{clothDetail.num}} |
+ 风格：{{clothDetail.style}} |
+ 商品毛重：{{clothDetail.weight}} |
+
+
+ | 货号：{{clothDetail.itemNo}} |
+ 领型：{{clothDetail.collar}} |
+ 材质：{{clothDetail.material}} |
+ 适用场景：{{clothDetail.scene}} |
+
+
+ | 版型：{{clothDetail.type}} |
+ 衣门襟：{{clothDetail.placket}} |
+ 开衩设计：{{clothDetail.slit}} |
+ 适用人群：{{clothDetail.people}} |
+
+
+
+
@@ -24,9 +207,224 @@
}
+
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
new file mode 100644
index 00000000..824682e7
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
welcome, 用户名
+
量体数据
+
+
+
+
+ 我的账户
+
+
+ 我的收藏
+
+
+ 地址管理
+
+
+ 发票管理
+
+
+
+ 全部订单
+
+
+ 全部订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
index d88b9f72..e305d82c 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
@@ -8,44 +8,6 @@
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
款式详情
delete(@RequestParam(name = "id", required = true) String id) {
zyClothsTypeService.removeById(id);
+ //如果这是父级 连带子集一起删除
+ String parentId = zyClothsTypeMapper.getParentId(id);
+ if (StringUtils.isEmpty(parentId)){
+ List zyClothsTypeList = zyClothsTypeService.list(new LambdaQueryWrapper().eq(ZyClothsType::getTypeId,id));
+ List collect = zyClothsTypeList.stream().map(ZyClothsType::getId).collect(Collectors.toList());
+ zyClothsTypeService.removeByIds(collect);
+ }
return Result.OK("删除成功!");
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
index 41357cf9..a8f3f0bc 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
@@ -43,4 +43,7 @@ public interface ZyClothsTypeMapper extends BaseMapper {
/**根据type_id拿到类型名称*/
@Select("select type_name from zy_cloths_type where id = #{id} ")
String getNameByTypeId(String id);
+
+ @Select("select type_id from zy_cloths_type where id = #{id} ")
+ String getParentId(String id);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java
index a8362916..ce6f561a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java
@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
import org.jeecg.modules.demo.customerpayment.entity.CustomerPayment;
import org.jeecg.modules.demo.customerpayment.service.ICustomerPaymentService;
@@ -73,6 +74,23 @@ public class CustomerPaymentController extends JeecgController queryPageList1(CustomerPayment customerPayment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerPayment, req.getParameterMap());
+ queryWrapper.eq("user_id",customerPayment.getUserId());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = customerPaymentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
/**
* 添加
*
@@ -192,4 +210,26 @@ public class CustomerPaymentController extends JeecgController shang(@RequestParam(name="id",required=true) String id) {
+ customerPaymentService.up(id);
+ return Result.ok("升序成功");
+ }
+
+
+ @AutoLog(value = "排序")
+ @ApiOperation(value="排序", notes="排序")
+ @GetMapping(value = "/down")
+ public Result xia(@RequestParam(name="id",required=true) String id) {
+ int a=customerPaymentService.findSort(id);
+ if(a==0){
+ return Result.error("当前已经是最低级别！！！");}else {
+ customerPaymentService.down(id);
+ return Result.ok("降序成功");
+ }
+ }
+
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/entity/CustomerPayment.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/entity/CustomerPayment.java
index 3f337bdf..369f1084 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/entity/CustomerPayment.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/entity/CustomerPayment.java
@@ -86,4 +86,8 @@ public class CustomerPayment implements Serializable {
@Excel(name = "开户支行", width = 15)
@ApiModelProperty(value = "开户支行")
private java.lang.String bankzh;
+ /**排序*/
+ @Excel(name = "排序", width = 15)
+ @ApiModelProperty(value = "排序")
+ private java.lang.Integer sort;
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/mapper/CustomerPaymentMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/mapper/CustomerPaymentMapper.java
index 18baa625..13a07c5a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/mapper/CustomerPaymentMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/mapper/CustomerPaymentMapper.java
@@ -5,6 +5,8 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.demo.customerpayment.entity.CustomerPayment;
/**
@@ -15,4 +17,18 @@ import org.jeecg.modules.demo.customerpayment.entity.CustomerPayment;
*/
public interface CustomerPaymentMapper extends BaseMapper {
+ @Select("select sort from customer_payment where id=#{id} ")
+ Integer upfindsort(String id);
+
+ @Select("select id from customer_payment where sort=#{i} ")
+ String findproid(int i);
+
+ @Update("update customer_payment set sort =#{i} where id = #{id} ")
+ void innew(String id, int i);
+
+ @Update("update customer_payment set sort =#{sort} where id = #{proid} ")
+ void innewpro(String proid, Integer sort);
+
+ @Select("select sort from customer_payment where id=#{id} ")
+ int findSort(String id);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/ICustomerPaymentService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/ICustomerPaymentService.java
index a01a559e..a549c4e2 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/ICustomerPaymentService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/ICustomerPaymentService.java
@@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ICustomerPaymentService extends IService {
+ void up(String id);
+
+ int findSort(String id);
+
+ void down(String id);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/impl/CustomerPaymentServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/impl/CustomerPaymentServiceImpl.java
index 7ec889c6..58d88097 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/impl/CustomerPaymentServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/impl/CustomerPaymentServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.customerpayment.service.impl;
import org.jeecg.modules.demo.customerpayment.entity.CustomerPayment;
import org.jeecg.modules.demo.customerpayment.mapper.CustomerPaymentMapper;
import org.jeecg.modules.demo.customerpayment.service.ICustomerPaymentService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,38 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class CustomerPaymentServiceImpl extends ServiceImpl implements ICustomerPaymentService {
+ @Autowired
+ CustomerPaymentMapper customerPaymentMapper;
+
+
+ @Override
+ public void up(String id) {
+ Integer sort = customerPaymentMapper.upfindsort(id);
+ if (sort>0) {
+ //升序前找到后一个排序
+ String proid = customerPaymentMapper.findproid(sort + 1);
+ if (proid!="") {
+ //调换排序
+ customerPaymentMapper.innew(id,sort+1);
+ customerPaymentMapper.innewpro(proid,sort);
+ }
+ }
+ }
+
+ @Override
+ public int findSort(String id) {
+ return customerPaymentMapper.findSort(id);
+ }
+
+ @Override
+ public void down(String id) {
+ Integer sort = customerPaymentMapper.upfindsort(id);
+ if (sort>0) {
+ String proid = customerPaymentMapper.findproid(sort - 1);
+ if (proid!="") {
+ customerPaymentMapper.innew(id,sort-1);
+ customerPaymentMapper.innewpro(proid,sort);
+ }
+ }
+ }
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
index 967857d4..05f66f4e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
@@ -100,6 +100,14 @@ public class ZyPlanProcessController extends JeecgController getWuLiaoDetail(ZyPlanProcess zyPlanProcess,
+ HttpServletRequest req) {
+ Map map = zyPlanProcessService.getWuLiaoDetail(zyPlanProcess);
+ return Result.OK(map);
+ }
+
@ApiOperation(value = "读取工序", notes = "读取工序")
@GetMapping(value = "/syncProductProcess")
public Result syncProductProcess(ZyPlanProcess zyPlanProcess,
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanAccessories.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanAccessories.java
index 9435045e..f828a94b 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanAccessories.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanAccessories.java
@@ -75,6 +75,11 @@ public class ZyPlanAccessories implements Serializable {
@ApiModelProperty(value = "辅料id")
@Dict(dictTable = "zy_accessories", dicText = "contents", dicCode = "id")
private String accessoriesId;
+
+ @Excel(name = "辅料名称", width = 15)
+ @ApiModelProperty(value = "辅料名称")
+ private String accessoriesName;
+
/**
* 用量（合计）
*/
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
index cc008a9f..e8079bc9 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
@@ -76,6 +76,10 @@ public class ZyPlanFabric implements Serializable {
@ApiModelProperty(value = "面料id")
@Dict(dictTable = "zy_fabric", dicText = "name", dicCode = "id")
private String fabricId;
+
+ @Excel(name = "面料名称", width = 15)
+ @ApiModelProperty(value = "面料名称")
+ private String fabricName;
/**
* 用量（合计）
*/
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
index 80aea3a9..aaf98675 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
@@ -27,4 +27,5 @@ public interface IZyPlanProcessService extends IService {
void createMaterialBill(ZyPlanProcess zyPlanProcess);
+ Map getWuLiaoDetail(ZyPlanProcess zyPlanProcess);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
index 1500aefe..90aa62d7 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
@@ -234,12 +234,12 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl planProcessList = this.list(new LambdaQueryWrapper().eq(ZyPlanProcess::getPlanId, zyPlanProcess.getPlanId()));
- if(ObjectUtils.isEmpty(planProcessList)) return;
+ if (ObjectUtils.isEmpty(planProcessList)) return;
this.delBillData(zyPlanProcess);
List idList = planProcessList.stream().map(ZyPlanProcess::getId).collect(Collectors.toList());
QueryWrapper qw = new QueryWrapper();
- qw.select("fabric_id", "sum(amount) as count");
+ qw.select("fabric_id", "fabric_name", "sum(amount) as count");
qw.in("plan_process_id", idList);
qw.groupBy("fabric_id");
List> maplist = zyPlanProcessFabricMapper.selectMaps(qw);
@@ -248,13 +248,14 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl> maplist2 = zyPlanProcessAccessoriesMapper.selectMaps(qw2);
@@ -263,6 +264,7 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl stationList, List machineList) {
if (!ObjectUtils.isEmpty(machineList)) {
List machineList1 = machineList.stream().map(ZyProcessMachine::getMachineId).collect(Collectors.toList());
@@ -505,12 +508,45 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl getWuLiaoDetail(ZyPlanProcess zyPlanProcess) {
+ String planId = zyPlanProcess.getPlanId();
+ ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
+ if (ObjectUtils.isEmpty(zyProductPlan)) {
+ throw new JeecgBootException("生产计划不存在!");
+ }
+
+ List planProcessList = this.list(new LambdaQueryWrapper()
+ .eq(ZyPlanProcess::getPlanId, zyPlanProcess.getPlanId()));
+
+ List ids = Optional.ofNullable(planProcessList).orElse(new LinkedList<>())
+ .stream().map(ZyPlanProcess::getId).collect(Collectors.toList());
+
+ Map result = new HashMap<>();
+ List fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper()
+ .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId()));
+ result.put("fabricList", fabricList);
+
+ List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper()
+ .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId()));
+ result.put("accessoriesList", accessoriesList);
+
+ List processFabricList = iZyPlanProcessFabricService.list(new LambdaQueryWrapper()
+ .in(ZyPlanProcessFabric::getPlanProcessId, ids));
+ result.put("processFabricList", processFabricList);
+
+ List processAccessoriesList = iZyPlanProcessAccessoriesService.list(new LambdaQueryWrapper()
+ .in(ZyPlanProcessAccessories::getPlanProcessId, ids));
+ result.put("processAccessoriesList", processAccessoriesList);
+ return result;
+ }
+
@Override
public List getTeamDatalist(ZyPlanProcess zyPlanProcess) {
//生产计划id
String planId = zyPlanProcess.getPlanId();
ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
- if (ObjectUtils.isEmpty(zyPlanProcess)) {
+ if (ObjectUtils.isEmpty(zyProductPlan)) {
throw new JeecgBootException("生产计划不存在!");
}
//工单id