Merge remote-tracking branch 'origin/master'

zhc4dev
暖暖 2 years ago
commit 67b892ce29
  1. 4
      ant-design-vue-jeecg/src/main.js
  2. 4
      ant-design-vue-jeecg/src/views/system/Depart3List.vue
  3. 6
      ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
  4. 6
      ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
  5. 2
      jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
  6. 2
      jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml
  7. 2
      jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java
  8. 4
      jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java
  9. 14
      jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java
  10. 19
      jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java
  11. 4
      jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java
  12. 26
      jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml
  13. 6
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java
  14. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml
  15. 9
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java
  16. 74
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java
  17. 91
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java
  18. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java
  19. 73
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java

@ -12,8 +12,8 @@ import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css'; import 'element-ui/lib/theme-chalk/index.css';
import './views/shopping/assets/iconfont/iconfont.css'//引入商城所需图标 import './views/shopping/assets/iconfont/iconfont.css'//引入商城所需图标
// YU-优化 // YU-优化
require('@jeecg/antd-online-mini') // require('@jeecg/antd-online-mini')
require('@jeecg/antd-online-mini/dist/OnlineForm.css') // require('@jeecg/antd-online-mini/dist/OnlineForm.css')
// 引入 按需组件的统一引入文件 // 引入 按需组件的统一引入文件
//import './components/use' //import './components/use'
import Antd, { version } from 'ant-design-vue' import Antd, { version } from 'ant-design-vue'

@ -158,7 +158,7 @@
<!--</template>--> <!--</template>-->
<template v-if="orgTypeDisabled"> <!--<template v-if="orgTypeDisabled">-->
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
@ -171,7 +171,7 @@
label="地址"> label="地址">
<a-input placeholder="请输入地址" v-decorator="['address', {'initialValue':''}]"/> <a-input placeholder="请输入地址" v-decorator="['address', {'initialValue':''}]"/>
</a-form-item> </a-form-item>
</template> <!--</template>-->
<a-form-item <a-form-item

@ -87,11 +87,11 @@
label="排序"> label="排序">
<a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/> <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
</a-form-item> </a-form-item>
<template v-if="seen"> <!--<template v-if="seen">-->
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="电话"> label="手机号">
<a-input placeholder="请输入电话" v-decorator="['mobile',validatorRules.mobile]"/> <a-input placeholder="请输入电话" v-decorator="['mobile',validatorRules.mobile]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
@ -100,7 +100,7 @@
label="地址"> label="地址">
<a-input placeholder="请输入地址" v-decorator="['address', {}]"/> <a-input placeholder="请输入地址" v-decorator="['address', {}]"/>
</a-form-item> </a-form-item>
</template> <!--</template>-->
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"

