Merge remote-tracking branch 'origin/master'

zhc4dev
暖暖 2 years ago
commit 9206500097
  1. 3
      ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue
  2. 2
      ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue
  3. 13
      ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue
  4. 5
      ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue
  5. 279
      ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressList1.vue
  6. 61
      ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressModal1.vue
  7. 57
      ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue
  8. 45
      ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue
  9. 45
      ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue
  10. 49
      ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue
  11. 33
      ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue
  12. 291
      ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue
  13. 38
      ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
  14. 27
      ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue
  15. 9
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
  16. 3
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
  17. 61
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/controller/CustomerReceivingAddressController.java
  18. 18
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/mapper/CustomerReceivingAddressMapper.java
  19. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/ICustomerReceivingAddressService.java
  20. 35
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/impl/CustomerReceivingAddressServiceImpl.java
  21. 37
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java
  22. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java
  23. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java
  24. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java
  25. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
  26. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanAccessories.java
  27. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanFabric.java
  28. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/IZyPlanProcessService.java
  29. 99
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java

@ -203,8 +203,7 @@
}
],
url: {
up: "/customerpayment/customerPayment/up",
down: "/customerpayment/customerPayment/down",
list: "/customerpayment/customerPayment/list",
delete: "/customerpayment/customerPayment/delete",
deleteBatch: "/customerpayment/customerPayment/deleteBatch",

@ -194,6 +194,8 @@
}
],
url: {
up: "/customerpayment/customerPayment/up",
down: "/customerpayment/customerPayment/down",
list: "/customerpayment/customerPayment/list1",
delete: "/customerpayment/customerPayment/delete",
deleteBatch: "/customerpayment/customerPayment/deleteBatch",

@ -98,6 +98,8 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="paixu(record)">排序</a>
<a-divider type="vertical" />
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
@ -119,7 +121,7 @@
</a-table>
</div>
<customer-receiving-address-modal1 ref="modalFormpaixu" @ok="modalFormOk"></customer-receiving-address-modal1>
<customer-receiving-address-modal ref="modalForm" @ok="modalFormOk"></customer-receiving-address-modal>
</a-card>
</template>
@ -130,6 +132,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CustomerReceivingAddressModal from './modules/CustomerReceivingAddressModal'
import CustomerReceivingAddressModal1 from './modules/CustomerReceivingAddressModal1'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import Area from '@/components/_util/Area'
@ -137,7 +140,8 @@
name: 'CustomerReceivingAddressList',
mixins:[JeecgListMixin, mixinDevice],
components: {
CustomerReceivingAddressModal
CustomerReceivingAddressModal,
CustomerReceivingAddressModal1
},
data () {
return {
@ -227,6 +231,11 @@
},
},
methods: {
paixu: function (record) {
this.$refs.modalFormpaixu.edit(record.userId);
this.$refs.modalFormpaixu.title = record.userId_dictText+"测体管理";
this.$refs.modalFormpaixu.disableSubmit = false;
},
getPcaText(code){
return this.pcaData.getText(code);
},

@ -121,10 +121,7 @@
{ required: false},
{ validator: (rule, value, callback) => validateDuplicateValue('customer_receiving_address', 'sort', value, this.model.id, callback)},
],
labelcl: [
{ required: false},
{ validator: (rule, value, callback) => validateDuplicateValue('customer_receiving_address', 'labelcl', value, this.model.id, callback)},
],
},
url: {
add: "/customerreceivingaddress/customerReceivingAddress/add",

@ -0,0 +1,279 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户">
<j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="收货人">
<a-input placeholder="请输入收货人" v-model="queryParam.receiver"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="联系电话">
<a-input placeholder="请输入联系电话" v-model="queryParam.mobile"></a-input>
</a-form-item>
</a-col>
</template>-->
<!--<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>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>-->
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<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>
&lt;!&ndash; 高级查询区域 &ndash;&gt;
<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>-->
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="pcaSlot" slot-scope="text">
<div>{{ getPcaText(text) }}</div>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="up(record.id)">升序</a>
<a-divider type="vertical" />
<a @click="down(record.id)">降序</a>
<a-divider type="vertical" />
<a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</span>
</a-table>
</div>
<customer-receiving-address-modal ref="modalForm" @ok="modalFormOk"></customer-receiving-address-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CustomerReceivingAddressModal from './CustomerReceivingAddressModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import Area from '@/components/_util/Area'
export default {
name: 'CustomerReceivingAddressList1',
mixins:[JeecgListMixin, mixinDevice],
components: {
CustomerReceivingAddressModal
},
data () {
return {
description: '顾客地址表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'用户',
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'城市',
align:"center",
dataIndex: 'cityId',
scopedSlots: {customRender: 'pcaSlot'}
},
{
title:'地址',
align:"center",
dataIndex: 'address'
},
{
title:'邮编',
align:"center",
dataIndex: 'zipCode'
},
{
title:'收货人',
align:"center",
dataIndex: 'receiver'
},
{
title:'联系电话',
align:"center",
dataIndex: 'mobile'
},
{
title:'排序',
align:"center",
dataIndex: 'sort'
},
{
title:'标识',
align:"center",
dataIndex: 'labelcl_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
up: "/customerreceivingaddress/customerReceivingAddress/up",
down: "/customerreceivingaddress/customerReceivingAddress/down",
list: "/customerreceivingaddress/customerReceivingAddress/list1",
delete: "/customerreceivingaddress/customerReceivingAddress/delete",
deleteBatch: "/customerreceivingaddress/customerReceivingAddress/deleteBatch",
exportXlsUrl: "/customerreceivingaddress/customerReceivingAddress/exportXls",
importExcelUrl: "customerreceivingaddress/customerReceivingAddress/importExcel",
},
dictOptions:{},
pcaData:'',
superFieldList:[],
}
},
created() {
this.pcaData = new Area()
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
edit (id) {
console.log("+++++++++")
console.log("========================================")
/*this.queryParam.userId=this.id;*/
this.queryParam.userId=id,
this.url.list='/customerreceivingaddress/customerReceivingAddress/list1'
this.loadData();
this.visible = true;
},
up(id){
getAction(this.url.up,{id:id}).then((res)=>{
if(res.success){
this.loadData();
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
})},
down(id){
getAction(this.url.down,{id:id}).then((res)=>{
if(res.success){
this.loadData();
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
})},
getPcaText(code){
return this.pcaData.getText(code);
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
fieldList.push({type:'popup',value:'usernamme',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
fieldList.push({type:'pca',value:'cityId',text:'城市'})
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
fieldList.push({type:'string',value:'zipCode',text:'邮编',dictCode:''})
fieldList.push({type:'string',value:'receiver',text:'收货人',dictCode:''})
fieldList.push({type:'string',value:'mobile',text:'联系电话',dictCode:''})
fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
fieldList.push({type:'string',value:'labelcl',text:'标识',dictCode:'shdzbs'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,61 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<customer-receiving-address-list1 ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-receiving-address-list1>
</j-modal>
</template>
<script>
import CustomerReceivingAddressList1 from './CustomerReceivingAddressList1'
export default {
name: 'CustomerReceivingAddressModal1',
components: {
CustomerReceivingAddressList1
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -112,7 +112,15 @@
下载
</a-button>
</template>
<template slot="mk" slot-scope="text, record">
<a @click="goodsModule(record)">管理</a>
</template>
<template slot="ml" slot-scope="text, record">
<a @click="goodsModule2(record)">管理</a>
</template>
<template slot="fl" slot-scope="text, record">
<a @click="goodsModule3(record)">管理</a>
</template>
<span slot="action" slot-scope="text, record">
<!--<a @click="handleEdit(record)">编辑</a>-->
<a @click="handleDetail(record)">详情</a>
@ -279,6 +287,21 @@
align:"center",
dataIndex: 'payTotalPrice'
},
{
title: '订单商品模块',
align: "center",
scopedSlots: {customRender: 'mk'}
},
{
title: '订单商品面料',
align: "center",
scopedSlots: {customRender: 'ml'}
},
{
title: '订单商品辅料',
align: "center",
scopedSlots: {customRender: 'fl'}
},
{
title: '操作',
dataIndex: 'action',
@ -289,7 +312,7 @@
}
],
url: {
list: "/ordergoods/orderGoods/list",
list: "/ordergoods/orderGoods/list?orderid="+this.$route.query.orderid+"&ischild="+this.$route.query.ischild,
delete: "/ordergoods/orderGoods/delete",
deleteBatch: "/ordergoods/orderGoods/deleteBatch",
exportXlsUrl: "/ordergoods/orderGoods/exportXls",
@ -309,6 +332,36 @@
},
},
methods: {
goodsModule(record)
{
this.$router.push({
path: '/ordergoodsmodule/OrderGoodsModuleList',
query: { //
'ordergoodsid': record.id,
'goodsname':record.goodsName,
}
});
},
goodsModule2(record)
{
this.$router.push({
path: '/ordergoodsfabric/OrderGoodsFabricList',
query: { //
'ordergoodsid': record.id,
'goodsname':record.goodsName,
}
});
},
goodsModule3(record)
{
this.$router.push({
path: '/ordergoodsaccessories/OrderGoodsAccessoriesList',
query: { //
'ordergoodsid': record.id,
'goodsname':record.goodsName,
}
});
},
initDictConfig(){
},
getSuperFieldList(){

@ -1,34 +1,19 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="订单商品">
<j-dict-select-tag placeholder="请选择订单商品" v-model="queryParam.orderGoodsId" dictCode="order_goods,goods_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商品">
<j-dict-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dictCode="zy_goods,goods_name,id"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="辅料">
<j-dict-select-tag placeholder="请选择辅料" v-model="queryParam.accessoriesId" dictCode="zy_accessories,contents,id"/>
</a-form-item>
</a-col>
</template>
<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>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
@ -38,18 +23,12 @@
<!-- 操作按钮区域 -->
<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>
</div>
@ -95,22 +74,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
<a @click="handleDetail(record)">详情</a>
</span>
</a-table>
@ -174,12 +138,12 @@
}
],
url: {
list: "/ordergoodsaccessories/orderGoodsAccessories/list",
list: "/ordergoodsaccessories/orderGoodsAccessories/list?ordergoodsid="+this.$route.query.ordergoodsid,
delete: "/ordergoodsaccessories/orderGoodsAccessories/delete",
deleteBatch: "/ordergoodsaccessories/orderGoodsAccessories/deleteBatch",
exportXlsUrl: "/ordergoodsaccessories/orderGoodsAccessories/exportXls",
importExcelUrl: "ordergoodsaccessories/orderGoodsAccessories/importExcel",
},
dictOptions:{},
superFieldList:[],
@ -187,6 +151,7 @@
},
created() {
this.getSuperFieldList();
this.biaoTi = this.$route.query.goodsname+"订单商品辅料管理";
},
computed: {
importExcelUrl: function(){

@ -1,34 +1,19 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="订单商品">
<j-dict-select-tag placeholder="请选择订单商品" v-model="queryParam.orderGoodsId" dictCode="order_goods,goods_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商品">
<j-dict-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dictCode="zy_goods,goods_name,id"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="面料">
<j-dict-select-tag placeholder="请选择面料" v-model="queryParam.fabricId" dictCode="zy_fabric,name,id"/>
</a-form-item>
</a-col>
</template>
<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>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
@ -38,18 +23,12 @@
<!-- 操作按钮区域 -->
<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>
</div>
@ -95,22 +74,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
<a @click="handleDetail(record)">详情</a>
</span>
</a-table>
@ -174,12 +138,12 @@
}
],
url: {
list: "/ordergoodsfabric/orderGoodsFabric/list",
list: "/ordergoodsfabric/orderGoodsFabric/list?ordergoodsid="+this.$route.query.ordergoodsid,
delete: "/ordergoodsfabric/orderGoodsFabric/delete",
deleteBatch: "/ordergoodsfabric/orderGoodsFabric/deleteBatch",
exportXlsUrl: "/ordergoodsfabric/orderGoodsFabric/exportXls",
importExcelUrl: "ordergoodsfabric/orderGoodsFabric/importExcel",
},
dictOptions:{},
superFieldList:[],
@ -187,6 +151,7 @@
},
created() {
this.getSuperFieldList();
this.biaoTi = this.$route.query.goodsname+"订单商品面料管理";
},
computed: {
importExcelUrl: function(){

@ -1,44 +1,24 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="订单商品">
<j-dict-select-tag placeholder="请选择订单商品" v-model="queryParam.orderGoodsId" dictCode="order_goods,goods_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商品">
<j-dict-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dictCode="zy_goods,goods_name,id"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="款式">
<j-dict-select-tag placeholder="请选择款式" v-model="queryParam.styleId" dictCode="zy_cloths_style,style_names,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :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="请选择模块" v-model="queryParam.moduleId" dictCode="zy_cloths_modular ,modular_name,id"/>
</a-form-item>
</a-col>
</template>
<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>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
@ -48,18 +28,12 @@
<!-- 操作按钮区域 -->
<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>
</div>
@ -105,22 +79,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
<a @click="handleDetail(record)">详情</a>
</span>
</a-table>
@ -148,6 +107,7 @@
return {
description: '订单商品模块表管理页面',
//
biaoTi: '',
columns: [
{
title: '#',
@ -189,7 +149,7 @@
}
],
url: {
list: "/ordergoodsmodule/orderGoodsModule/list",
list: "/ordergoodsmodule/orderGoodsModule/list?ordergoodsid="+this.$route.query.ordergoodsid,
delete: "/ordergoodsmodule/orderGoodsModule/delete",
deleteBatch: "/ordergoodsmodule/orderGoodsModule/deleteBatch",
exportXlsUrl: "/ordergoodsmodule/orderGoodsModule/exportXls",
@ -202,6 +162,7 @@
},
created() {
this.getSuperFieldList();
this.biaoTi = this.$route.query.goodsname+"订单商品模块管理";
},
computed: {
importExcelUrl: function(){

@ -51,9 +51,9 @@
<a-button type="primary" icon="plus-circle" @click="autoFilling()">自动排位</a-button>
<a-button type="primary" icon="plus-circle" @click="createMaterialBill()">生成物料单
</a-button>
<a-button type="primary" icon="unordered-list" @click="viewMaterialBill()">查看物料单(计划面料&计划辅料)
<a-button type="primary" icon="unordered-list" @click="viewMaterialBill()">查看物料单
</a-button>
<a-button type="primary" icon="unordered-list" @click="viewMaterialBill()">发送到仓库
<a-button type="primary" icon="redo" @click="sendToRepository()">发送到仓库
</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('计划工序')">导出</a-button>
<a-button type="primary" icon="rollback" @click="fanHui()">返回</a-button>
@ -205,6 +205,7 @@ export default {
syncProductProcess: "/org.jeecg.modules.productplan/zyPlanProcess/syncProductProcess",
autoFilling: "/org.jeecg.modules.productplan/zyPlanProcess/autoFilling",
createMaterialBill: "/org.jeecg.modules.productplan/zyPlanProcess/createMaterialBill",
sendToRepository: "/org.jeecg.modules.productplan/zyPlanProcess/sendToRepository",
stationToolslist: "/stationTool/list2",
stationMachinelist: "/stationMachine/list2",
addProcessBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addProcessBatch",
@ -351,9 +352,30 @@ export default {
},
//
viewMaterialBill(props) {
// alert("deatil row id:"+props.row.id);
this.$refs.zyPlanProcessDataDetail.showModal(props.row.id)
viewMaterialBill() {
// alert("deatil this.planId:"+this.planId);
// this.$refs.zyPlanProcessDataDetail.showModal(this.planId)
this.$router.push({
path: '/productplan/ZyPlanWuLiaoDataDetail',
query: { //
'planId': this.planId,
},
});
},
//
sendToRepository(){
this.loading = true;
getAction(this.url.sendToRepository, {"planId": this.planId}).then((res) => {
if (res.success) {
this.$message.success("操作成功");
this.loadData();
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
},
//
@ -361,7 +383,6 @@ export default {
// debugger;
if (this.loadRouteType === false) {
this.planId = this.$route.query.planId;
// this.biaoTi = this.$route.query.styleNames+"";
console.log("*******传递的planId:" + this.planId)
this.loadRouteType = true;
}

@ -0,0 +1,291 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333; padding-left: 30% ">{{ planInfo.productCode }}生产计划物料单</p>
<template>
<div>
<el-descriptions border :column='4'>
<el-descriptions-item label="工单编号 ">{{ planInfo.productCode }}</el-descriptions-item>
<el-descriptions-item label="生产企业">{{ planInfo.productOrg }}</el-descriptions-item>
<!-- <el-descriptions-item label="企业负责人 ">admin</el-descriptions-item>-->
<el-descriptions-item label="车间 ">{{ planInfo.workshop }}</el-descriptions-item>
<!-- <el-descriptions-item label="车间负责人 ">admin</el-descriptions-item>-->
<el-descriptions-item label="班组">{{ planInfo.team }}</el-descriptions-item>
<el-descriptions-item label="班组长">{{ planInfo.teamLade }}</el-descriptions-item>
<!-- <el-descriptions-item label="产品类型">{{ planInfo.productType }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="产品编号">{{ planInfo.productNo }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="产品名称">{{ planInfo.productName }}</el-descriptions-item>-->
<el-descriptions-item label="开始时间">{{ planInfo.workTime }}</el-descriptions-item>
<el-descriptions-item label="生产时长(天)">{{ planInfo.duration }}</el-descriptions-item>
<el-descriptions-item label="生产状态">{{ planInfo.status }}</el-descriptions-item>
<el-descriptions-item label="加急">{{ planInfo.speedUp }}</el-descriptions-item>
<!-- <el-descriptions-item label="销售企业">{{ planInfo.salesEnterprise }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="订货期">{{ planInfo.orderTime }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="制定人">100</el-descriptions-item>-->
<!-- <el-descriptions-item label="制定时间">100</el-descriptions-item>-->
<el-descriptions-item label="审核人">{{ planInfo.auditBy }}</el-descriptions-item>
<el-descriptions-item label="审核时间">{{ planInfo.auditTimr }}</el-descriptions-item>
</el-descriptions>
</div>
</template>
<!-- 查询区域-END -->
<div class="table-operator">
<a-button type="primary" icon="download" @click="handleExportXls('计划面料')">导出</a-button>
<a-button type="primary" @click="fanHui()">返回</a-button>
</div>
<!-- table区域-begin -->
<div>
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:20px auto 0">计划面料清单</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered
rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">计划辅料清单</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns2" :data-source="data2"
rowKey="id"
bordered :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">工序面料清单</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns3" :data-source="data3"
rowKey="id" bordered :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">工序辅料清单</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns4" :data-source="data4"
rowKey="id" bordered :pagination="false">
</a-table>
</a-spin>
<!-- </a-modal>-->
</div>
</a-card>
</template>
<script>
import {getAction} from "@api/manage";
import {mixinDevice} from '@/utils/mixin'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {filterObj} from "@/utils/util";
const columns1 = [
{
title: '计划ID',
align: "center",
dataIndex: 'planId'
},
{
title: '面料',
align: "center",
dataIndex: 'fabricName'
},
{
title: '用量(合计)',
align: "center",
dataIndex: 'amount'
},
];
const columns2 = [
{
title: '计划ID',
align: "center",
dataIndex: 'planId'
},
{
title: '辅料',
align: "center",
dataIndex: 'accessoriesName'
},
{
title: '用量(合计)',
align: "center",
dataIndex: 'amount'
},
];
const columns3 = [
// {
// title:'ID',
// align:"center",
// dataIndex: 'planId'
// },
{
title: '计划工序ID',
align: "center",
dataIndex: 'planProcessId'
},
{
title: '面料',
align: "center",
dataIndex: 'fabricName'
},
{
title: '用量',
align: "center",
dataIndex: 'amount'
},
];
const columns4 = [
// {
// title: 'ID',
// align: "center",
// dataIndex: 'planId'
// },
{
title: '计划工序ID',
align: "center",
dataIndex: 'planProcessId'
},
{
title: '辅料',
align: "center",
dataIndex: 'accessoriesName'
},
{
title: '用量',
align: "center",
dataIndex: 'amount'
},
];
export default {
name: "ZyStyleModelListDetails",
mixins: [JeecgListMixin, mixinDevice],
data() {
return {
data: [],
visible: false,
model: {},
confirmLoading: true,
//
data1: [],
columns1,
//
data2: [],
columns2,
//
data3: [],
columns3,
//
columns4,
data4: [],
planInfo: {},
wuLiaoInfo: {},
id: '',
planId: '',
loadRouteType: false,
url: {
list: "/org.jeecg.modules.productplan/zyPlanProcess/list",
getPlanInfo: "/org.jeecg.modules.productplan/zyPlanProcess/getPlanInfo",
getWuLiaoDetail: "/org.jeecg.modules.productplan/zyPlanProcess/getWuLiaoDetail",
exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls",
},
}
},
created() {
this.confirmLoading = false;
this.visible = true;
this.loadParameter();
this.getPlanInfo(this.planId);
this.getWuLiaoDetail(this.planId);
},
methods: {
fanHui(record) {
this.$router.push({
path: '/productplan/ProductplanManage',
query: { //
'planId': this.planId,
},
});
},
getQueryParams(){
var param = Object.assign({}, this.queryParam);
// delete param.createTimeRange; //
return filterObj(param);
},
getWuLiaoDetail(planId) {
getAction(this.url.getWuLiaoDetail, {"planId": planId}).then((res) => {
if (res.success) {
this.wuLiaoInfo = res.result.records || res.result;
// console.log("wuLiaoInfo------------:" + JSON.stringify(this.wuLiaoInfo));
this.data1 = this.wuLiaoInfo.fabricList
this.data2 = this.wuLiaoInfo.accessoriesList
this.data3 = this.wuLiaoInfo.processFabricList
this.data4 = this.wuLiaoInfo.processAccessoriesList
// console.log("data1------------:" + JSON.stringify(this.data1));
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
},
getPlanInfo(planId) {
getAction(this.url.getPlanInfo, {"planId": planId}).then((res) => {
if (res.success) {
this.planInfo = res.result.records || res.result;
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
},
//
loadParameter() {
if (this.loadRouteType === false) {
this.planId = this.$route.query.planId;
console.log("*******传递的planId:" + this.planId)
this.loadRouteType = true;
}
},
// showModal(id) {
// this.visible = true;
// this.id = id
// this.getDetailData()
// },
// getDetailData() {
// getAction(this.url.detail, {id: this.id}).then((res) => {
// if (res.success) {
// this.data = res.result.records || res.result.records;
// console.log("data------------:" + JSON.stringify(this.data));
// } else {
// this.$message.warning(res.message)
// }
// }).finally(() => {
// this.confirmLoading = false
// })
// },
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false;
},
},
}
</script>
<style scoped>
.table {
border-color: #d9d9d9;
border-radius: 3px
}
.table td {
padding: 10px 20px;
max-width: 380px;
}
.table td span {
color: #333
}
</style>

@ -8,44 +8,6 @@
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<!-- <table border="1" style="width: 98%;font-size:14px;margin:30px auto 0" class="table">-->
<!-- <tr>-->
<!-- <td><span>款式名称</span>tttt</td>-->
<!-- <td><span>款式编号</span>QIYE80301100000130</td>-->
<!-- <td><span>款式规格</span>123</td>-->
<!-- <td><span>款式形式</span>预制</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>企业</span>黄淮服装智能制造中心</td>-->
<!-- <td><span>款式创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 模块&ndash;&gt;-->
<!-- <td><span>服装类型</span>tttt</td>-->
<!-- <td><span>模块编号</span>QIYE80301100000130</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>模块名称</span>2</td>-->
<!-- <td><span>模块创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 面料&ndash;&gt;-->
<!-- <td><span>面料编号</span>2</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>面料创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 辅料&ndash;&gt;-->
<!-- <td><span>辅料名称</span>2A01</td>-->
<!-- <td><span>辅料创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 工序&ndash;&gt;-->
<!-- <td><span>工序名称</span>2A01</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>工序创建时间</span>2022-12-06 10:02:59</td>-->
<!-- <td><span>面料编号</span>2</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- </tr>-->
<!-- </table>-->
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:0px auto">款式详情</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered

@ -141,6 +141,8 @@
<a-divider type="vertical" />
<a @click="shengchan(record)">生产</a>
<a-divider type="vertical" />
<a @click="shangpin(record)">商品</a>
<a-divider type="vertical" />
<!-- <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />-->
<a @click="handleDetail(record)">详情</a>
@ -188,6 +190,14 @@
return parseInt(index)+1;
}
},
{
title:'下单时间',
align:"center",
dataIndex: 'orderTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'是否子单',
align:"center",
@ -198,14 +208,6 @@
align:"center",
dataIndex: 'orderId_dictText'
},
{
title:'下单时间',
align:"center",
dataIndex: 'orderTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'订单编号',
align:"center",
@ -424,6 +426,15 @@
}
},
shangpin(record){
this.$router.push({
path: '/ordergoods/OrderGoodsList',
query: { //
'orderid': record.id,
'ischild':record.ischild,
}
});
},
getPcaText(code){
return this.pcaData.getText(code);
},

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.base.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -24,6 +25,7 @@ import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Description: zy_cloths_type
@ -147,6 +149,13 @@ public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClo
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
zyClothsTypeService.removeById(id);
//如果这是父级 连带子集一起删除
String parentId = zyClothsTypeMapper.getParentId(id);
if (StringUtils.isEmpty(parentId)){
List<ZyClothsType> zyClothsTypeList = zyClothsTypeService.list(new LambdaQueryWrapper<ZyClothsType>().eq(ZyClothsType::getTypeId,id));
List<String> collect = zyClothsTypeList.stream().map(ZyClothsType::getId).collect(Collectors.toList());
zyClothsTypeService.removeByIds(collect);
}
return Result.OK("删除成功!");
}

@ -43,4 +43,7 @@ public interface ZyClothsTypeMapper extends BaseMapper<ZyClothsType> {
/**根据type_id拿到类型名称*/
@Select("select type_name from zy_cloths_type where id = #{id} ")
String getNameByTypeId(String id);
@Select("select type_id from zy_cloths_type where id = #{id} ")
String getParentId(String id);
}

@ -49,7 +49,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class CustomerReceivingAddressController extends JeecgController<CustomerReceivingAddress, ICustomerReceivingAddressService> {
@Autowired
private ICustomerReceivingAddressService customerReceivingAddressService;
/**
* 分页列表查询
*
@ -71,7 +71,33 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
IPage<CustomerReceivingAddress> pageList = customerReceivingAddressService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param customerReceivingAddress
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "顾客地址表-分页列表查询")
@ApiOperation(value="顾客地址表-分页列表查询", notes="顾客地址表-分页列表查询")
@GetMapping(value = "/list1")
public Result<?> queryPageList1(CustomerReceivingAddress customerReceivingAddress,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CustomerReceivingAddress> queryWrapper = QueryGenerator.initQueryWrapper(customerReceivingAddress, req.getParameterMap());
System.out.println(customerReceivingAddress.getUserId());
queryWrapper.eq("user_id",customerReceivingAddress.getUserId());
Page<CustomerReceivingAddress> page = new Page<CustomerReceivingAddress>(pageNo, pageSize);
IPage<CustomerReceivingAddress> pageList = customerReceivingAddressService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
@ -89,7 +115,7 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
return Result.OK("添加成功!");
}
}
/**
* 编辑
*
@ -107,7 +133,7 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
return Result.OK("编辑成功!");
}
}
/**
* 通过id删除
*
@ -121,7 +147,7 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
customerReceivingAddressService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -135,7 +161,7 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
this.customerReceivingAddressService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
@ -176,4 +202,27 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
return super.importExcel(request, response, CustomerReceivingAddress.class);
}
@AutoLog(value = "排序")
@ApiOperation(value="排序", notes="排序")
@GetMapping(value = "/up")
public Result<?> shang(@RequestParam(name="id",required=true) String id) {
customerReceivingAddressService.up(id);
return Result.ok("升序成功");
}
@AutoLog(value = "排序")
@ApiOperation(value="排序", notes="排序")
@GetMapping(value = "/down")
public Result<?> xia(@RequestParam(name="id",required=true) String id) {
int a=customerReceivingAddressService.findSort(id);
if(a==0){
return Result.error("当前已经是最低级别!!!");}else {
customerReceivingAddressService.down(id);
return Result.ok("降序成功");
}
}
}

@ -3,6 +3,8 @@ package org.jeecg.modules.demo.customerreceivingaddress.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.demo.customerreceivingaddress.entity.CustomerReceivingAddress;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +16,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface CustomerReceivingAddressMapper extends BaseMapper<CustomerReceivingAddress> {
@Select("select sort from customer_receiving_address where id=#{id} ")
Integer upfindsort(String id);
@Select("select id from customer_receiving_address where sort=#{i} ")
String findproid(int i);
@Update("update customer_receiving_address set sort =#{i} where id = #{id} ")
void innew(String id, int i);
@Update("update customer_receiving_address set sort =#{sort} where id = #{proid} ")
void innewpro(String proid, Integer sort);
@Select("select sort from customer_receiving_address where id=#{id} ")
int findSort(String id);
}

@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ICustomerReceivingAddressService extends IService<CustomerReceivingAddress> {
void up(String id);
int findSort(String id);
void down(String id);
}

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.customerreceivingaddress.service.impl;
import org.jeecg.modules.demo.customerreceivingaddress.entity.CustomerReceivingAddress;
import org.jeecg.modules.demo.customerreceivingaddress.mapper.CustomerReceivingAddressMapper;
import org.jeecg.modules.demo.customerreceivingaddress.service.ICustomerReceivingAddressService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -16,4 +17,38 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class CustomerReceivingAddressServiceImpl extends ServiceImpl<CustomerReceivingAddressMapper, CustomerReceivingAddress> implements ICustomerReceivingAddressService {
@Autowired
CustomerReceivingAddressMapper customerReceivingAddressMapper;
@Override
public void up(String id) {
Integer sort = customerReceivingAddressMapper.upfindsort(id);
if (sort>0) {
//升序前找到后一个排序
String proid = customerReceivingAddressMapper.findproid(sort + 1);
if (proid!="") {
//调换排序
customerReceivingAddressMapper.innew(id,sort+1);
customerReceivingAddressMapper.innewpro(proid,sort);
}
}
}
@Override
public int findSort(String id) {
return customerReceivingAddressMapper.findSort(id);
}
@Override
public void down(String id) {
Integer sort = customerReceivingAddressMapper.upfindsort(id);
if (sort>0) {
String proid = customerReceivingAddressMapper.findproid(sort - 1);
if (proid!="") {
customerReceivingAddressMapper.innew(id,sort-1);
customerReceivingAddressMapper.innewpro(proid,sort);
}
}
}
}

@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
import org.jeecg.modules.demo.zyorders.service.IZyOrdersService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@ -49,6 +51,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class OrderGoodsController extends JeecgController<OrderGoods, IOrderGoodsService> {
@Autowired
private IOrderGoodsService orderGoodsService;
@Autowired
private IZyOrdersService zyOrdersService;
/**
* 分页列表查询
@ -65,11 +69,34 @@ public class OrderGoodsController extends JeecgController<OrderGoods, IOrderGood
public Result<?> queryPageList(OrderGoods orderGoods,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<OrderGoods> queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap());
Page<OrderGoods> page = new Page<OrderGoods>(pageNo, pageSize);
IPage<OrderGoods> pageList = orderGoodsService.page(page, queryWrapper);
return Result.OK(pageList);
HttpServletRequest req,@RequestParam(name="orderid",required=true)String orderid,@RequestParam(name="ischild",required=true)String ischild) {
if(orderid.equals("undefined")&&ischild.equals("undefined")){
QueryWrapper<OrderGoods> queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap());
Page<OrderGoods> page = new Page<OrderGoods>(pageNo, pageSize);
IPage<OrderGoods> pageList = orderGoodsService.page(page, queryWrapper);
return Result.OK(pageList);
}else if(ischild.equals("0")){
ZyOrders zyOrders = new ZyOrders();
QueryWrapper<ZyOrders> queryWrapper1 = QueryGenerator.initQueryWrapper(zyOrders, req.getParameterMap());
queryWrapper1.eq("order_id",orderid);
List<ZyOrders> list = zyOrdersService.list(queryWrapper1);
String ids = "";
for (int i = 0 ; i < list.size() ; i++){
ids = ids + list.get(i).getId()+",";
}
QueryWrapper<OrderGoods> queryWrapper2 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap());
queryWrapper2.in("orders_id",ids.substring(0,ids.length()-1).split(","));
Page<OrderGoods> page = new Page<OrderGoods>(pageNo, pageSize);
IPage<OrderGoods> pageList = orderGoodsService.page(page, queryWrapper2);
return Result.OK(pageList);
}else {
QueryWrapper<OrderGoods> queryWrapper3 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap());
queryWrapper3.eq("orders_id",orderid);
Page<OrderGoods> page = new Page<OrderGoods>(pageNo, pageSize);
IPage<OrderGoods> pageList = orderGoodsService.page(page, queryWrapper3);
return Result.OK(pageList);
}
}
/**

@ -65,8 +65,9 @@ public class OrderGoodsAccessoriesController extends JeecgController<OrderGoodsA
public Result<?> queryPageList(OrderGoodsAccessories orderGoodsAccessories,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
HttpServletRequest req,String ordergoodsid) {
QueryWrapper<OrderGoodsAccessories> queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsAccessories, req.getParameterMap());
queryWrapper.eq("order_goods_id",ordergoodsid);
Page<OrderGoodsAccessories> page = new Page<OrderGoodsAccessories>(pageNo, pageSize);
IPage<OrderGoodsAccessories> pageList = orderGoodsAccessoriesService.page(page, queryWrapper);
return Result.OK(pageList);

@ -65,8 +65,9 @@ public class OrderGoodsFabricController extends JeecgController<OrderGoodsFabric
public Result<?> queryPageList(OrderGoodsFabric orderGoodsFabric,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
HttpServletRequest req,String ordergoodsid) {
QueryWrapper<OrderGoodsFabric> queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsFabric, req.getParameterMap());
queryWrapper.eq("order_goods_id",ordergoodsid);
Page<OrderGoodsFabric> page = new Page<OrderGoodsFabric>(pageNo, pageSize);
IPage<OrderGoodsFabric> pageList = orderGoodsFabricService.page(page, queryWrapper);
return Result.OK(pageList);

@ -65,8 +65,9 @@ public class OrderGoodsModuleController extends JeecgController<OrderGoodsModule
public Result<?> queryPageList(OrderGoodsModule orderGoodsModule,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
HttpServletRequest req,String ordergoodsid) {
QueryWrapper<OrderGoodsModule> queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsModule, req.getParameterMap());
queryWrapper.eq("order_goods_id",ordergoodsid);
Page<OrderGoodsModule> page = new Page<OrderGoodsModule>(pageNo, pageSize);
IPage<OrderGoodsModule> pageList = orderGoodsModuleService.page(page, queryWrapper);
return Result.OK(pageList);

@ -100,6 +100,14 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
return Result.OK(map);
}
@ApiOperation(value = "查看物料清单", notes = "查看物料清单")
@GetMapping(value = "/getWuLiaoDetail")
public Result<?> getWuLiaoDetail(ZyPlanProcess zyPlanProcess,
HttpServletRequest req) {
Map<String, Object> map = zyPlanProcessService.getWuLiaoDetail(zyPlanProcess);
return Result.OK(map);
}
@ApiOperation(value = "读取工序", notes = "读取工序")
@GetMapping(value = "/syncProductProcess")
public Result<?> syncProductProcess(ZyPlanProcess zyPlanProcess,
@ -138,6 +146,14 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
return Result.OK();
}
@ApiOperation(value = "发送到仓库", notes = "发送到仓库")
@GetMapping(value = "/sendToRepository")
public Result<?> sendToRepository(ZyPlanProcess zyPlanProcess,
HttpServletRequest req) {
zyPlanProcessService.sendToRepository(zyPlanProcess);
return Result.OK();
}
@ApiOperation(value = "计划班组管理-查询产品工序&班组", notes = "计划班组管理-查询产品工序&班组")
@GetMapping(value = "/getTeamDatalist")
public Result<?> getTeamDatalist(ZyPlanProcess zyPlanProcess,

@ -75,6 +75,11 @@ public class ZyPlanAccessories implements Serializable {
@ApiModelProperty(value = "辅料id")
@Dict(dictTable = "zy_accessories", dicText = "contents", dicCode = "id")
private String accessoriesId;
@Excel(name = "辅料名称", width = 15)
@ApiModelProperty(value = "辅料名称")
private String accessoriesName;
/**
* 用量合计
*/

@ -76,6 +76,10 @@ public class ZyPlanFabric implements Serializable {
@ApiModelProperty(value = "面料id")
@Dict(dictTable = "zy_fabric", dicText = "name", dicCode = "id")
private String fabricId;
@Excel(name = "面料名称", width = 15)
@ApiModelProperty(value = "面料名称")
private String fabricName;
/**
* 用量合计
*/

@ -27,4 +27,7 @@ public interface IZyPlanProcessService extends IService<ZyPlanProcess> {
void createMaterialBill(ZyPlanProcess zyPlanProcess);
Map<String, Object> getWuLiaoDetail(ZyPlanProcess zyPlanProcess);
void sendToRepository(ZyPlanProcess zyPlanProcess);
}

@ -11,6 +11,8 @@ import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService;
import org.jeecg.modules.demo.base.entity.ZyProcess;
import org.jeecg.modules.demo.base.service.IZyProcessService;
import org.jeecg.modules.demo.delivery.entity.Delivery;
import org.jeecg.modules.demo.delivery.service.IDeliveryService;
import org.jeecg.modules.demo.fabric.entity.ZyFabric;
import org.jeecg.modules.demo.fabric.service.IZyFabricService;
import org.jeecg.modules.demo.ordergoods.entity.OrderGoods;
@ -146,6 +148,9 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
@Autowired
private IZyPlanAccessoriesService iZyPlanAccessoriesService;
@Autowired
private IDeliveryService iDeliveryService;
public List<ZyPlanProcess> getProcessDatalist(ZyPlanProcess zyPlanProcess) {
//生产计划id
String planId = zyPlanProcess.getPlanId();
@ -234,12 +239,12 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
throw new JeecgBootException("生产计划不存在!");
}
List<ZyPlanProcess> planProcessList = this.list(new LambdaQueryWrapper<ZyPlanProcess>().eq(ZyPlanProcess::getPlanId, zyPlanProcess.getPlanId()));
if(ObjectUtils.isEmpty(planProcessList)) return;
if (ObjectUtils.isEmpty(planProcessList)) return;
this.delBillData(zyPlanProcess);
List<String> idList = planProcessList.stream().map(ZyPlanProcess::getId).collect(Collectors.toList());
QueryWrapper qw = new QueryWrapper();
qw.select("fabric_id", "sum(amount) as count");
qw.select("fabric_id", "fabric_name", "sum(amount) as count");
qw.in("plan_process_id", idList);
qw.groupBy("fabric_id");
List<Map<String, Object>> maplist = zyPlanProcessFabricMapper.selectMaps(qw);
@ -248,13 +253,14 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
ZyPlanFabric zyPlanFabric = new ZyPlanFabric();
zyPlanFabric.setPlanId(zyPlanProcess.getPlanId());
zyPlanFabric.setFabricId(mp.get("fabric_id").toString());
zyPlanFabric.setFabricName(mp.get("fabric_name").toString());
zyPlanFabric.setAmount(new BigDecimal(mp.get("count").toString()));
zyPlanFabricList.add(zyPlanFabric);
}
iZyPlanFabricService.saveBatch(zyPlanFabricList);
QueryWrapper qw2 = new QueryWrapper();
qw2.select("accessories_id", "sum(amount) as count");
qw2.select("accessories_id", "accessories_name", "sum(amount) as count");
qw2.in("plan_process_id", idList);
qw2.groupBy("accessories_id");
List<Map<String, Object>> maplist2 = zyPlanProcessAccessoriesMapper.selectMaps(qw2);
@ -263,6 +269,7 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
ZyPlanAccessories zyPlanAccessories = new ZyPlanAccessories();
zyPlanAccessories.setPlanId(zyPlanProcess.getPlanId());
zyPlanAccessories.setAccessoriesId(mp.get("accessories_id").toString());
zyPlanAccessories.setAccessoriesName(mp.get("accessories_name").toString());
zyPlanAccessories.setAmount(new BigDecimal(mp.get("count").toString()));
zyPlanAccessoriesList.add(zyPlanAccessories);
}
@ -270,6 +277,7 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
}
void diffMachine(ZyPlanProcess zyPlanProcess, List<Station> stationList, List<ZyProcessMachine> machineList) {
if (!ObjectUtils.isEmpty(machineList)) {
List<String> machineList1 = machineList.stream().map(ZyProcessMachine::getMachineId).collect(Collectors.toList());
@ -505,12 +513,95 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
return result;
}
@Override
public void sendToRepository(ZyPlanProcess zyPlanProcess) {
String planId = zyPlanProcess.getPlanId();
ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
if (ObjectUtils.isEmpty(zyProductPlan)) {
throw new JeecgBootException("生产计划不存在!");
}
List<ZyPlanFabric> fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper<ZyPlanFabric>()
.eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId()));
List<Delivery> deliveryList4Fabric = new LinkedList<>();
Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> {
Delivery delivery = new Delivery();
delivery.setDeliveryReason("0");
delivery.setDeliveryTime(new Date());
delivery.setItemType("0");
delivery.setAmount(e.getAmount().doubleValue());
delivery.setCarrierId("admin");
delivery.setAdminId("admin");
delivery.setStorehouseId("TODO");
ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId());
if (!ObjectUtils.isEmpty(zyFabric)) {
delivery.setItemCode(zyFabric.getFabricNumber());
}
deliveryList4Fabric.add(delivery);
});
iDeliveryService.saveBatch(deliveryList4Fabric);
List<ZyPlanAccessories> accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper<ZyPlanAccessories>()
.eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId()));
List<Delivery> deliveryList4accessories = new LinkedList<>();
Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> {
Delivery delivery2 = new Delivery();
delivery2.setDeliveryReason("0");
delivery2.setDeliveryTime(new Date());
delivery2.setItemType("1");
delivery2.setAmount(e.getAmount().doubleValue());
delivery2.setCarrierId("admin");
delivery2.setAdminId("admin");
delivery2.setStorehouseId("TODO");
ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId());
if (!ObjectUtils.isEmpty(zyAccessories)) {
delivery2.setItemCode(zyAccessories.getNums());
}
deliveryList4accessories.add(delivery2);
});
iDeliveryService.saveBatch(deliveryList4accessories);
}
@Override
public Map<String, Object> getWuLiaoDetail(ZyPlanProcess zyPlanProcess) {
String planId = zyPlanProcess.getPlanId();
ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
if (ObjectUtils.isEmpty(zyProductPlan)) {
throw new JeecgBootException("生产计划不存在!");
}
List<ZyPlanProcess> planProcessList = this.list(new LambdaQueryWrapper<ZyPlanProcess>()
.eq(ZyPlanProcess::getPlanId, zyPlanProcess.getPlanId()));
List<String> ids = Optional.ofNullable(planProcessList).orElse(new LinkedList<>())
.stream().map(ZyPlanProcess::getId).collect(Collectors.toList());
Map<String, Object> result = new HashMap<>();
List<ZyPlanFabric> fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper<ZyPlanFabric>()
.eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId()));
result.put("fabricList", fabricList);
List<ZyPlanAccessories> accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper<ZyPlanAccessories>()
.eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId()));
result.put("accessoriesList", accessoriesList);
List<ZyPlanProcessFabric> processFabricList = iZyPlanProcessFabricService.list(new LambdaQueryWrapper<ZyPlanProcessFabric>()
.in(ZyPlanProcessFabric::getPlanProcessId, ids));
result.put("processFabricList", processFabricList);
List<ZyPlanProcessAccessories> processAccessoriesList = iZyPlanProcessAccessoriesService.list(new LambdaQueryWrapper<ZyPlanProcessAccessories>()
.in(ZyPlanProcessAccessories::getPlanProcessId, ids));
result.put("processAccessoriesList", processAccessoriesList);
return result;
}
@Override
public List<ProcessDataVo> getTeamDatalist(ZyPlanProcess zyPlanProcess) {
//生产计划id
String planId = zyPlanProcess.getPlanId();
ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
if (ObjectUtils.isEmpty(zyPlanProcess)) {
if (ObjectUtils.isEmpty(zyProductPlan)) {
throw new JeecgBootException("生产计划不存在!");
}
//工单id

Loading…
Cancel
Save