Merge remote-tracking branch 'origin/master' into zhc4dev

zhc4dev
zhc077 2 years ago
commit 0c6630fe07
  1. 65
      ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
  2. 12
      ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue
  3. 13
      ant-design-vue-jeecg/src/views/productrecord/modules/ProductRecordForm.vue
  4. 4
      ant-design-vue-jeecg/src/views/sensor/SensorList.vue
  5. 2
      ant-design-vue-jeecg/src/views/sensor/modules/SensorForm.vue
  6. 2
      ant-design-vue-jeecg/src/views/sensorrecord/modules/SensorRecordForm.vue
  7. 3
      ant-design-vue-jeecg/src/views/shopping/assets/common.css
  8. 228
      ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
  9. 482
      ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue
  10. 115
      ant-design-vue-jeecg/src/views/shopping/pages/clothType.vue
  11. 4
      ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
  12. 16
      ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
  13. 2
      jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
  14. 12
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
  15. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/controller/ProductRecordController.java
  16. 88
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/entity/ProductRecord.java
  17. 1
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/sensor/entity/Sensor.java
  18. 170
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
  19. 55
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/FzlxSp.java
  20. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/ZyGoods.java
  21. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java

@ -1,9 +1,29 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 35%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="7" :lg="7" :md="8" :sm="24">
<a-form-item label="模块编号">
<a-input placeholder="模块编号" v-model="queryParam.styleModuleId"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="模块名称">
<j-dict-select-tag placeholder="请选择模块名称" dictCode="zy_cloths_modular,modular_name,id"
v-model="queryParam.modularId"></j-dict-select-tag>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -11,19 +31,13 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('工单管理下面的产品模块')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
<!-- </a-dropdown>-->
<a-button type="primary" icon="rollback" @click="fanHui()">返回</a-button>
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('工单管理下面的产品模块')">导出</a-button>-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">导入</a-button>-->
<!-- </a-upload>-->
</div>
<!-- table区域-begin -->
@ -68,7 +82,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<!-- <a @click="handleEdit(record)">编辑</a>-->
<a-divider type="vertical" />
<a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
@ -100,6 +114,8 @@
data () {
return {
description: '工单管理下面的产品模块管理页面',
biaoTi:'',
loadRouteType: false,
//
columns: [
{
@ -118,12 +134,13 @@
dataIndex: 'productId'
},
{
title:'款式模块id',
// title:'id',
title:'模块编号',
align:"center",
dataIndex: 'styleModuleId'
},
{
title:'模块id',
title:'模块名称',
align:"center",
dataIndex: 'moduleId'
},
@ -159,7 +176,8 @@
}
},
created() {
this.getSuperFieldList();
// this.getSuperFieldList();
this.loadParameter();
},
computed: {
importExcelUrl: function(){
@ -167,6 +185,19 @@
},
},
methods: {
fanHui(){
this.$router.push({
/*返回产品*/
path: '/WorkProduct',/*在引号中填写返回vue*/
});
},
loadParameter() {
if (this.loadRouteType === false) {
this.biaoTi=this.$route.query.productName+" 产品模块管理";
console.log("***********",this.$route.query.productName)
this.loadRouteType = true;
}
},
initDictConfig(){
},
getSuperFieldList(){

@ -11,7 +11,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="工单编号">
<j-search-select-tag placeholder="请选择工单编号" v-model="queryParam.orderCode" dict="findgdbh,order_id,order_code,id,orders_num"/>
<j-popup placeholder="请选择工单编号" v-model="queryParam.orderCode" code="findgdbh" org-fields="id,orders_num" dest-fields="order_id,order_code" :field="getPopupField('order_id,order_code')" :multi="true"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
@ -157,7 +157,7 @@
{
title:'工单编号',
align:"center",
dataIndex: 'orderId'
dataIndex: 'orderId_dictText'
},
{
title:'生产开始时间',
@ -194,14 +194,14 @@
deleteBatch: "/productrecord/productRecord/deleteBatch",
exportXlsUrl: "/productrecord/productRecord/exportXls",
importExcelUrl: "productrecord/productRecord/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
@ -215,8 +215,8 @@
let fieldList=[];
fieldList.push({type:'sel_search',value:'stationId',text:'工位',dictTable:'station', dictText:'station_name', dictCode:'id'})
fieldList.push({type:'popup',value:'stationName',text:'工位', popup:{code:'findgw',field:'id',orgFields:'id',destFields:'station_id'}})
fieldList.push({type:'sel_search',value:'orderCode',text:'工单编号',dictTable:'findgdbh', dictText:'order_id,order_code', dictCode:'id,orders_num'})
fieldList.push({type:'popup',value:'orderId',text:'工单编号', popup:{code:'work_order',field:'id',orgFields:'id',destFields:'product_code'}})
fieldList.push({type:'popup',value:'orderCode',text:'工单编号', popup:{code:'findgdbh',field:'id',orgFields:'id',destFields:'order_id'}})
fieldList.push({type:'sel_search',value:'orderId',text:'工单编号',dictTable:'work_order', dictText:'product_code', dictCode:'id'})
fieldList.push({type:'datetime',value:'workTime',text:'生产开始时间'})
fieldList.push({type:'datetime',value:'offTime',text:'生产结束时间'})
fieldList.push({type:'string',value:'duration',text:'时长',dictCode:''})

@ -13,12 +13,20 @@
code="findgw"
:multi="true"
@input="popupCallback"
/>
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCode">
<j-search-select-tag v-model="model.orderCode" dict="findgdbh,order_id,order_code,id,orders_num" />
<j-popup
v-model="model.orderCode"
field="orderCode"
org-fields="id,orders_num"
dest-fields="orderId,orderCode"
code="findgdbh"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -46,7 +54,6 @@
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'

@ -172,7 +172,7 @@
{
title:'工位',
align:"center",
dataIndex: 'stationId'
dataIndex: 'stationId_dictText'
},
{
title:'进出标记',
@ -194,7 +194,7 @@
deleteBatch: "/sensor/sensor/deleteBatch",
exportXlsUrl: "/sensor/sensor/exportXls",
importExcelUrl: "sensor/sensor/importExcel",
},
dictOptions:{},
superFieldList:[],

@ -10,7 +10,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId">
<j-search-select-tag v-model="model.workshopId" dict="sys_depart,depart_name,id" />
<j-search-select-tag v-model="model.workshopId" dict="sys_depart,depart_name,id" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">

@ -94,4 +94,7 @@ a {
.c_1B {
color: #1B1B1B;
}
.c_31 {
color: #313131;
}
.textfield {overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}

@ -25,22 +25,144 @@
</a-radio-group>
</a-form-item>
<a-form-item
label="Field A"
label="称呼"
>
<a-input placeholder="input placeholder" />
<a-select placeholder="请选择称呼" :value="userSex" style="width: 120px;margin-right:10px" @change="handleChange">
<a-select-option value="1">
先生
</a-select-option>
<a-select-option value="0">
女士
</a-select-option>
</a-select>
<a-input style="width:300px" placeholder="请输入姓名" :value="userName"/>
</a-form-item>
<a-form-item
label="Field B"
label="选择地址"
>
<a-input placeholder="input placeholder" />
</a-form-item>
<a-form-item
label="详细地址"
>
<a-textarea placeholder="请输入街道、门牌号码等详细地址" auto-size />
</a-form-item>
<a-form-item
label="手机号码"
>
<a-input style="width:150px;margin-right:10px" placeholder="+86 中国大陆地区" disabled/>
<a-input style="width:300px" placeholder="请输入手机号码" :value="userName"/>
</a-form-item>
<a-form-item>
<a-checkbox @change="onChange">
保存该地址至地址簿
</a-checkbox>
</a-form-item>
<!-- <a-form-item v-bind="formItemLayout" label="手机号码">-->
<!-- <a-input-->
<!-- v-decorator="[-->
<!-- 'phone',-->
<!-- {-->
<!-- rules: [{ required: true, message: 'Please input your phone number!' }],-->
<!-- },-->
<!-- ]"-->
<!-- >-->
<!-- <a-select-->
<!-- slot="addonBefore"-->
<!-- v-decorator="['prefix', { initialValue: '86' }]"-->
<!-- style="width: 70px"-->
<!-- default-value="86"-->
<!-- >-->
<!-- <a-select-option value="86">-->
<!-- +86 中国大陆地区-->
<!-- </a-select-option>-->
<!-- <a-select-option value="87">-->
<!-- +87 中国大陆地区-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- </a-input>-->
<!-- </a-form-item>-->
</a-form>
</div>
</div>
<div class="addr"></div>
<div class="addr"></div>
<div class="addr">
<div class="title">
<span class="icon">2</span>
<span class="text f_18">支付方式</span></div>
<div class="pay">
<p class="f_12 c_1B">在线支付</p>
<a-radio-group v-model="paymentMode" @change="onChange1">
<a-radio :value="1">
<a-icon type="alipay" style="background:#08AAFF;color:#fff;border-radius: 2px;padding:1px;margin-right:3px"/>
<span>支付宝</span>
</a-radio>
<a-radio :value="2">
<a-icon type="wechat" style="background:#00B40C;color:#fff;border-radius: 2px;padding:1px;margin-right:3px"/>
<span>微信支付</span>
</a-radio>
</a-radio-group>
</div>
<a-checkbox @change="onChange">
需要电子发票
</a-checkbox>
</div>
<!-- <div class="addr"></div>-->
</div>
<div class="rightDiv">
<div class="order">
<p class="d-flex title">
<span class="f_14 c_999">订单小计</span>
<span class="f_14 c_31">已选 1 件商品</span>
</p>
<div class="table d-flex">
<div class="left">
<!-- <img src="">-->
<div class="img"></div>
</div>
<div class="right">
<p class="d-flex">
<span class="f_12 c_1B">关键词12定制款立领衬</span>
<span class="f_12 c_999">数量1</span>
</p>
<p class="f_12 c_999">款式立领标签2</p>
<p class="d-flex">
<span class="f_12 c_999">主辅料主料1辅料1叮叮叮辅料n</span>
<span class="f_12 c_999">数量1</span>
</p>
<p class="f_12 c_999">尺码 XXS</p>
<p class="d-flex">
<span class="f_12 c_999">定制</span>
<span class="f_12 c_999">35,500</span>
</p>
</div>
</div>
<p class="d-flex">
<span class="f_14 c_31">商品总计</span>
<span class="f_14 c_666">35,500</span>
</p>
<p class="d-flex">
<span class="f_14 c_31">运费</span>
<span class="f_14 c_999">免费</span>
</p>
<p class="d-flex title">
<span class="f_14 c_31">总计</span>
<span class="f_20 c_31">35,500</span>
</p>
<div class="btnDiv">
<div type="primary" class="dialogButton primary f_14">立即购买</div>
</div>
<p class="explain f_12 c_999">说明</p>
<p class="f_12 c_999">在线支付订单提交之后15分钟内未付款订单将被系统自动取消请您尽快完成支付以确保商品能及时送达避免取消订单带来不必要的麻烦</p>
</div>
<div class="time">
<p class="f_20 c_333">预计配送时间</p>
<p class="f_12 c_333">我们将会在第一时间为您发货</p>
<p class="f_12 c_333">所有现货商品在1-2个工作日发货门店调货商品会视货品情况进行发货</p>
<p class="f_12 c_333">*定制商品除外</p>
<p class="f_16 c_333">需要多长时间能够送达 </p>
<p class="f_12 c_333">中国大陆2-5个工作日视货品情况而定</p>
</div>
</div>
<div class="rightDiv">1</div>
</div>
</div>
@ -50,6 +172,10 @@
data() {
return {
formLayout: 'horizontal',
userSex:'',//
userName:'',//
value: 1,
paymentMode:'',//
};
},
computed: {
@ -75,12 +201,44 @@
handleFormLayoutChange(e) {
this.formLayout = e.target.value;
},
handleChange(value) {
this.userSex = value
},
onChange(e) {
console.log(`checked = ${e.target.checked}`);
},
onChange1(e) {
console.log('radio checked', e.target.value);
},
},
};
</script>
<style lang="less" scoped>
.btnDiv{
border-bottom: 1px solid #E7E7E7;
padding-bottom: 30px;
padding-top: 20px;
.dialogButton {
height: 44px;
text-align: center;
line-height: 44px;
transition: all 0.2s;
}
.primary {
background: #1b1b1b;
border: 2px solid #1b1b1b;
color: #e5dfd9;
&:hover {
// border-color: #1b1b1b;
// color: #1b1b1b;
// background-color: #fff;
opacity: 0.8;
}
}
}
.placeOrder{
padding-top: 54px;
padding-bottom: 80px;
background-color: #F6F6F6;
& >.jz{
justify-content: space-around;
@ -123,6 +281,15 @@
.addr{
background-color: #fff;
padding:0 30px 30px 30px;
margin-bottom: 25px;
.pay{
padding: 47px 20px;
border-bottom: 1px solid #EAEAEA;
margin-bottom: 20px;
.ant-radio-wrapper{
margin-right: 20px;
}
}
}
.form{
background-color: #fff;
@ -131,6 +298,55 @@
}
.rightDiv{
width: 410px;
.order{
background: #FFFFFF;
padding: 24px 43px;
margin-bottom: 24px;
.d-flex{
justify-content: space-between;
.left{
width: 60px;
}
.right{
width: 250px;
}
}
&>.d-flex{
padding: 10px 0;
}
&>.title.d-flex{
border-bottom: 1px solid #E7E7E7;
padding: 20px 0;
}
.left{
.img{
background: #D9D9D9;
width: 60px;
height: 77px;
}
}
.explain{
padding-top: 25px;
padding-bottom: 10px;
}
}
.time{
background: #fff;
padding: 24px 43px;
p{
margin-bottom: 5px;
}
.f_20{
font-weight: 500;
margin-bottom: 30px;
}
.f_16{
font-weight: 500;
margin-top: 45px;
margin-bottom: 25px;
}
}
}
}
}

@ -1,75 +1,76 @@
<template>
<!-- 服装类型-->
<!-- 成衣推荐-->
<div class="chengyi">
<Header fontColor="#000"></Header>
<div class="main">
<div class="jz d-flex">
<el-menu
class="el-menu-vertical-demo"
@select="handleSelet"
style="width: 10%; min-width: 140px"
:unique-opened="true"
>
<el-submenu v-for="(item, i) in typeData" :key="i" :index="item.id">
<template slot="title">
<i class="el-icon-male"></i>
<span>{{ item.name }}</span>
</template>
<el-submenu v-for="(j, i2) in item.childrens" :key="i2" :index="j.id">
<template slot="title">{{ j.name }}</template>
<el-menu-item v-for="(k, i3) in j.childrens" :key="i3" :index="k.id">{{ k.name }}</el-menu-item>
</el-submenu>
</el-submenu>
</el-menu>
<div class="right">
<div class="name d-flex">
<span>{{this.current.name}}</span>
<div class="d-flex">
<el-dropdown @command="handleCommand">
<Header fontColor="#000"></Header>
<div class="main">
<div class="jz d-flex">
<el-menu
class="el-menu-vertical-demo"
@select="handleSelet"
style="width: 10%; min-width: 140px"
:unique-opened="true"
>
<el-submenu v-for="(item, i) in typeData" :key="i" :index="item.id">
<template slot="title">
<i class="el-icon-male"></i>
<span>{{ item.name }}</span>
</template>
<el-menu-item v-for="(j, i2) in item.childrens" :key="i2" :index="j.id">{{ j.name }}</el-menu-item>
<!-- <el-submenu v-for="(j, i2) in item.childrens" :key="i2" :index="j.id">-->
<!-- <template slot="title">{{ j.name }}</template>-->
<!-- <el-menu-item v-for="(k, i3) in j.childrens" :key="i3" :index="k.id">{{ k.name }}</el-menu-item>-->
<!-- </el-submenu>-->
</el-submenu>
</el-menu>
<div class="right">
<div class="name d-flex">
<span>{{this.current.name}}</span>
<div class="d-flex">
<el-dropdown @command="handleCommand">
<span class="el-dropdown-link">
排序<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="heat">热度</el-dropdown-item>
<!-- <el-dropdown-item command="esteem">评分</el-dropdown-item>-->
<el-dropdown-item command="high">价格降序</el-dropdown-item>
<el-dropdown-item command="low">价格升序</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!-- <div class="iconDiv d-flex">-->
<!-- <span>价格</span>-->
<!-- <div class="icon d-flex">-->
<!-- <i class="el-icon-arrow-up"></i>-->
<!-- <i class="el-icon-arrow-down"></i>-->
<!-- </div>-->
<!-- </div>-->
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="heat">热度</el-dropdown-item>
<!-- <el-dropdown-item command="esteem">评分</el-dropdown-item>-->
<el-dropdown-item command="high">价格降序</el-dropdown-item>
<el-dropdown-item command="low">价格升序</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!-- <div class="iconDiv d-flex">-->
<!-- <span>价格</span>-->
<!-- <div class="icon d-flex">-->
<!-- <i class="el-icon-arrow-up"></i>-->
<!-- <i class="el-icon-arrow-down"></i>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="clothDiv d-flex">
<div
class="item"
v-for="(item, index) in clothsList"
:key="index"
@click="clothDetails(item)"
>
<div class="imgDiv">
<img :src="item.imgUrl" alt="" />
</div>
<div class="clothTitle">
<p class="price d-flex">
<span class="f_16 c_333">{{ item.currentPrice }}</span>
<span class="f_12 c_999">{{ item.historicalPrice }}</span>
</p>
<p class="f_12 c_333">{{ item.title }}</p>
<p class="f_12 c_9a9b9b">热度{{ item.heat }}</p>
</div>
</div>
<div class="clothDiv d-flex">
<div
class="item"
v-for="(item, index) in clothsList"
:key="index"
@click="clothDetails(item)"
>
<div class="imgDiv">
<img :src="item.imgUrl" alt="" />
</div>
<div class="clothTitle">
<p class="price d-flex">
<span class="f_16 c_333">{{ item.currentPrice }}</span>
<span class="f_12 c_999">{{ item.historicalPrice }}</span>
</p>
<p class="f_12 c_333">{{ item.title }}</p>
<p class="f_12 c_9a9b9b">热度{{ item.heat }}</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
@ -195,82 +196,64 @@
name: "男装",
childrens: [
{
id: '11',
name: "上衣",
childrens: [
{
id: '111',
name: "衬衫",
},
{
id: '112',
name: "卫衣",
},
{
id: '113',
name: "Polo衫",
},
{
id: '114',
name: "针织衫",
},
],
},
{
id: '12',
name: "外套",
childrens: [
{
id: '121',
name: "夹克",
},
{
id: '122',
name: "羽绒服",
},
{
id: '123',
name: "风衣",
},
],
},
{
id: '13',
name: "裤子",
childrens: [
{
id: '131',
name: "休闲裤",
},
{
id: '132',
name: "西裤",
},
{
id: '133',
name: "工装裤",
},
{
id: '134',
name: "运动裤",
},
{
id: '135',
name: "卫裤",
},
{
id: '136',
name: "九分裤",
},
{
id: '137',
name: "短裤",
},
{
id: '138',
name: "哈伦裤",
},
],
id: '111',
name: "衬衫",
},
{
id: '112',
name: "卫衣",
},
{
id: '113',
name: "Polo衫",
},
{
id: '114',
name: "针织衫",
},
{
id: '121',
name: "夹克",
},
{
id: '122',
name: "羽绒服",
},
{
id: '123',
name: "风衣",
},
{
id: '131',
name: "休闲裤",
},
{
id: '132',
name: "西裤",
},
{
id: '133',
name: "工装裤",
},
{
id: '134',
name: "运动裤",
},
{
id: '135',
name: "卫裤",
},
{
id: '136',
name: "九分裤",
},
{
id: '137',
name: "短裤",
},
{
id: '138',
name: "哈伦裤",
},
],
},
@ -279,82 +262,130 @@
name: "女装",
childrens: [
{
id: '21',
name: "上衣",
childrens: [
{
id: '211',
name: "衬衫",
},
{
id: '212',
name: "卫衣",
},
{
id: '213',
name: "Polo衫",
},
{
id: '214',
name: "针织衫",
},
],
},
{
id: '22',
name: "外套",
childrens: [
{
id: '221',
name: "夹克",
},
{
id: '222',
name: "羽绒服",
},
{
id: '223',
name: "风衣",
},
],
},
{
id: '23',
name: "裤子",
childrens: [
{
id: '231',
name: "休闲裤",
},
{
id: '232',
name: "西裤",
},
{
id: '233',
name: "工装裤",
},
{
id: '234',
name: "运动裤",
},
{
id: '235',
name: "卫裤",
},
{
id: '236',
name: "九分裤",
},
{
id: '237',
name: "短裤",
},
{
id: '238',
name: "哈伦裤",
},
],
id: '211',
name: "衬衫",
},
{
id: '212',
name: "卫衣",
},
{
id: '213',
name: "Polo衫",
},
{
id: '214',
name: "针织衫",
},
{
id: '221',
name: "夹克",
},
{
id: '222',
name: "羽绒服",
},
{
id: '223',
name: "风衣",
},
{
id: '231',
name: "休闲裤",
},
{
id: '232',
name: "西裤",
},
{
id: '233',
name: "工装裤",
},
{
id: '234',
name: "运动裤",
},
{
id: '235',
name: "卫裤",
},
{
id: '236',
name: "九分裤",
},
{
id: '237',
name: "短裤",
},
{
id: '238',
name: "哈伦裤",
},
],
},
{
id: '3',
name: "童装",
childrens: [
{
id: '311',
name: "衬衫",
},
{
id: '312',
name: "卫衣",
},
{
id: '313',
name: "Polo衫",
},
{
id: '314',
name: "针织衫",
},
{
id: '321',
name: "夹克",
},
{
id: '322',
name: "羽绒服",
},
{
id: '323',
name: "风衣",
},
{
id: '331',
name: "休闲裤",
},
{
id: '332',
name: "西裤",
},
{
id: '333',
name: "工装裤",
},
{
id: '334',
name: "运动裤",
},
{
id: '335',
name: "卫裤",
},
{
id: '336',
name: "九分裤",
},
{
id: '337',
name: "短裤",
},
{
id: '338',
name: "哈伦裤",
},
],
},
@ -362,7 +393,8 @@
//
current:{
id:'',
name:''
name:'',
parrentName:''
}
};
},
@ -374,19 +406,24 @@
const indexb = this.typeData[indexa].childrens.findIndex((value, keys, arr) => {
return value.id == indexPath[1]
})
const indexc = this.typeData[indexa].childrens[indexb].childrens.findIndex((value, keys, arr) => {
return value.id == indexPath[2]
})
this.current.name = this.typeData[indexa].childrens[indexb].childrens[indexc].name
this.current.id = this.typeData[indexa].childrens[indexb].childrens[indexc].id
// const indexc = this.typeData[indexa].childrens[indexb].childrens.findIndex((value, keys, arr) => {
// return value.id == indexPath[2]
// })
// this.current.name = this.typeData[indexa].childrens[indexb].childrens[indexc].name
// this.current.id = this.typeData[indexa].childrens[indexb].childrens[indexc].id
this.current.name = this.typeData[indexa].childrens[indexb].name
this.current.id = this.typeData[indexa].childrens[indexb].id
this.current.parrentName = this.typeData[indexa].name
},
handleSelet(index,indexPath){
this.findIndex(indexPath)
//,this.current.id
// this.clothsList
},
clothDetails(item) {
this.$router.push({
path: "/shopping/ClothDetail",
query: { id: item.id, title: item.title },
query: { id: item.id, title: item.title ,name:this.current.name,parentName:this.current.parrentName},
});
},
handleCommand(command){
@ -396,8 +433,8 @@
else if(command == 'high'){//
this.clothsList.sort(compareDown("currentPrice"))
}
// else if(command == 'esteem'){//
// this.clothsList.sort(compare("heat"))
// else if(command == 'esteem'){//
// this.clothsList.sort(compare("heat"))
// }
else if(command == 'low'){//
@ -405,6 +442,11 @@
}
}
},
mounted() {
this.current.name = this.typeData[0].childrens[0].name
this.current.id = this.typeData[0].childrens[0].id
this.current.parrentName = this.typeData[0].name
}
}
</script>
<style scoped>

