-
- 详情页衣服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/productplan/controller/ZyPlanProcessController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
index 967857d4..2c11750f 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,
@@ -138,6 +146,14 @@ public class ZyPlanProcessController extends JeecgController sendToRepository(ZyPlanProcess zyPlanProcess,
+ HttpServletRequest req) {
+ zyPlanProcessService.sendToRepository(zyPlanProcess);
+ return Result.OK();
+ }
+
@ApiOperation(value = "计划班组管理-查询产品工序&班组", notes = "计划班组管理-查询产品工序&班组")
@GetMapping(value = "/getTeamDatalist")
public Result getTeamDatalist(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..4cc0099a 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,7 @@ public interface IZyPlanProcessService extends IService {
void createMaterialBill(ZyPlanProcess zyPlanProcess);
+ Map getWuLiaoDetail(ZyPlanProcess zyPlanProcess);
+
+ void sendToRepository(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..63b0afe0 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
@@ -11,6 +11,8 @@ import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService;
import org.jeecg.modules.demo.base.entity.ZyProcess;
import org.jeecg.modules.demo.base.service.IZyProcessService;
+import org.jeecg.modules.demo.delivery.entity.Delivery;
+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.demo.ordergoods.entity.OrderGoods;
@@ -146,6 +148,9 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl getProcessDatalist(ZyPlanProcess zyPlanProcess) {
//生产计划id
String planId = zyPlanProcess.getPlanId();
@@ -234,12 +239,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 +253,14 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl> maplist2 = zyPlanProcessAccessoriesMapper.selectMaps(qw2);
@@ -263,6 +269,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 +513,95 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper()
+ .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId()));
+ List deliveryList4Fabric = new LinkedList<>();
+ Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> {
+ Delivery delivery = new Delivery();
+ delivery.setDeliveryReason("0");
+ delivery.setDeliveryTime(new Date());
+ delivery.setItemType("0");
+ delivery.setAmount(e.getAmount().doubleValue());
+ delivery.setCarrierId("admin");
+ delivery.setAdminId("admin");
+ delivery.setStorehouseId("TODO");
+ ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId());
+ if (!ObjectUtils.isEmpty(zyFabric)) {
+ delivery.setItemCode(zyFabric.getFabricNumber());
+ }
+ deliveryList4Fabric.add(delivery);
+ });
+ iDeliveryService.saveBatch(deliveryList4Fabric);
+
+ List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper()
+ .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId()));
+ List deliveryList4accessories = new LinkedList<>();
+ Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> {
+ Delivery delivery2 = new Delivery();
+ delivery2.setDeliveryReason("0");
+ delivery2.setDeliveryTime(new Date());
+ delivery2.setItemType("1");
+ delivery2.setAmount(e.getAmount().doubleValue());
+ delivery2.setCarrierId("admin");
+ delivery2.setAdminId("admin");
+ delivery2.setStorehouseId("TODO");
+ ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId());
+ if (!ObjectUtils.isEmpty(zyAccessories)) {
+ delivery2.setItemCode(zyAccessories.getNums());
+ }
+ deliveryList4accessories.add(delivery2);
+ });
+ iDeliveryService.saveBatch(deliveryList4accessories);
+ }
+
+
+ @Override
+ public Map 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