diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js index 315632f9..5aa5dcd2 100644 --- a/ant-design-vue-jeecg/src/config/router.config.js +++ b/ant-design-vue-jeecg/src/config/router.config.js @@ -664,4 +664,8 @@ export const constantRouterMap = [ path: '/shopping/pay',//这里是你需要设置新窗口打开的页面的路径s component: () => import('@/views/shopping/pages/pay'), }, + { + path: '/shopping/placeOrder',//这里是你需要设置新窗口打开的页面的路径s + component: () => import('@/views/shopping/pages/placeOrder'), + }, ] diff --git a/ant-design-vue-jeecg/src/main.js b/ant-design-vue-jeecg/src/main.js index d539d2a6..be83b4ac 100644 --- a/ant-design-vue-jeecg/src/main.js +++ b/ant-design-vue-jeecg/src/main.js @@ -12,8 +12,8 @@ import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; import './views/shopping/assets/iconfont/iconfont.css'//引入商城所需图标 // YU-优化 - require('@jeecg/antd-online-mini') - require('@jeecg/antd-online-mini/dist/OnlineForm.css') +// require('@jeecg/antd-online-mini') +// require('@jeecg/antd-online-mini/dist/OnlineForm.css') // 引入 按需组件的统一引入文件 //import './components/use' import Antd, { version } from 'ant-design-vue' diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue index 5bd49a89..5fae1a80 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue @@ -79,6 +79,8 @@ + 设置用量 + 详情 @@ -106,6 +108,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyProcessAccessoriesModal from './ZyProcessAccessoriesModal' import ZyAccessoriesFormDetail from '@/views/erp/accessories/modules/ZyAccessoriesFormDetail' + import {httpAction} from "@api/manage"; export default { name: 'ZyProcessAccessoriesList', mixins:[JeecgListMixin, mixinDevice], @@ -158,6 +161,11 @@ align:"center", dataIndex: 'accessoriesId_dictText' }, + { + title:'用量', + align:"center", + dataIndex: 'amount' + }, { title: '操作', dataIndex: 'action', @@ -173,7 +181,7 @@ deleteBatch: "/pro/zyProcessAccessories/deleteBatch", exportXlsUrl: "/pro/zyProcessAccessories/exportXls", importExcelUrl: "pro/zyProcessAccessories/importExcel", - + edit:"pro/zyProcessAccessories/edit" }, dictOptions:{}, superFieldList:[], @@ -196,6 +204,31 @@ this.visible = true; }, + yongliang(id){ + var a=window.prompt("请设置用量：") + var guize=/^(([1-9]{1}\d*)|(0{1}))(\.\d{1})?$/ + if(a!=null) + { + if(guize.test(a)){ + var model={}; + model.id=id; + model.amount=a; + httpAction(this.url.edit,model,'put').then((res)=>{ + if(res.success){ + this.$message.success(res.message); + this.loadData(); + }else{ + this.$message.warning(res.message); + } + }) + }else{ + this.$message.warning("请输入保留一位小数"); + return + } + } + else + return + }, valueChange(value){ if (value) this.loadData() }, diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue index 33b75a1c..54ccaf79 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue @@ -84,7 +84,9 @@ - + + 设置用量 + 详情 @@ -113,6 +115,7 @@ import ZyProcessFabricModal from './ZyProcessFabricModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import ZyFabricFormDetailModel from '@/views/erp/fabric/modules/ZyFabricFormDetailModel' + import {httpAction} from "@api/manage"; export default { name: 'ZyProcessFabricList', @@ -166,6 +169,11 @@ align:"center", dataIndex: 'fabricId_dictText' }, + { + title:'用量', + align:"center", + dataIndex: 'amount' + }, { title: '操作', dataIndex: 'action', @@ -181,7 +189,7 @@ deleteBatch: "/pro/zyProcessFabric/deleteBatch", exportXlsUrl: "/pro/zyProcessFabric/exportXls", importExcelUrl: "pro/zyProcessFabric/importExcel", - + edit:"pro/zyProcessFabric/edit" }, dictOptions:{}, superFieldList:[], @@ -196,6 +204,31 @@ }, }, methods: { + yongliang(id){ + var a=window.prompt("请设置用量：") + var guize=/^(([1-9]{1}\d*)|(0{1}))(\.\d{1})?$/ + if(a!=null) + { + if(guize.test(a)){ + var model={}; + model.id=id; + model.amount=a; + httpAction(this.url.edit,model,'put').then((res)=>{ + if(res.success){ + this.$message.success(res.message); + this.loadData(); + }else{ + this.$message.warning(res.message); + } + }) + }else{ + this.$message.warning("请输入保留一位小数"); + return + } + } + else + return + }, edit (record) { this.id = record; this.queryParam.processId=this.id; diff --git a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue index 8c96315c..05992e02 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue @@ -6,7 +6,7 @@

手机号码:

我们将通过以下手机号码向您发送订单相关信息

-

17719145652

+

{{phone}}

@@ -16,18 +16,19 @@ - + 送货上门 - + 门店自提 - + 先生 @@ -39,49 +40,42 @@ - + - + - + - - + + 保存该地址至地址簿 - - - - - - - - - - - - - - - - - - - - - - - - + +

+ 地址 + 添加新地址 +

+
+
+

{{item.name}}编辑

+

+86 {{item.phone}}

+

{{item.province}}{{item.city}}{{item.area}}{{item.detailed}}

+

默认地址

+
+
+
@@ -91,7 +85,7 @@ 支付方式

在线支付

- + 支付宝 @@ -102,17 +96,16 @@
- + 需要电子发票 -

订单小计 - 已选 1 件商品 + 已选{{num}} 件商品

@@ -164,18 +157,111 @@
- + + + + + + 先生 + + + 女士 + + + + + + + + + + + + + + + + + 保存该地址至地址簿 + + + +
+ + + diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue index 1a7bb904..2eea3942 100644 --- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue +++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue @@ -158,7 +158,7 @@ - + - + { if (res.success) { this.$message.success("撤销成功！"); diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 292b4531..9164bab4 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -126,6 +126,8 @@ public class ShiroConfig { //店铺管理 filterChainDefinitionMap.put("/zyShop/shopInfo/**","anon"); filterChainDefinitionMap.put("/zyShopOrder/shopOrder/**","anon"); + //大屏数据 + filterChainDefinitionMap.put("/largeScreen/**","anon"); //人员管理 filterChainDefinitionMap.put("/zyPerson/**","anon"); diff --git a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml index bb18ccc7..315d8c9e 100644 --- a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml +++ b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/pom.xml @@ -54,4 +54,4 @@ jeecg-boot-starter-job --> - + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java index eaf6caf7..8efc678d 100644 --- a/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java/org/jeecg/modules/orderbymakeclothplan/service/impl/ZyOrderServiceImpl.java @@ -25,6 +25,7 @@ import java.util.*; @Service public class ZyOrderServiceImpl implements ZyOrderService { + //虚假订单 @Autowired private ZyOrderMapper zyOrderMapper; @@ -369,6 +370,7 @@ public class ZyOrderServiceImpl implements ZyOrderService { queryWrapper.isNotNull("id"); Double all = Double.valueOf(zyOrderMapper.selectCount(queryWrapper)); + //获得不同订单状态数据 List statusNums = zyOrderMapper.percentStatu(); List statusNumList = JSON.parseArray(ZyMakeClothPlanMessage.STATUS, StatusNum.class); diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java index 663404c8..bb26db58 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -65,7 +66,11 @@ public class ZyProcessAccessories implements Serializable { @ApiModelProperty(value = "面料表id") private String accessoriesId; -// private String processCode; -// private String nums; + @ApiModelProperty(value = "用量") + private Double amount; + @TableField(exist = false) + private String processCode; + @TableField(exist = false) + private String nums; } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessFabric.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessFabric.java index 77f688a2..73dc17f1 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessFabric.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessFabric.java @@ -1,6 +1,7 @@ package org.jeecg.modules.demo.pro.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -49,8 +50,12 @@ public class ZyProcessFabric implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "创建时间") private Date createTime; + @ApiModelProperty(value = "用量") + private Double amount; + @TableField(exist = false) + private String processCode; + @TableField(exist = false) + private String fabricNumber; -// private String processCode; -// private String fabricNumber; } diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java index f98d06e6..af23af87 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/ZyShopService.java @@ -28,7 +28,7 @@ public interface ZyShopService { //查询近七日订单数 String selectOrderBetweenThisW(); //查询近七日销售额 - List selectSalesVolumeBetweenThisW(); + Double selectSalesVolumeBetweenThisW(); List selectAllShopSalesVolumeByLastM(); //查询无人店铺下单人数 @@ -36,7 +36,7 @@ public interface ZyShopService { List queryByList(); - Integer selectAllShopSalesThisD(); + Double selectAllShopSalesThisD(); Integer selectSalesVolumeByThisTime(String id); diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java index ccce7c49..b375e94a 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/Service/impl/ZyShopServiceImpl.java @@ -101,7 +101,7 @@ public class ZyShopServiceImpl implements ZyShopService { * @return */ @Override - public List selectSalesVolumeBetweenThisW() { + public Double selectSalesVolumeBetweenThisW() { String start_time = GetTime.getLastSevenDay(7); String end_time = String.format("%tF", date); return zyShopMapper.selectSalesVolumeBetweenThisW(start_time, end_time); @@ -247,13 +247,15 @@ public class ZyShopServiceImpl implements ZyShopService { * @return */ @Override - public Integer selectAllShopSalesThisD() { - int ShopSales = 0; + public Double selectAllShopSalesThisD() { + Double ShopSales = 0.00d; String format = String.format("%tF", date); - List list = zyShopMapper.selectAllShopSalesThisD(format); - for (int i = list.size() - 1; i >= 0; i--) { - ShopSales = ShopSales + list.get(i); + Double sales = zyShopMapper.selectAllShopSalesThisD(format); + if(sales!=null && sales>ShopSales) + { + ShopSales=sales; } + return ShopSales; } diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java index b4bc3e46..56d52af0 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/controller/ZyShopController.java @@ -143,7 +143,7 @@ public class ZyShopController { @ApiOperation(value = "查询今天的营业额", notes = "查询今天的营业额") @GetMapping("/selectAllShopSalesThisD") public Result selectAllShopSalesThisD() { - Integer shopSales = zyShopService.selectAllShopSalesThisD(); + Double shopSales = zyShopService.selectAllShopSalesThisD(); return Result.OK(shopSales); } @@ -160,17 +160,14 @@ public class ZyShopController { @AutoLog(value = "查询近七日销售额") @ApiOperation(value = "查询近七日销售额", notes = "查询近七日销售额") @GetMapping("/selectSalesVolumeBetweenThisW") - public Result selectSalesVolumeBetweenThisW(){ - List list = zyShopService.selectSalesVolumeBetweenThisW(); - int salesVolem = 0; - if (list.isEmpty()) { - return Result.OK(0); - } else { - for (Integer sales : list) { - salesVolem += sales; - } - return Result.OK(salesVolem); + public Result selectSalesVolumeBetweenThisW(){ + Double sales = zyShopService.selectSalesVolumeBetweenThisW(); + Double salesVolem = 0.00d; + if(sales!=null && sales>salesVolem) + { + salesVolem=sales; } + return Result.OK(salesVolem); } } diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java index f99fd16b..01b3df21 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/ZyShopMapper.java @@ -26,7 +26,7 @@ public interface ZyShopMapper extends BaseMapper { //查询近七日订单数 String selectOrderBetweenThisW(String start_time,String end_time); //查询近七日销售额 - List selectSalesVolumeBetweenThisW(String start_time,String end_time); + Double selectSalesVolumeBetweenThisW(String start_time,String end_time); //查询所有店铺上月销售额 List selectAllShopSalesVolumeByLastM(String start_time,String end_time); //查询无人店铺下单人数 @@ -36,7 +36,7 @@ public interface ZyShopMapper extends BaseMapper { //查询当前店铺月销售额 List queryByList(String name, String start_time, String end_time); //查询今天的营业额 - List selectAllShopSalesThisD(String time); + Double selectAllShopSalesThisD(String time); // List selectSalesVolumeByThisTime(String id,String time); diff --git a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml index c0ab0646..312b418a 100644 --- a/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml +++ b/jeecg-boot/jeecg-boot-module-shop/src/main/java/org/jeecg/modules/shop/mapper/xml/ZyShopMapper.xml @@ -25,15 +25,15 @@ @@ -87,16 +87,16 @@ - + SELECT sum(money) as total_money + FROM zy_orders + WHERE payment_time LIKE #{time}"%" AND ischild=0 AND payment_status=1 - + SELECT sum(money) as total_money + FROM zy_orders WHERE shop_id = #{id} - AND pay_time LIKE #{time}"%" + AND payment_time LIKE #{time}"%" diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java index 0613582e..3e6f5aac 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/ZyOrdersMapper.java @@ -5,6 +5,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; /** * @Description: 订单基本信息管理 @@ -14,4 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyOrdersMapper extends BaseMapper { + /** + * 获取今日订单及七日订单 + * @return + */ + TodayOrderAndQIriVo getTotalOrderAndWeek(); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml index 519d0cd0..6c40fc2e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/mapper/xml/ZyOrdersMapper.xml @@ -2,4 +2,20 @@ + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java index 1ddb16c5..eda4b3bb 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/IZyOrdersService.java @@ -3,6 +3,9 @@ package org.jeecg.modules.demo.zyorders.service; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; + +import java.util.List; /** * @Description: 订单基本信息管理 @@ -12,4 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyOrdersService extends IService { + //大屏数据-获取订单的状态 + List getOrderStatus(); + //大屏数据-获取历史订单 + List getOldOrder(); + //大屏数据-获取今日订单及七日订单 + TodayOrderAndQIriVo getOrder(); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java index 626e1ff7..351ed7e4 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java @@ -1,12 +1,19 @@ 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.mapper.ZyOrdersMapper; import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; +import org.jeecg.modules.orderbymakeclothplan.vo.TodayOrderAndQIriVo; import org.springframework.stereotype.Service; 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: 订单基本信息管理 * @Author: jeecg-boot @@ -16,4 +23,71 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyOrdersServiceImpl extends ServiceImpl implements IZyOrdersService { + /** + * 大屏数据-获取订单的状态 + * @return + */ + @Override + public List 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 wrapper = new QueryWrapper<>(); + wrapper.ge("create_time", starTime).le("create_time", endTime).eq("payment_status", 1); + + List zyOrderList = baseMapper.selectList(wrapper); + return zyOrderList; + } + + /** + * 大屏数据-获取历史订单 + * @return + */ + @Override + public List getOldOrder() { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper +// .eq("is_delete", 0) + .orderByDesc("create_time"); + List orderList = baseMapper.selectList(wrapper); + return orderList; + } + + /** + * 获取今日订单及七日订单 + * @return + */ + @Override + public TodayOrderAndQIriVo getOrder() { + TodayOrderAndQIriVo todayOrderAndQIriVo = baseMapper.getTotalOrderAndWeek(); + if (todayOrderAndQIriVo != null) { + return todayOrderAndQIriVo; + } else { + return null; + } + } + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java new file mode 100644 index 00000000..bd9277d1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java @@ -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 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 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 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("没有工作安排"); + } + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/ZyProductProcessMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/ZyProductProcessMapper.java index 1deb9c49..b12ea3a8 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/ZyProductProcessMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/ZyProductProcessMapper.java @@ -9,6 +9,8 @@ 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.pro.entity.ZyProcessAccessories; +import org.jeecg.modules.demo.pro.entity.ZyProcessFabric; import org.jeecg.modules.product.zyproductprocess.entity.ZyProductProcess; /** @@ -44,4 +46,13 @@ public interface ZyProductProcessMapper extends BaseMapper { //按照number降序排列，通过产品id筛选，然后通过processId和processCode筛选 @Select("") IPage page1(Page page, @Param("productId") String productId, @Param("process") String processId, @Param("code") String processCode); + + @Select("select id from zy_product_process where product_id=#{productId} and process_id=#{processId}") + String findProductProcessId(@Param("productId") String productId, @Param("processId") String processId); + //工序面料的全部信息 + @Select("select * from zy_process_fabric where process_id =#{processId}") + List findFabric(String processId); + //工序辅料的全部信息 + @Select("select * from zy_process_accessories where process_id =#{processId}") + List findAccessories(String processId); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/controller/ProductProcessAccessoriesController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/controller/ProductProcessAccessoriesController.java new file mode 100644 index 00000000..46231815 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/controller/ProductProcessAccessoriesController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.productprocessaccessories.controller; + + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories; +import org.jeecg.modules.productprocessaccessories.service.IProductProcessAccessoriesService; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 产品工序辅料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Api(tags="产品工序辅料管理") +@RestController +@RequestMapping("/productprocessaccessories/productProcessAccessories") +@Slf4j +public class ProductProcessAccessoriesController extends JeecgController { + @Autowired + private IProductProcessAccessoriesService productProcessAccessoriesService; + + /** + * 分页列表查询 + * + * @param productProcessAccessories + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "产品工序辅料管理-分页列表查询") + @ApiOperation(value="产品工序辅料管理-分页列表查询", notes="产品工序辅料管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ProductProcessAccessories productProcessAccessories, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(productProcessAccessories, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = productProcessAccessoriesService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param productProcessAccessories + * @return + */ + @AutoLog(value = "产品工序辅料管理-添加") + @ApiOperation(value="产品工序辅料管理-添加", notes="产品工序辅料管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ProductProcessAccessories productProcessAccessories) { + productProcessAccessoriesService.save(productProcessAccessories); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param productProcessAccessories + * @return + */ + @AutoLog(value = "产品工序辅料管理-编辑") + @ApiOperation(value="产品工序辅料管理-编辑", notes="产品工序辅料管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ProductProcessAccessories productProcessAccessories) { + productProcessAccessoriesService.updateById(productProcessAccessories); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "产品工序辅料管理-通过id删除") + @ApiOperation(value="产品工序辅料管理-通过id删除", notes="产品工序辅料管理-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + productProcessAccessoriesService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "产品工序辅料管理-批量删除") + @ApiOperation(value="产品工序辅料管理-批量删除", notes="产品工序辅料管理-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.productProcessAccessoriesService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "产品工序辅料管理-通过id查询") + @ApiOperation(value="产品工序辅料管理-通过id查询", notes="产品工序辅料管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProductProcessAccessories productProcessAccessories = productProcessAccessoriesService.getById(id); + if(productProcessAccessories==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(productProcessAccessories); + } + + /** + * 导出excel + * + * @param request + * @param productProcessAccessories + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProductProcessAccessories productProcessAccessories) { + return super.exportXls(request, productProcessAccessories, ProductProcessAccessories.class, "产品工序辅料管理"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProductProcessAccessories.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/entity/ProductProcessAccessories.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/entity/ProductProcessAccessories.java new file mode 100644 index 00000000..02bb835d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/entity/ProductProcessAccessories.java @@ -0,0 +1,69 @@ +package org.jeecg.modules.productprocessaccessories.entity; + + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 产品工序辅料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Data +@TableName("product_process_accessories") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="product_process_accessories对象", description="产品工序辅料管理") +public class ProductProcessAccessories implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**产品工序id*/ + @Excel(name = "产品工序id", width = 15) + @ApiModelProperty(value = "产品工序id") + private String productProcessId; + /**辅料id*/ + @Excel(name = "辅料id", width = 15) + @ApiModelProperty(value = "辅料id") + @Dict(dictTable = "zy_accessories",dicCode = "id",dicText = "contents") + private String accessoriesId; + /**用量*/ + @Excel(name = "用量", width = 15) + @ApiModelProperty(value = "用量") + private Double amount; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/mapper/ProductProcessAccessoriesMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/mapper/ProductProcessAccessoriesMapper.java new file mode 100644 index 00000000..c0532b24 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/mapper/ProductProcessAccessoriesMapper.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.productprocessaccessories.mapper; + + + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories; + +/** + * @Description: 产品工序辅料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +public interface ProductProcessAccessoriesMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/mapper/xml/ProductProcessAccessoriesMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/mapper/xml/ProductProcessAccessoriesMapper.xml new file mode 100644 index 00000000..45d681d0 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/mapper/xml/ProductProcessAccessoriesMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/service/IProductProcessAccessoriesService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/service/IProductProcessAccessoriesService.java new file mode 100644 index 00000000..c23c73b4 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/service/IProductProcessAccessoriesService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.productprocessaccessories.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories; + +/** + * @Description: 产品工序辅料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +public interface IProductProcessAccessoriesService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/service/impl/ProductProcessAccessoriesServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/service/impl/ProductProcessAccessoriesServiceImpl.java new file mode 100644 index 00000000..f4e02c7b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/service/impl/ProductProcessAccessoriesServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.productprocessaccessories.service.impl; + +import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories; +import org.jeecg.modules.productprocessaccessories.mapper.ProductProcessAccessoriesMapper; +import org.jeecg.modules.productprocessaccessories.service.IProductProcessAccessoriesService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 产品工序辅料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Service +public class ProductProcessAccessoriesServiceImpl extends ServiceImpl implements IProductProcessAccessoriesService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/ProductProcessAccessoriesList.vue b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/ProductProcessAccessoriesList.vue new file mode 100644 index 00000000..314f9ecd --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/ProductProcessAccessoriesList.vue @@ -0,0 +1,184 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesForm.vue b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesForm.vue new file mode 100644 index 00000000..7e99b1a7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesModal.vue b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesModal.vue new file mode 100644 index 00000000..0b6eef85 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesModal__Style#Drawer.vue b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesModal__Style#Drawer.vue new file mode 100644 index 00000000..a059e938 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/controller/ProductProcessFabricController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/controller/ProductProcessFabricController.java new file mode 100644 index 00000000..748cc501 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/controller/ProductProcessFabricController.java @@ -0,0 +1,173 @@ +package org.jeecg.modules.productprocessfabric.controller; + + + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric; +import org.jeecg.modules.productprocessfabric.service.IProductProcessFabricService; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 产品工序面料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Api(tags="产品工序面料管理") +@RestController +@RequestMapping("/productprocessfabric/productProcessFabric") +@Slf4j +public class ProductProcessFabricController extends JeecgController { + @Autowired + private IProductProcessFabricService productProcessFabricService; + + /** + * 分页列表查询 + * + * @param productProcessFabric + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "产品工序面料管理-分页列表查询") + @ApiOperation(value="产品工序面料管理-分页列表查询", notes="产品工序面料管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ProductProcessFabric productProcessFabric, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(productProcessFabric, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = productProcessFabricService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param productProcessFabric + * @return + */ + @AutoLog(value = "产品工序面料管理-添加") + @ApiOperation(value="产品工序面料管理-添加", notes="产品工序面料管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ProductProcessFabric productProcessFabric) { + productProcessFabricService.save(productProcessFabric); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param productProcessFabric + * @return + */ + @AutoLog(value = "产品工序面料管理-编辑") + @ApiOperation(value="产品工序面料管理-编辑", notes="产品工序面料管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ProductProcessFabric productProcessFabric) { + productProcessFabricService.updateById(productProcessFabric); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "产品工序面料管理-通过id删除") + @ApiOperation(value="产品工序面料管理-通过id删除", notes="产品工序面料管理-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + productProcessFabricService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "产品工序面料管理-批量删除") + @ApiOperation(value="产品工序面料管理-批量删除", notes="产品工序面料管理-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.productProcessFabricService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "产品工序面料管理-通过id查询") + @ApiOperation(value="产品工序面料管理-通过id查询", notes="产品工序面料管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProductProcessFabric productProcessFabric = productProcessFabricService.getById(id); + if(productProcessFabric==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(productProcessFabric); + } + + /** + * 导出excel + * + * @param request + * @param productProcessFabric + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProductProcessFabric productProcessFabric) { + return super.exportXls(request, productProcessFabric, ProductProcessFabric.class, "产品工序面料管理"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProductProcessFabric.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/entity/ProductProcessFabric.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/entity/ProductProcessFabric.java new file mode 100644 index 00000000..eb720e63 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/entity/ProductProcessFabric.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.productprocessfabric.entity; + + + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 产品工序面料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Data +@TableName("product_process_fabric") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="product_process_fabric对象", description="产品工序面料管理") +public class ProductProcessFabric implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**产品工序id*/ + @Excel(name = "产品工序id", width = 15) + @ApiModelProperty(value = "产品工序id") + private String productProcessId; + /**面料id*/ + @Excel(name = "面料id", width = 15) + @ApiModelProperty(value = "面料id") + private String fabricId; + /**用量*/ + @Excel(name = "用量", width = 15) + @ApiModelProperty(value = "用量") + private Double amount; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/mapper/ProductProcessFabricMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/mapper/ProductProcessFabricMapper.java new file mode 100644 index 00000000..df9ba971 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/mapper/ProductProcessFabricMapper.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.productprocessfabric.mapper; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric; + +/** + * @Description: 产品工序面料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +public interface ProductProcessFabricMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/mapper/xml/ProductProcessFabricMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/mapper/xml/ProductProcessFabricMapper.xml new file mode 100644 index 00000000..33e02c43 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/mapper/xml/ProductProcessFabricMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/service/IProductProcessFabricService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/service/IProductProcessFabricService.java new file mode 100644 index 00000000..1eaafaf7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/service/IProductProcessFabricService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.productprocessfabric.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric; + +/** + * @Description: 产品工序面料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +public interface IProductProcessFabricService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/service/impl/ProductProcessFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/service/impl/ProductProcessFabricServiceImpl.java new file mode 100644 index 00000000..7bbe19c2 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/service/impl/ProductProcessFabricServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.productprocessfabric.service.impl; + +import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric; +import org.jeecg.modules.productprocessfabric.mapper.ProductProcessFabricMapper; +import org.jeecg.modules.productprocessfabric.service.IProductProcessFabricService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 产品工序面料管理 + * @Author: jeecg-boot + * @Date: 2023-02-22 + * @Version: V1.0 + */ +@Service +public class ProductProcessFabricServiceImpl extends ServiceImpl implements IProductProcessFabricService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/ProductProcessFabricList.vue b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/ProductProcessFabricList.vue new file mode 100644 index 00000000..9186847a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/ProductProcessFabricList.vue @@ -0,0 +1,184 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricForm.vue b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricForm.vue new file mode 100644 index 00000000..0a13ae4d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricModal.vue b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricModal.vue new file mode 100644 index 00000000..ea6c3c95 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricModal__Style#Drawer.vue b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricModal__Style#Drawer.vue new file mode 100644 index 00000000..6438e2ca --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java index 607155e0..49a12936 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java @@ -278,7 +278,7 @@ public class WorkOrderController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - queryWrapper.eq("org_type",1); + // queryWrapper.eq("org_type",1); queryWrapper.eq("org_category",2); IPage pageList = sysDepartService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java index 6d71b47c..c8391043 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java @@ -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.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; @@ -17,6 +18,8 @@ import org.jeecg.modules.demo.ordergoodsfabric.entity.OrderGoodsFabric; import org.jeecg.modules.demo.ordergoodsfabric.mapper.OrderGoodsFabricMapper; import org.jeecg.modules.demo.ordergoodsmodule.entity.OrderGoodsModule; import org.jeecg.modules.demo.ordergoodsmodule.mapper.OrderGoodsModuleMapper; +import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories; +import org.jeecg.modules.demo.pro.entity.ZyProcessFabric; import org.jeecg.modules.demo.pro.entity.ZyProcessMachine; import org.jeecg.modules.demo.pro.mapper.ZyProcessMachineMapper; import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular; @@ -37,6 +40,10 @@ import org.jeecg.modules.product.productModule.entity.ProductModule; import org.jeecg.modules.product.productModule.mapper.ProductModuleMapper; import org.jeecg.modules.product.zyproductprocess.entity.ZyProductProcess; import org.jeecg.modules.product.zyproductprocess.mapper.ZyProductProcessMapper; +import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories; +import org.jeecg.modules.productprocessaccessories.mapper.ProductProcessAccessoriesMapper; +import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric; +import org.jeecg.modules.productprocessfabric.mapper.ProductProcessFabricMapper; import org.jeecg.modules.workorder.entity.WorkOrder; import org.jeecg.modules.workorder.entity.WorkOrderVo; import org.jeecg.modules.workorder.mapper.WorkOrderMapper; @@ -143,8 +150,10 @@ public class WorkOrderServiceImpl extends ServiceImpl0) {//start if 02 // 保存工单 + + //获取订单商品 OrderGoods ogModel=ogList.get(0); //服装款式 @@ -199,6 +210,7 @@ public class WorkOrderServiceImpl extends ServiceImpl0) + if(goodNum>0) { //量体数据 CustomerMeasure mesureModel=customerMeasureMapper.selectById(ogModel.getMeasureId()); @@ -219,7 +232,7 @@ public class WorkOrderServiceImpl extends ServiceImpl listFabric= productProcessMapper.findFabric(zpp.getProcessId()); + //辅料 + List listAccessories=productProcessMapper.findAccessories(zpp.getProcessId()); + //然后将产品工序id和辅料面料绑定 + //产品工序面料 + for (ZyProcessFabric zyProcessFabric : listFabric) { + ProductProcessFabric fabric=new ProductProcessFabric(); + fabric.setFabricId(zyProcessFabric.getFabricId()); + fabric.setAmount(zyProcessFabric.getAmount()); + fabric.setProductProcessId(productprocessId); + fabric.setId(null); + productProcessFabricMapper.insert(fabric); + } + //产品工序辅料 + for (ZyProcessAccessories listAccessory : listAccessories) { + ProductProcessAccessories accessories=new ProductProcessAccessories(); + accessories.setAccessoriesId(listAccessory.getAccessoriesId()); + accessories.setAmount(listAccessory.getAmount()); + accessories.setProductProcessId(productprocessId); + accessories.setId(null); + productProcessAccessoriesMapper.insert(accessories); + } //ZyProcess =processMapper.selectById(item.getProcessId()); //region 获取工序工具 @@ -312,13 +351,6 @@ public class WorkOrderServiceImpl extends ServiceImpl cancellationWorkOrder(WorkOrder woModel) { + //根据工单获取产品列表，然后循环删除产品列表中的工序，以及工序对应的设备、工具，再删除产品中对应模块、面料、辅料 - //ZyProduct //工单 - //-产品 - //-工序 + //-产品 + QueryWrapper productWrapper = new QueryWrapper(); + productWrapper.eq("work_order_id", woModel.getId()); + List productList = productMapper.selectList(productWrapper); + + for (ZyProduct model:productList) + { + //-工序 + QueryWrapper productProcessWrapper = new QueryWrapper(); + productProcessWrapper.eq("product_id",model.getId()); + productProcessMapper.delete(productProcessWrapper); + //-工具 + QueryWrapper productOperationtoolWrapper = new QueryWrapper(); + productOperationtoolWrapper.eq("product_id",model.getId()); + productOperationtoolMapper.delete(productOperationtoolWrapper); + //-设备 + QueryWrapper productMachineWrapper = new QueryWrapper(); + productMachineWrapper.eq("product_id",model.getId()); + productMachineMapper.delete(productMachineWrapper); + + //产品模块 + QueryWrapper productModuleWrapper = new QueryWrapper(); + productModuleWrapper.eq("product_id",model.getId()); + productModuleMapper.delete(productModuleWrapper); + + //产品面料 + QueryWrapper productFabricWrapper = new QueryWrapper(); + productFabricWrapper.eq("product_id",model.getId()); + productFabricMapper.delete(productFabricWrapper); + + //产品面料 + QueryWrapper productAccessoriesWrapper = new QueryWrapper(); + productAccessoriesWrapper.eq("product_id",model.getId()); + productAccessoriesMapper.delete(productAccessoriesWrapper); + } + + + //修改订单 + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("id", woModel.getOrdersId()); + updateWrapper.set("delivery_status", 2); + int update = zyOrdersMapper.update(null, updateWrapper); - return null; + //产品 + productMapper.delete(productWrapper); + //工单 + baseMapper.deleteById(woModel.getId()); + return Result.OK("成功"); }