@ -204,8 +204,8 @@
delete: "/workOrder/workOrder/delete", delete: "/workOrder/workOrder/delete",
deleteBatch: "/workOrder/workOrder/deleteBatch", deleteBatch: "/workOrder/workOrder/deleteBatch",
exportXlsUrl: "/workOrder/workOrder/exportXls", exportXlsUrl: "/workOrder/workOrder/exportXls",
importExcelUrl: "workOrder/workOrder/importExcel", importExcelUrl: "/workOrder/workOrder/importExcel",
cancellationWorkOrderUrl:"workOrder/workOrder/cancellationWorkOrder", cancellationWorkOrderUrl:"/workOrder/workOrder/cancellationWorkOrder",
}, },
dictOptions:{}, dictOptions:{},
} }
@ -233,7 +233,7 @@
}, },
// //
cancellationWorkOrder(workId) { cancellationWorkOrder(workId) {
// /
getAction(this.url.cancellationWorkOrderUrl,{'id':workId}).then((res) => { getAction(this.url.cancellationWorkOrderUrl,{'id':workId}).then((res) => {
if (res.success) { if (res.success) {
this.$message.success("撤销成功!"); this.$message.success("撤销成功!");

@ -126,6 +126,8 @@ public class ShiroConfig {
//店铺管理 //店铺管理
filterChainDefinitionMap.put("/zyShop/shopInfo/**","anon"); filterChainDefinitionMap.put("/zyShop/shopInfo/**","anon");
filterChainDefinitionMap.put("/zyShopOrder/shopOrder/**","anon"); filterChainDefinitionMap.put("/zyShopOrder/shopOrder/**","anon");
//大屏数据
filterChainDefinitionMap.put("/largeScreen/**","anon");
//人员管理 //人员管理
filterChainDefinitionMap.put("/zyPerson/**","anon"); filterChainDefinitionMap.put("/zyPerson/**","anon");

@ -54,4 +54,4 @@
<artifactId>jeecg-boot-starter-job</artifactId> <artifactId>jeecg-boot-starter-job</artifactId>
</dependency>--> </dependency>-->
</dependencies> </dependencies>
</project> </project>

@ -25,6 +25,7 @@ import java.util.*;
@Service @Service
public class ZyOrderServiceImpl implements ZyOrderService { public class ZyOrderServiceImpl implements ZyOrderService {
//虚假订单
@Autowired @Autowired
private ZyOrderMapper zyOrderMapper; private ZyOrderMapper zyOrderMapper;
@ -369,6 +370,7 @@ public class ZyOrderServiceImpl implements ZyOrderService {
queryWrapper.isNotNull("id"); queryWrapper.isNotNull("id");
Double all = Double.valueOf(zyOrderMapper.selectCount(queryWrapper)); Double all = Double.valueOf(zyOrderMapper.selectCount(queryWrapper));
//获得不同订单状态数据
List<StatusNum> statusNums = zyOrderMapper.percentStatu(); List<StatusNum> statusNums = zyOrderMapper.percentStatu();
List<StatusNum> statusNumList = JSON.parseArray(ZyMakeClothPlanMessage.STATUS, StatusNum.class); List<StatusNum> statusNumList = JSON.parseArray(ZyMakeClothPlanMessage.STATUS, StatusNum.class);

@ -28,7 +28,7 @@ public interface ZyShopService {
//查询近七日订单数 //查询近七日订单数
String selectOrderBetweenThisW(); String selectOrderBetweenThisW();
//查询近七日销售额 //查询近七日销售额
List<Integer> selectSalesVolumeBetweenThisW(); Double selectSalesVolumeBetweenThisW();
List selectAllShopSalesVolumeByLastM(); List selectAllShopSalesVolumeByLastM();
//查询无人店铺下单人数 //查询无人店铺下单人数
@ -36,7 +36,7 @@ public interface ZyShopService {
List<Type> queryByList(); List<Type> queryByList();
Integer selectAllShopSalesThisD(); Double selectAllShopSalesThisD();
Integer selectSalesVolumeByThisTime(String id); Integer selectSalesVolumeByThisTime(String id);

@ -101,7 +101,7 @@ public class ZyShopServiceImpl implements ZyShopService {
* @return * @return
*/ */
@Override @Override
public List<Integer> selectSalesVolumeBetweenThisW() { public Double selectSalesVolumeBetweenThisW() {
String start_time = GetTime.getLastSevenDay(7); String start_time = GetTime.getLastSevenDay(7);
String end_time = String.format("%tF", date); String end_time = String.format("%tF", date);
return zyShopMapper.selectSalesVolumeBetweenThisW(start_time, end_time); return zyShopMapper.selectSalesVolumeBetweenThisW(start_time, end_time);
@ -247,13 +247,15 @@ public class ZyShopServiceImpl implements ZyShopService {
* @return * @return
*/ */
@Override @Override
public Integer selectAllShopSalesThisD() { public Double selectAllShopSalesThisD() {
int ShopSales = 0; Double ShopSales = 0.00d;
String format = String.format("%tF", date); String format = String.format("%tF", date);
List<Integer> list = zyShopMapper.selectAllShopSalesThisD(format); Double sales = zyShopMapper.selectAllShopSalesThisD(format);
for (int i = list.size() - 1; i >= 0; i--) { if(sales!=null && sales>ShopSales)
ShopSales = ShopSales + list.get(i); {
ShopSales=sales;
} }
return ShopSales; return ShopSales;
} }

@ -143,7 +143,7 @@ public class ZyShopController {
@ApiOperation(value = "查询今天的营业额", notes = "查询今天的营业额") @ApiOperation(value = "查询今天的营业额", notes = "查询今天的营业额")
@GetMapping("/selectAllShopSalesThisD") @GetMapping("/selectAllShopSalesThisD")
public Result<?> selectAllShopSalesThisD() { public Result<?> selectAllShopSalesThisD() {
Integer shopSales = zyShopService.selectAllShopSalesThisD(); Double shopSales = zyShopService.selectAllShopSalesThisD();
return Result.OK(shopSales); return Result.OK(shopSales);
} }
@ -160,17 +160,14 @@ public class ZyShopController {
@AutoLog(value = "查询近七日销售额") @AutoLog(value = "查询近七日销售额")
@ApiOperation(value = "查询近七日销售额", notes = "查询近七日销售额") @ApiOperation(value = "查询近七日销售额", notes = "查询近七日销售额")
@GetMapping("/selectSalesVolumeBetweenThisW") @GetMapping("/selectSalesVolumeBetweenThisW")
public Result<Integer> selectSalesVolumeBetweenThisW(){ public Result<Double> selectSalesVolumeBetweenThisW(){
List<Integer> list = zyShopService.selectSalesVolumeBetweenThisW(); Double sales = zyShopService.selectSalesVolumeBetweenThisW();
int salesVolem = 0; Double salesVolem = 0.00d;
if (list.isEmpty()) { if(sales!=null && sales>salesVolem)
return Result.OK(0); {
} else { salesVolem=sales;
for (Integer sales : list) {
salesVolem += sales;
}
return Result.OK(salesVolem);
} }
return Result.OK(salesVolem);
} }
} }

@ -26,7 +26,7 @@ public interface ZyShopMapper extends BaseMapper<ZyShop> {
//查询近七日订单数 //查询近七日订单数
String selectOrderBetweenThisW(String start_time,String end_time); String selectOrderBetweenThisW(String start_time,String end_time);
//查询近七日销售额 //查询近七日销售额
List<Integer> selectSalesVolumeBetweenThisW(String start_time,String end_time); Double selectSalesVolumeBetweenThisW(String start_time,String end_time);
//查询所有店铺上月销售额 //查询所有店铺上月销售额
List<ZyShopNameAndPayMoney> selectAllShopSalesVolumeByLastM(String start_time,String end_time); List<ZyShopNameAndPayMoney> selectAllShopSalesVolumeByLastM(String start_time,String end_time);
//查询无人店铺下单人数 //查询无人店铺下单人数
@ -36,7 +36,7 @@ public interface ZyShopMapper extends BaseMapper<ZyShop> {
//查询当前店铺月销售额 //查询当前店铺月销售额
List<ZyOrderPayAndTime> queryByList(String name, String start_time, String end_time); List<ZyOrderPayAndTime> queryByList(String name, String start_time, String end_time);
//查询今天的营业额 //查询今天的营业额
List<Integer> selectAllShopSalesThisD(String time); Double selectAllShopSalesThisD(String time);
// //
List<Integer> selectSalesVolumeByThisTime(String id,String time); List<Integer> selectSalesVolumeByThisTime(String id,String time);

@ -25,15 +25,15 @@
<!-- 查询近七日订单数 --> <!-- 查询近七日订单数 -->
<select id="selectOrderBetweenThisW" resultType="String"> <select id="selectOrderBetweenThisW" resultType="String">
select count(*) select count(*)
from zy_order from zy_orders
where pay_time BETWEEN #{start_time} AND #{end_time} where payment_time BETWEEN #{start_time} AND #{end_time} AND ischild=0
</select> </select>
<!-- 查询近七日销售额 --> <!-- 查询近七日销售额 -->
<select id="selectSalesVolumeBetweenThisW" resultType="Integer"> <select id="selectSalesVolumeBetweenThisW" resultType="Integer">
SELECT total_money SELECT sum(money) as total_money
FROM zy_order FROM zy_orders
WHERE pay_time between #{start_time} and #{end_time} WHERE payment_time between #{start_time} and #{end_time} AND ischild=0
</select> </select>
<!--查询所有店铺上月销售额 --> <!--查询所有店铺上月销售额 -->
@ -87,16 +87,16 @@
</select> </select>
<!-- 查询今天的营业额 --> <!-- 查询今天的营业额 -->
<select id="selectAllShopSalesThisD" resultType="Integer"> <select id="selectAllShopSalesThisD" resultType="Double">
SELECT total_money SELECT sum(money) as total_money
FROM zy_order FROM zy_orders
WHERE pay_time LIKE #{time}"%" WHERE payment_time LIKE #{time}"%" AND ischild=0 AND payment_status=1
</select> </select>
<select id="selectSalesVolumeByThisTime" resultType="Integer"> <select id="selectSalesVolumeByThisTime" resultType="Double">
SELECT total_money SELECT sum(money) as total_money
FROM zy_order FROM zy_orders
WHERE shop_id = #{id} WHERE shop_id = #{id}
AND pay_time LIKE #{time}"%" AND payment_time LIKE #{time}"%"
</select> </select>
</mapper> </mapper>

@ -5,6 +5,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo;
/** /**
* @Description: 订单基本信息管理 * @Description: 订单基本信息管理
@ -14,4 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/ */
public interface ZyOrdersMapper extends BaseMapper<ZyOrders> { public interface ZyOrdersMapper extends BaseMapper<ZyOrders> {
/**
* 获取今日订单及七日订单
* @return
*/
TodayOrderAndQIriVo getTotalOrderAndWeek();
} }

@ -2,4 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.zyorders.mapper.ZyOrdersMapper"> <mapper namespace="org.jeecg.modules.demo.zyorders.mapper.ZyOrdersMapper">
<select id="getTotalOrderAndWeek" resultType="org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo">
SELECT
a.todayNum,
b.weekTotal
FROM
(
( SELECT COUNT( 1 ) todayNum FROM zy_orders WHERE to_days( create_time ) = to_days( now()) and payment_status=1 and ischild=0 ) a,
(
SELECT
COUNT( 1 ) weekTotal
FROM
zy_orders
WHERE
DATE_SUB( CURDATE(), INTERVAL 7 DAY ) &lt;= DATE( create_time ) and payment_status=1 and ischild=0 ) b)
</select>
</mapper> </mapper>

@ -3,6 +3,9 @@ package org.jeecg.modules.demo.zyorders.service;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo;
import java.util.List;
/** /**
* @Description: 订单基本信息管理 * @Description: 订单基本信息管理
@ -12,4 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/ */
public interface IZyOrdersService extends IService<ZyOrders> { public interface IZyOrdersService extends IService<ZyOrders> {
//大屏数据-获取订单的状态
List<ZyOrders> getOrderStatus();
//大屏数据-获取历史订单
List<ZyOrders> getOldOrder();
//大屏数据-获取今日订单及七日订单
TodayOrderAndQIriVo getOrder();
} }

@ -1,12 +1,19 @@
package org.jeecg.modules.demo.zyorders.service.impl; package org.jeecg.modules.demo.zyorders.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
import org.jeecg.modules.demo.zyorders.mapper.ZyOrdersMapper; import org.jeecg.modules.demo.zyorders.mapper.ZyOrdersMapper;
import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; import org.jeecg.modules.demo.zyorders.service.IZyOrdersService;
import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
/** /**
* @Description: 订单基本信息管理 * @Description: 订单基本信息管理
* @Author: jeecg-boot * @Author: jeecg-boot
@ -16,4 +23,71 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service @Service
public class ZyOrdersServiceImpl extends ServiceImpl<ZyOrdersMapper, ZyOrders> implements IZyOrdersService { public class ZyOrdersServiceImpl extends ServiceImpl<ZyOrdersMapper, ZyOrders> implements IZyOrdersService {
/**
* 大屏数据-获取订单的状态
* @return
*/
@Override
public List<ZyOrders> getOrderStatus() {
String starTime;
String endTime;
Date date = new Date();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
String todayStr = formatter.format(date);//今天
//System.out.println(todayStr);
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
//把日期往后增加一天.整数往后推,负数往前移动(1:表示明天、-1:表示昨天,0:表示今天)
calendar.add(Calendar.DATE, 1);
//这个时间就是日期往后推一天的结果,明天
date = calendar.getTime();
String tomorrowStr = formatter.format(date);
//System.out.println(tomorrowStr);
starTime = todayStr + " 00:00:00";
endTime = tomorrowStr + " 00:00:00";
// System.out.println(starTime);
// System.out.println(endTime);
QueryWrapper<ZyOrders> wrapper = new QueryWrapper<>();
wrapper.ge("create_time", starTime).le("create_time", endTime).eq("payment_status", 1);
List<ZyOrders> zyOrderList = baseMapper.selectList(wrapper);
return zyOrderList;
}
/**
* 大屏数据-获取历史订单
* @return
*/
@Override
public List<ZyOrders> getOldOrder() {
QueryWrapper<ZyOrders> wrapper = new QueryWrapper<>();
wrapper
// .eq("is_delete", 0)
.orderByDesc("create_time");
List<ZyOrders> orderList = baseMapper.selectList(wrapper);
return orderList;
}
/**
* 获取今日订单及七日订单
* @return
*/
@Override
public TodayOrderAndQIriVo getOrder() {
TodayOrderAndQIriVo todayOrderAndQIriVo = baseMapper.getTotalOrderAndWeek();
if (todayOrderAndQIriVo != null) {
return todayOrderAndQIriVo;
} else {
return null;
}
}
} }

@ -0,0 +1,91 @@
package org.jeecg.modules.largeScreen;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
import org.jeecg.modules.demo.zyorders.service.IZyOrdersService;
import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo;
import org.jeecg.modules.shop.vo.OrderSales;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author Lee
*下单的时候直接生成生产订单zy_make_order)====> 审核生产订单 ==========>通过的话就生成对应的zy_make_cloth_plan
*/
@Api(tags = "大屏数据")
@RequestMapping("/largeScreen")
@RestController
@Slf4j
public class LargeScreenController {
@Autowired
private IZyOrdersService zyOrdersService;
/********************************************订单大数据监控系统********************************************/
/************************************实时订单展示************************************/
/**
* 查询订单的状态
*
* @return
*/
@AutoLog (value = "获取订单的状态")
@ApiOperation(value = "获取订单的状态", notes = "获取订单的状态")
@GetMapping("/getOrderStatus")
public Result<?> getOrderStatus() {
List<ZyOrders> zyOrderList = zyOrdersService.getOrderStatus();
if (!zyOrderList.isEmpty())
{
return Result.OK("查询成功!", zyOrderList);
}
else
{
return Result.error("今天没有生成订单!");
}
}
@AutoLog(value = "获取历史订单")
@ApiOperation(value = "获取历史订单", notes = "获取历史订单")
@GetMapping("/getOldOrder")
public Result<?> getOldOrder() {
List<ZyOrders> orderList = zyOrdersService.getOldOrder();
if (!orderList.isEmpty()){
return Result.OK("查询成功!", orderList);
}else {
return Result.error("获取订单失败!");
}
}
// @AutoLog(value = "订单销售分析")
// @ApiOperation(value = "订单销售分析", notes = "订单销售分析")
// @GetMapping("/selectOrderSale")
// public Result<?> selectOrderSale(){
// List<OrderSales> list = zyOrdersService.selectOrderSale();
// return Result.OK(list);
// }
/************************************销售订单数据************************************/
@AutoLog(value = "获取今日订单及七日订单")
@ApiOperation(value = "获取今日订单及七日订单", notes = "获取今日订单及七日订单")
@GetMapping("/getOrder")
public Result<?> getOrder() {
TodayOrderAndQIriVo todayOrderAndQIriVo = zyOrdersService.getOrder();
if (todayOrderAndQIriVo != null) {
return Result.OK(todayOrderAndQIriVo);
}else {
return Result.OK("没有工作安排");
}
}
}

@ -278,7 +278,7 @@ public class WorkOrderController extends JeecgController<WorkOrder, IWorkOrderSe
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap()); QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap());
Page<SysDepart> page = new Page<SysDepart>(pageNo, pageSize); Page<SysDepart> page = new Page<SysDepart>(pageNo, pageSize);
queryWrapper.eq("org_type",1); // queryWrapper.eq("org_type",1);
queryWrapper.eq("org_category",2); queryWrapper.eq("org_category",2);
IPage<SysDepart> pageList = sysDepartService.page(page, queryWrapper); IPage<SysDepart> pageList = sysDepartService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);

@ -2,6 +2,7 @@ package org.jeecg.modules.workorder.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
@ -181,6 +182,8 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
if(ogList.size()>0) if(ogList.size()>0)
{//start if 02 {//start if 02
// 保存工单 // 保存工单
//获取订单商品
OrderGoods ogModel=ogList.get(0); OrderGoods ogModel=ogList.get(0);
//服装款式 //服装款式
@ -207,6 +210,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
} }
ZyClothSample cSampleModel=csList.get(0); ZyClothSample cSampleModel=csList.get(0);
//生成工单
int goodNum=ogModel.getGoodsNum(); int goodNum=ogModel.getGoodsNum();
WorkOrder workOrder=new WorkOrder(); WorkOrder workOrder=new WorkOrder();
workOrder.setProductCode(CreateWorkCode(csModel.getNums(),smModel.getModelNumber()));//工单编号 workOrder.setProductCode(CreateWorkCode(csModel.getNums(),smModel.getModelNumber()));//工单编号
@ -218,8 +222,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
workOrder.setWorkOrderStatus(0);//工单状态 workOrder.setWorkOrderStatus(0);//工单状态
workOrder.setEnterprisesId(depId);//企业id workOrder.setEnterprisesId(depId);//企业id
baseMapper.insert(workOrder); baseMapper.insert(workOrder);
//保存产品 //保存产品
if(ogModel.getGoodsNum()>0) if(goodNum>0)
{ {
//量体数据 //量体数据
CustomerMeasure mesureModel=customerMeasureMapper.selectById(ogModel.getMeasureId()); CustomerMeasure mesureModel=customerMeasureMapper.selectById(ogModel.getMeasureId());
@ -227,7 +232,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
return Result.error("未找到对客户量体数据!"); return Result.error("未找到对客户量体数据!");
} }
//商品数量对应产品 //#region 商品数量对应产品 保存产品
for(int i=0;i<goodNum;i++) for(int i=0;i<goodNum;i++)
{ {
ZyProduct productModel=new ZyProduct(); ZyProduct productModel=new ZyProduct();
@ -346,13 +351,6 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
//zyProductProcessService.save() //zyProductProcessService.save()
//#endregion //#endregion
//#region 工具-添加(服装款式类型中读取)
//#endregion
//#region 设备-添加(服装款式类型中读取)
//#endregion
//#region 产品模块-添加(从订单中读取) //#region 产品模块-添加(从订单中读取)
//订单商品模块表-根据订单商品id //订单商品模块表-根据订单商品id
@ -416,7 +414,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
// productAccessoriesMapper.saveBatch(productAccessoriesList); // productAccessoriesMapper.saveBatch(productAccessoriesList);
//#endregion //#endregion
} }
}else //#endregion
}
else
{ {
return Result.error("订单商品数量小于0!"); return Result.error("订单商品数量小于0!");
@ -439,13 +440,57 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
*/ */
@Override @Override
public Result<?> cancellationWorkOrder(WorkOrder woModel) { public Result<?> cancellationWorkOrder(WorkOrder woModel) {
//根据工单获取产品列表,然后循环删除产品列表中的工序,以及工序对应的设备、工具,再删除产品中对应模块、面料、辅料
//ZyProduct
//工单 //工单
//-产品 //-产品
//-工序 QueryWrapper<ZyProduct> productWrapper = new QueryWrapper<ZyProduct>();
productWrapper.eq("work_order_id", woModel.getId());
List<ZyProduct> productList = productMapper.selectList(productWrapper);
for (ZyProduct model:productList)
{
//-工序
QueryWrapper<ZyProductProcess> productProcessWrapper = new QueryWrapper<ZyProductProcess>();
productProcessWrapper.eq("product_id",model.getId());
productProcessMapper.delete(productProcessWrapper);
//-工具
QueryWrapper<ProductOperationtool> productOperationtoolWrapper = new QueryWrapper<ProductOperationtool>();
productOperationtoolWrapper.eq("product_id",model.getId());
productOperationtoolMapper.delete(productOperationtoolWrapper);
//-设备
QueryWrapper<ProductMachine> productMachineWrapper = new QueryWrapper<ProductMachine>();
productMachineWrapper.eq("product_id",model.getId());
productMachineMapper.delete(productMachineWrapper);
//产品模块
QueryWrapper<ProductModule> productModuleWrapper = new QueryWrapper<ProductModule>();
productModuleWrapper.eq("product_id",model.getId());
productModuleMapper.delete(productModuleWrapper);
//产品面料
QueryWrapper<ProductFabric> productFabricWrapper = new QueryWrapper<ProductFabric>();
productFabricWrapper.eq("product_id",model.getId());
productFabricMapper.delete(productFabricWrapper);
//产品面料
QueryWrapper<ProductAccessories> productAccessoriesWrapper = new QueryWrapper<ProductAccessories>();
productAccessoriesWrapper.eq("product_id",model.getId());
productAccessoriesMapper.delete(productAccessoriesWrapper);
}
return null;
//修改订单
UpdateWrapper updateWrapper = new UpdateWrapper();
updateWrapper.eq("id", woModel.getOrdersId());
updateWrapper.set("delivery_status", 2);
int update = zyOrdersMapper.update(null, updateWrapper);
//产品
productMapper.delete(productWrapper);
//工单
baseMapper.deleteById(woModel.getId());
return Result.OK("成功");
} }

Loading…
Cancel
Save