@ -75,6 +75,7 @@
</template>
<script>
import Header from '../components/Header/HeaderView'
import { httpAction, getAction } from '@/api/manage'
let compareDown = function (prop) {
return function (obj1, obj2) {
var val1 = obj1[prop];
@ -106,89 +107,12 @@
components: {Header},
data() {
return {
url: {
cd: "/zygoods/zyGoods/cd",
lxlist: "/zygoods/zyGoods/lxlist",
},
//
clothsList: [
{
id: 1,
imgUrl: require("../assets/cloth.png"),
currentPrice: 199,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3100,
},
{
id: 2,
imgUrl: require("../assets/cloth.png"),
currentPrice: 299,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3200,
},
{
id: 3,
imgUrl: require("../assets/cloth.png"),
currentPrice: 399,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3300,
},
{
id: 4,
imgUrl: require("../assets/cloth.png"),
currentPrice: 499,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3400,
},
{
id: 5,
imgUrl: require("../assets/cloth.png"),
currentPrice: 599,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3500,
},
{
id: 6,
imgUrl: require("../assets/cloth.png"),
currentPrice: 699,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3600,
},
{
id: 7,
imgUrl: require("../assets/cloth.png"),
currentPrice: 599,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3700,
},
{
id: 8,
imgUrl: require("../assets/cloth.png"),
currentPrice: 599,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3800,
},
{
id: 9,
imgUrl: require("../assets/cloth.png"),
currentPrice: 599,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat: 3900,
},
{
id: 10,
imgUrl: require("../assets/cloth.png"),
currentPrice: 599,
historicalPrice: 799,
title: "HOODIE 运动长袖连帽卫衣套头衫",
heat:4000,
},
],
clothsList: [],
//
typeData: [
{
@ -419,6 +343,13 @@
this.findIndex(indexPath)
//,this.current.id
// this.clothsList
getAction(this.url.lxlist,{typeid:indexPath[1]}).then((res1) => {
if (res1.success) {
this.clothsList = res1.result;
}else{
this.$message.error(res1.message);
}
});
},
clothDetails(item) {
this.$router.push({
@ -443,9 +374,23 @@
}
},
mounted() {
this.current.name = this.typeData[0].childrens[0].name
this.current.id = this.typeData[0].childrens[0].id
this.current.parrentName = this.typeData[0].name
getAction(this.url.cd).then((res) => {
if (res.success) {
this.typeData = res.result;
this.current.name = res.result[0].childrens[0].name
this.current.id = res.result[0].childrens[0].id
this.current.parrentName = res.result[0].name
getAction(this.url.lxlist,{typeid:res.result[0].childrens[0].id}).then((res1) => {
if (res1.success) {
this.clothsList = res1.result;
}else{
this.$message.error(res1.message);
}
});
}else{
this.$message.error(res.message);
}
});
}
}
</script>

@ -155,14 +155,16 @@
<div v-if="current == 3">
<PlaceOrder></PlaceOrder>
</div>
<Footer></Footer>
</div>
</template>
<script>
import Header from "../components/Header/HeaderView";
import Footer from "../components/Footer/FooterView";
import PlaceOrder from "../components/Order/placeOrder"
export default {
name: "sirendingzhi",
components: { Header ,PlaceOrder},
components: { Header ,PlaceOrder,Footer},
data() {
return {
current: 3,

@ -121,7 +121,9 @@
<a @click="jumpProcesses(record)">工序</a>
<a-divider type="vertical" />
<a @click="handleDetail(record)">模块</a>
<!-- <a @click="handleDetail(record)">模块</a>-->
<a @click="jumpModules(record)">模块</a>
<a-divider type="vertical" />
<a @click="jumpFabrics(record)">面料</a>
@ -335,7 +337,7 @@
deleteBatch: "/zyproduct/zyProduct/deleteBatch",
exportXlsUrl: "/zyproduct/zyProduct/exportXls",
importExcelUrl: "zyproduct/zyProduct/importExcel",
},
dictOptions:{},
superFieldList:[],
@ -366,14 +368,14 @@
});
},
//-
jumpModules(record)
{
jumpModules(record) {
this.$router.push({
path: '/src/views/product/productModule/ProductModuleList',
// query: { //
path: '/product/productModule/ProductModuleList',
query: { //
'productName': record.productName,
// 'pid': record.id,
// 'tname': record.name,
// }
}
});
},
//-

@ -158,6 +158,8 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/zygoods/zyGoods/zxdz","anon");
filterChainDefinitionMap.put("/zygoods/zyGoods/tjsp","anon");
filterChainDefinitionMap.put("/zygoods/zyGoods/fzlx","anon");
filterChainDefinitionMap.put("/zygoods/zyGoods/cd","anon");
filterChainDefinitionMap.put("/zygoods/zyGoods/lxlist","anon");
//filterChainDefinitionMap.put("/actTask/**", "anon");
//filterChainDefinitionMap.put("/actProcessIns/**", "anon");

@ -72,6 +72,18 @@ public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClo
return Result.OK(pageList);
}
/**
* 根据id拿到服装类型的类型名称
* getTypeNameById
*/
@AutoLog(value = "zy_cloths_type-分页列表查询")
@ApiOperation(value = "zy_cloths_type-分页列表查询", notes = "zy_cloths_type-分页列表查询")
@GetMapping(value = "/getTypeName")
public Result<?> getTypeNameById(@RequestParam(name = "id", required = true)String id){
ZyClothsType zyClothsType = zyClothsTypeService.getById(id);
return Result.OK(zyClothsType.getTypeName());
}
/**
* 添加
*

@ -51,15 +51,16 @@ public class ProductRecordController extends JeecgController<ProductRecord, IPro
@Autowired
private IProductRecordService productRecordService;
/**
* 分页列表查询
*
* @param productRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
/**
* 分页列表查询
*
* @param productRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "生产记录表-分页列表查询")
@ApiOperation(value="生产记录表-分页列表查询", notes="生产记录表-分页列表查询")
@GetMapping(value = "/list")

@ -32,66 +32,66 @@ import lombok.experimental.Accessors;
public class ProductRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
private java.lang.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;
/**更新人*/
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
private java.lang.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;
/**所属部门*/
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**工位*/
@Excel(name = "工位", width = 15, dictTable = "station", dicText = "station_name", dicCode = "id")
@Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
private java.lang.String sysOrgCode;
/**工位*/
@Excel(name = "工位", width = 15, dictTable = "station", dicText = "station_name", dicCode = "id")
@Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
@ApiModelProperty(value = "工位")
private String stationId;
/**工位*/
@Excel(name = "工位", width = 15)
private java.lang.String stationId;
/**工位*/
@Excel(name = "工位", width = 15)
@ApiModelProperty(value = "工位")
private String stationName;
/**工单编号*/
@Excel(name = "工单编号", width = 15, dictTable = "findgdbh", dicText = "order_id,order_code", dicCode = "id,orders_num")
@Dict(dictTable = "findgdbh", dicText = "order_id,order_code", dicCode = "id,orders_num")
private java.lang.String stationName;
/**工单编号*/
@Excel(name = "工单编号", width = 15)
@ApiModelProperty(value = "工单编号")
private String orderCode;
/**工单编号*/
@Excel(name = "工单编号", width = 15)
private java.lang.String orderCode;
/**工单编号*/
@Excel(name = "工单编号", width = 15, dictTable = "work_order", dicText = "product_code", dicCode = "id")
@Dict(dictTable = "work_order", dicText = "product_code", dicCode = "id")
@ApiModelProperty(value = "工单编号")
private String orderId;
/**生产开始时间*/
@Excel(name = "生产开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
private java.lang.String orderId;
/**生产开始时间*/
@Excel(name = "生产开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "生产开始时间")
private Date workTime;
/**生产结束时间*/
@Excel(name = "生产结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date workTime;
/**生产结束时间*/
@Excel(name = "生产结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "生产结束时间")
private Date offTime;
/**时长*/
@Excel(name = "时长", width = 15)
private java.util.Date offTime;
/**时长*/
@Excel(name = "时长", width = 15)
@ApiModelProperty(value = "时长")
private String duration;
/**状态*/
@Excel(name = "状态", width = 15, dicCode = "cgqzt")
@Dict(dicCode = "cgqzt")
private java.lang.String duration;
/**状态*/
@Excel(name = "状态", width = 15, dicCode = "cgqzt")
@Dict(dicCode = "cgqzt")
@ApiModelProperty(value = "状态")
private String status;
private java.lang.String status;
}

@ -71,6 +71,7 @@ public class Sensor implements Serializable {
private String sensorIp;
/**工位*/
@Excel(name = "工位", width = 15)
@Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
@ApiModelProperty(value = "工位")
private String stationId;
/**工位*/

@ -23,10 +23,7 @@ import org.jeecg.modules.demo.ordergoods.entity.OrderGoods;
import org.jeecg.modules.demo.ordergoods.service.IOrderGoodsService;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories;
import org.jeecg.modules.demo.zyaccessories.service.IZyStyleAccessoriesService;
import org.jeecg.modules.demo.zygoods.entity.Fzlx;
import org.jeecg.modules.demo.zygoods.entity.Tcsp;
import org.jeecg.modules.demo.zygoods.entity.Zxdz;
import org.jeecg.modules.demo.zygoods.entity.ZyGoods;
import org.jeecg.modules.demo.zygoods.entity.*;
import org.jeecg.modules.demo.zygoods.service.IZyGoodsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -526,26 +523,26 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
Page<ZyGoods> page = new Page<ZyGoods>(pageNo, pageSize);
IPage<ZyGoods> pageList = zyGoodsService.page(page, queryWrapper);
List<Fzlx> nfzlxList = new ArrayList<Fzlx>();
for(int i = 0 ; i < pageList.getRecords().size();i++){
for(int j = 0 ; j < pageList.getRecords().size();j++){
Fzlx fzlx = new Fzlx();
fzlx.setId(pageList.getRecords().get(i).getId());
fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.getRecords().get(i).getGoodsPicture());
fzlx.setTitle1(zyClothsTypeService.getById(pageList.getRecords().get(i).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageList.getRecords().get(i).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageList.getRecords().get(i).getStyleId()).getCharacteristic();
fzlx.setId(pageList.getRecords().get(j).getId());
fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.getRecords().get(j).getGoodsPicture());
fzlx.setTitle1(zyClothsTypeService.getById(pageList.getRecords().get(j).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageList.getRecords().get(j).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageList.getRecords().get(j).getStyleId()).getCharacteristic();
if(tag1.length()>7){
fzlx.setTag1(tag1.substring(0,7)+"...");
}else{
fzlx.setTag1(tag1);
}
String tag2 = zyClothsStyleService.getById(pageList.getRecords().get(i).getStyleId()).getStructure();
String tag2 = zyClothsStyleService.getById(pageList.getRecords().get(j).getStyleId()).getStructure();
if(tag2.length()>7){
fzlx.setTag2(tag2.substring(0,7)+"...");
}else{
fzlx.setTag2(tag2);
}
fzlx.setPrice(pageList.getRecords().get(i).getUnitPrice());
fzlx.setSold(pageList.getRecords().get(i).getNum());
fzlx.setPrice(pageList.getRecords().get(j).getUnitPrice());
fzlx.setSold(pageList.getRecords().get(j).getNum());
nfzlxList.add(fzlx);
}
map.put("nz",nfzlxList);
@ -558,8 +555,8 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
queryWrapperzlt2n.eq("type_id",zyClothsType2n.getId());
List<ZyClothsType> listzctn = zyClothsTypeService.list(queryWrapperzlt2n);
String idsn = "";
for (int i = 0 ; i < listzctn.size() ; i++){
idsn = idsn + listzctn.get(i).getId()+",";
for (int k = 0 ; k < listzctn.size() ; k++){
idsn = idsn + listzctn.get(k).getId()+",";
}
String [] strn = idsn.substring(0,idsn.length()-1).split(",");
QueryWrapper<ZyGoods> queryWrappern = QueryGenerator.initQueryWrapper(zyGoods, req.getParameterMap());
@ -567,26 +564,26 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
Page<ZyGoods> pagen = new Page<ZyGoods>(pageNo, pageSize);
IPage<ZyGoods> pageListn = zyGoodsService.page(pagen, queryWrappern);
List<Fzlx> nfzlxListn = new ArrayList<Fzlx>();
for(int i = 0 ; i < pageListn.getRecords().size();i++){
for(int l = 0 ; l < pageListn.getRecords().size();l++){
Fzlx fzlx = new Fzlx();
fzlx.setId(pageListn.getRecords().get(i).getId());
fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageListn.getRecords().get(i).getGoodsPicture());
fzlx.setTitle1(zyClothsTypeService.getById(pageListn.getRecords().get(i).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageListn.getRecords().get(i).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageListn.getRecords().get(i).getStyleId()).getCharacteristic();
fzlx.setId(pageListn.getRecords().get(l).getId());
fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageListn.getRecords().get(l).getGoodsPicture());
fzlx.setTitle1(zyClothsTypeService.getById(pageListn.getRecords().get(l).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageListn.getRecords().get(l).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageListn.getRecords().get(l).getStyleId()).getCharacteristic();
if(tag1.length()>7){
fzlx.setTag1(tag1.substring(0,7)+"...");
}else{
fzlx.setTag1(tag1);
}
String tag2 = zyClothsStyleService.getById(pageListn.getRecords().get(i).getStyleId()).getStructure();
String tag2 = zyClothsStyleService.getById(pageListn.getRecords().get(l).getStyleId()).getStructure();
if(tag2.length()>7){
fzlx.setTag2(tag2.substring(0,7)+"...");
}else{
fzlx.setTag2(tag2);
}
fzlx.setPrice(pageListn.getRecords().get(i).getUnitPrice());
fzlx.setSold(pageListn.getRecords().get(i).getNum());
fzlx.setPrice(pageListn.getRecords().get(l).getUnitPrice());
fzlx.setSold(pageListn.getRecords().get(l).getNum());
nfzlxListn.add(fzlx);
}
map.put("nvz",nfzlxListn);
@ -599,8 +596,8 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
queryWrapperzlt2t.eq("type_id",zyClothsType2t.getId());
List<ZyClothsType> listzctt = zyClothsTypeService.list(queryWrapperzlt2t);
String idst = "";
for (int i = 0 ; i < listzctt.size() ; i++){
idst = idst + listzctt.get(i).getId()+",";
for (int m = 0 ; m < listzctt.size() ; m++){
idst = idst + listzctt.get(m).getId()+",";
}
String [] strt = idst.substring(0,idst.length()-1).split(",");
QueryWrapper<ZyGoods> queryWrappert = QueryGenerator.initQueryWrapper(zyGoods, req.getParameterMap());
@ -608,30 +605,133 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
Page<ZyGoods> paget = new Page<ZyGoods>(pageNo, pageSize);
IPage<ZyGoods> pageListt = zyGoodsService.page(paget, queryWrappert);
List<Fzlx> nfzlxListt = new ArrayList<Fzlx>();
for(int i = 0 ; i < pageListt.getRecords().size();i++){
for(int n = 0 ; n < pageListt.getRecords().size();n++){
Fzlx fzlx = new Fzlx();
fzlx.setId(pageListt.getRecords().get(i).getId());
fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageListt.getRecords().get(i).getGoodsPicture());
fzlx.setTitle1(zyClothsTypeService.getById(pageListt.getRecords().get(i).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageListt.getRecords().get(i).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageListt.getRecords().get(i).getStyleId()).getCharacteristic();
fzlx.setId(pageListt.getRecords().get(n).getId());
fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageListt.getRecords().get(n).getGoodsPicture());
fzlx.setTitle1(zyClothsTypeService.getById(pageListt.getRecords().get(n).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageListt.getRecords().get(n).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageListt.getRecords().get(n).getStyleId()).getCharacteristic();
if(tag1.length()>7){
fzlx.setTag1(tag1.substring(0,7)+"...");
}else{
fzlx.setTag1(tag1);
}
String tag2 = zyClothsStyleService.getById(pageListt.getRecords().get(i).getStyleId()).getStructure();
String tag2 = zyClothsStyleService.getById(pageListt.getRecords().get(n).getStyleId()).getStructure();
if(tag2.length()>7){
fzlx.setTag2(tag2.substring(0,7)+"...");
}else{
fzlx.setTag2(tag2);
}
fzlx.setPrice(pageListt.getRecords().get(i).getUnitPrice());
fzlx.setSold(pageListt.getRecords().get(i).getNum());
fzlx.setPrice(pageListt.getRecords().get(n).getUnitPrice());
fzlx.setSold(pageListt.getRecords().get(n).getNum());
nfzlxListt.add(fzlx);
}
map.put("tz",nfzlxListt);
return Result.OK(map);
}
/**
* 商城接口服装类型菜单
*
* @param req
* @return
*/
@AutoLog(value = "类型菜单")
@ApiOperation(value="类型菜单", notes="类型菜单")
@GetMapping(value = "/cd")
public Result<?> cd(HttpServletRequest req) {
List<Map<String,Object>> maplist = new ArrayList<>();
//男装
ZyClothsType zyClothsType = new ZyClothsType();
QueryWrapper<ZyClothsType> queryWrapperzlt1 = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
queryWrapperzlt1.eq("type_name","男装");
ZyClothsType zyClothsType2 = zyClothsTypeService.getOne(queryWrapperzlt1);
Map<String,Object> map1 = new HashMap<>();
map1.put("id",zyClothsType2.getId());
map1.put("name",zyClothsType2.getTypeName());
//男装子类
QueryWrapper<ZyClothsType> queryWrapperzlt2 = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
queryWrapperzlt2.eq("type_id",zyClothsType2.getId());
List<ZyClothsType> listzct = zyClothsTypeService.list(queryWrapperzlt2);
List<Map<String,Object>> tcspList1 = new ArrayList<>();
for (int i = 0 ; i < listzct.size() ; i++){
Map<String,Object> map2 = new HashMap<>();
map2.put("id",listzct.get(i).getId());
map2.put("name",listzct.get(i).getTypeName());
tcspList1.add(map2);
}
map1.put("childrens",tcspList1);
maplist.add(map1);
//女装
ZyClothsType zyClothsTypen = new ZyClothsType();
QueryWrapper<ZyClothsType> queryWrapperzlt1n = QueryGenerator.initQueryWrapper(zyClothsTypen, req.getParameterMap());
queryWrapperzlt1n.eq("type_name","女装");
ZyClothsType zyClothsType2n = zyClothsTypeService.getOne(queryWrapperzlt1n);
Map<String,Object> mapnz = new HashMap<>();
mapnz.put("id",zyClothsType2n.getId());
mapnz.put("name",zyClothsType2n.getTypeName());
//女装子类
QueryWrapper<ZyClothsType> queryWrapperzlt2n = QueryGenerator.initQueryWrapper(zyClothsTypen, req.getParameterMap());
queryWrapperzlt2n.eq("type_id",zyClothsType2n.getId());
List<ZyClothsType> listzctn = zyClothsTypeService.list(queryWrapperzlt2n);
List<Map<String,Object>> tcspList2 = new ArrayList<>();
for (int j = 0 ; j < listzctn.size() ; j++){
Map<String,Object> map3 = new HashMap<>();
map3.put("id",listzctn.get(j).getId());
map3.put("name",listzctn.get(j).getTypeName());
tcspList2.add(map3);
}
mapnz.put("childrens",tcspList2);
maplist.add(mapnz);
//童装
ZyClothsType zyClothsTypet = new ZyClothsType();
QueryWrapper<ZyClothsType> queryWrapperzlt1t = QueryGenerator.initQueryWrapper(zyClothsTypet, req.getParameterMap());
queryWrapperzlt1t.eq("type_name","童装");
ZyClothsType zyClothsType2t = zyClothsTypeService.getOne(queryWrapperzlt1t);
Map<String,Object> maptz = new HashMap<>();
maptz.put("id",zyClothsType2t.getId());
maptz.put("name",zyClothsType2t.getTypeName());
//童装子类
QueryWrapper<ZyClothsType> queryWrapperzlt2t = QueryGenerator.initQueryWrapper(zyClothsTypet, req.getParameterMap());
queryWrapperzlt2t.eq("type_id",zyClothsType2t.getId());
List<ZyClothsType> listzctt = zyClothsTypeService.list(queryWrapperzlt2t);
List<Map<String,Object>> tcspList3 = new ArrayList<>();
for (int m = 0 ; m < listzctt.size() ; m++){
Map<String,Object> map4= new HashMap<>();
map4.put("id",listzctt.get(m).getId());
map4.put("name",listzctt.get(m).getTypeName());
tcspList3.add(map4);
}
maptz.put("childrens",tcspList3);
maplist.add(maptz);
return Result.OK(maplist);
}
/**
* 商城接口服装类型查询
*
* @param zyGoods
* @param req
* @return
*/
@AutoLog(value = "服装类型查询")
@ApiOperation(value="服装类型查询", notes="服装类型查询")
@GetMapping(value = "/lxlist")
public Result<?> lxlist(ZyGoods zyGoods,HttpServletRequest req,@RequestParam(name="typeid",required=true) String typeid) {
QueryWrapper<ZyGoods> queryWrapper = QueryGenerator.initQueryWrapper(zyGoods, req.getParameterMap());
queryWrapper.eq("cloths_type_id",typeid);
List<ZyGoods> pageList = zyGoodsService.list(queryWrapper);
List<FzlxSp> listsp = new ArrayList<>();
for (int i = 0 ; i < pageList.size() ; i++){
FzlxSp fzlxSp = new FzlxSp();
fzlxSp.setId(pageList.get(i).getId());
fzlxSp.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.get(i).getGoodsPicture());
fzlxSp.setCurrentPrice(pageList.get(i).getPromotionPrice());
fzlxSp.setHistoricalPrice(pageList.get(i).getUnitPrice());
fzlxSp.setTitle(pageList.get(i).getGoodsName());
fzlxSp.setHeat(pageList.get(i).getClick());
listsp.add(fzlxSp);
}
return Result.OK(listsp);
}
}

@ -0,0 +1,55 @@
package org.jeecg.modules.demo.zygoods.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: 2022-12-07
* @Version: V1.0
*/
@Data
public class FzlxSp implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**商品图片*/
@Excel(name = "商品图片", width = 15)
@ApiModelProperty(value = "商品图片")
private java.lang.String imgUrl;
/**折扣价*/
@Excel(name = "折扣价", width = 15)
@ApiModelProperty(value = "折扣价")
private java.lang.Double currentPrice;
/**单价*/
@Excel(name = "单价", width = 15)
@ApiModelProperty(value = "单价")
private java.lang.Double historicalPrice;
/**商品名称*/
@Excel(name = "商品名称", width = 15)
@ApiModelProperty(value = "商品名称")
private java.lang.String title;
/**热度*/
@Excel(name = "热度", width = 15)
@ApiModelProperty(value = "热度")
private java.lang.String heat;
}

@ -141,4 +141,9 @@ public class ZyGoods implements Serializable {
@Excel(name = "销售数量", width = 15)
@ApiModelProperty(value = "销售数量")
private java.lang.Integer num;
/**点击量*/
@Excel(name = "点击量", width = 15)
@ApiModelProperty(value = "点击量")
private java.lang.String click;
}

@ -63,9 +63,9 @@ public class ProductModule implements Serializable {
@ApiModelProperty(value = "款式模块id")
private String styleModuleId;
/**模块id*/
@Excel(name = "模块id", width = 15)
@Excel(name = "模块名称", width = 15)
@Dict(dictTable = "zy_cloths_modular ", dicText = "modular_name", dicCode = "id")
@ApiModelProperty(value = "模块id")
@ApiModelProperty(value = "模块名称")
private String moduleId;
/**部位*/
@Excel(name = "部位", width = 15)

Loading…
Cancel
Save