diff --git a/ant-design-vue-jeecg/src/views/activiti/doneManage.vue b/ant-design-vue-jeecg/src/views/activiti/doneManage.vue index fcd423a9..1205d110 100644 --- a/ant-design-vue-jeecg/src/views/activiti/doneManage.vue +++ b/ant-design-vue-jeecg/src/views/activiti/doneManage.vue @@ -125,7 +125,7 @@ \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderModal.vue b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue similarity index 83% rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderModal.vue rename to ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue index cd202439..b4d17544 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderModal.vue +++ b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue @@ -8,17 +8,17 @@ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @cancel="handleCancel" cancelText="关闭"> - + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue index 9bc4e3f5..3ab40408 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue @@ -1,76 +1,27 @@ @@ -79,136 +30,88 @@ import '@/assets/less/TableExpand.less' import {mixinDevice} from '@/utils/mixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin' -import ZyPlanProcessModal from './modules/ZyPlanProcessModal2' -import {getAction, httpAction, downFile, postAction} from "@api/manage"; -import {filterObj} from "@/utils/util"; +import {getAction, postAction} from "@api/manage"; +import {filterObj, pushIfNotExist, randomNumber, randomUUID} from "@/utils/util"; +import {JVXETypes} from '@/components/jeecg/JVxeTable' export default { - name: 'ZyPlanProcessList', + name: 'ZyPlanProcessDataList', mixins: [JeecgListMixin, mixinDevice], - components: { - ZyPlanProcessModal - }, data() { return { - description: '生产计划班组管理页面', - // 表头 + toolbarConfig: { + // add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮 + btn: ['save'] + }, + description: '生产计划工序管理页面', + loading: false, + // 分页器参数 + // pagination: { + // // 当前页码 + // current: 1, + // // 每页的条数 + // pageSize: 10, + // // 可切换的条数 + // pageSizeOptions: ['10', '20', '30', '50'], + // // 数据总数（目前并不知道真实的总数，所以先填写0，在后台查出来后再赋值） + // total: 0, + // }, + // 选择的行 + // selectedRows: [], + // 数据源，控制表格的数据 + dataSource: [], + // columns, columns: [ - { - title: '#', - dataIndex: '', - key: 'rowIndex', - width: 60, - align: "center", - customRender: function (t, r, index) { - return parseInt(index) + 1; - } - }, - // { - // title: '计划id', - // align: "center", - // dataIndex: 'planId' - // }, - { - title: '工单编号', - align: "center", - dataIndex: 'workOrderId' - }, - { - title: '产品id', - align: "center", - dataIndex: 'productId' - }, - { - title: '产品', - align: "center", - dataIndex: 'productName' - }, - { - title: '车间', - align: "center", - dataIndex: 'departName' - }, - { - title: '工序', - align: "center", - dataIndex: 'processName' - }, + {key: 'workOrderId', title: '工单编号', width: '180px'}, + {key: 'productName', title: '产品名称', width: '180px'}, + {key: 'departName', title: '车间名称', width: '180px'}, + {key: 'processName', title: '工序名称', width: '180px'}, + {key: 'groupName', title: '班组名称', width: '180px'}, { title: '班组成员', - align: "center", - dataIndex: 'groupMemberList', - width: 150, - scopedSlots: {customRender: 'groupMemberList'} + key: 'userIds', + type: JVXETypes.selectMultiple, + width: '200px', + options: [], + placeholder: '请选择${title}', }, - // { - // title: '工位工具列表', - // align: "center", - // dataIndex: 'toolsList', - // width: 150, - // scopedSlots: {customRender: 'toolsList'} - // // scopedSlots: {customRender: this.toolsList} - // }, - // { - // title: '工具设备列表', - // align: "center", - // dataIndex: 'machineList', - // width: 150, - // scopedSlots: {customRender: 'machineList'} - // }, - { - title: '操作', - dataIndex: 'action', - align: "center", - fixed: "right", - width: 147, - scopedSlots: {customRender: 'action'} - } ], url: { list: "/org.jeecg.modules.productplan/zyPlanProcess/getTeamDatalist", - // getTeamDatalistByPlanId: "/org.jeecg.modules.productplan/zyPlanProcess/getTeamDatalistByPlanId", - groupMemberlist: "/groupxMember/list", - addTeamBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addTeamBatch", - // stationMachinelist: "/stationMachine/list", - // productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list", - delete: "/org.jeecg.modules.productplan/zyPlanProcess/delete", - // deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch", - // exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls", - // importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel", + // addProcessBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addProcessBatch", + updateTeamBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addTeamBatch", }, loadRouteType: false, planId: "", - dictOptions: {}, - superFieldList: [], - toolsList: [], - machineList: [], - processIds: [], - memberIds: [], + groupMemberList: [], + clickTrue: true, } }, created() { - this.getSuperFieldList(); - // this.model = Object.assign({}, record); - }, - computed: { - importExcelUrl: function () { - return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; - }, }, methods: { - saveBatch() { - // alert("保存开始") - postAction(this.url.addTeamBatch, this.processIds).then((res) => { - if (res.success) { - this.$message.success(res.message) - this.$emit('ok') - this.close() - } else { - this.$message.warning(res.message) + // 【整体保存】点击保存按钮时触发的事件 + handleTableSave({$table, target}) { + console.log("保存开始-----") + // 校验整个表格 + $table.validate().then((errMap) => { + // 校验通过 + if (!errMap) { + // 获取所有数据 + let tableData = target.getTableData() + console.log('当前保存的数据是：', tableData) + // 【模拟保存】 + this.loading = true + postAction(this.url.updateTeamBatch, tableData).then(res => { + if (res.success) { + this.$message.success(`保存成功！`) + } else { + this.$message.warn(`保存失败：` + res.message) + } + }).finally(() => { + this.loading = false + }) } - }).finally(() => { - this.confirmLoading = false }) }, fanHui() { @@ -216,16 +119,7 @@ export default { path: '/productplan/ZyPlanTeamList', }); }, - //$event为当前所选的key - selectData($event, row) { - console.log("group_member key $event=" + $event); - // console.log("group_member key row=" + JSON.stringify(row)); - console.log("productProcessId=" + JSON.stringify(row.productProcessId)); - this.processIds.push({"processId": row.productProcessId, "userIds": $event}); - // for (var i = 0; i < processIds.length; i++) { - console.log("the processIds length:" + this.processIds.length); - }, //加载传递参数 loadParameter() { if (this.loadRouteType === false) { @@ -236,14 +130,16 @@ export default { } }, loadData(arg) { + console.log("the loadData---------开始"); + // var that = this; if (!this.url.list) { this.$message.error("请设置url.list属性!") return } //加载数据 若传入参数1则加载第一页的内容 - if (arg === 1) { - this.ipagination.current = 1; - } + // if (arg === 1) { + // this.ipagination.current = 1; + // } this.loadParameter(); var params = this.getQueryParams();//查询条件 this.loading = true; @@ -251,19 +147,12 @@ export default { getAction(this.url.list, params).then((res) => { if (res.success) { this.dataSource = res.result.records || res.result; - if (res.result.total) { - this.ipagination.total = res.result.total; - } else { - this.ipagination.total = 0; - } + this.groupMemberList = this.dataSource[0].groupMemberList; } else { + // this.stationIdCode = "station,station_name,id,depart_id in (select workshop_id from zy_product_plan where id='" + this.planId + "')"; this.$message.warning(res.message) } }).finally(() => { - // this.dataSource.forEach(item => { - // item['stationName'] = this.stationName; - // item['stationNum'] = this.stationNum; - // }) this.loading = false }) }, @@ -281,51 +170,15 @@ export default { param.planId = this.planId; return filterObj(param); }, - // initDictConfig() { - // }, - getSuperFieldList() { - let fieldList = []; - fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''}) - fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''}) - fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''}) - fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''}) - fieldList.push({type: 'string', value: 'processIds', text: '工序id列表', dictCode: ''}) - fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''}) - this.superFieldList = fieldList - }, - // jumpPage1(record) { - // this.$router.push({ - // // path: '/productplan/ZyProductPlanList', - // path: '/productplan/ZyPlanProcessDataList', - // - // // query: { // 路由携带参数 - // // 'stationId': record.id, - // // 'stationName': record.stationName, - // // }, - // }); - // }, - // pf(record) { - // this.$router.push({ - // path: '/productplan/ZyPlanProcessAddList', - // query: { // 路由携带参数 - // } - // }); - // getAction("productPlanlist", {id: record.id}).then((res) => { - // if (res.success) { - // this.$router.push({ - // path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList', - // query: { // 路由携带参数 - // } - // }); - // } else { - // this.$message.error(res.message) - // } - // }); - // }, - } -} + // 当选择的行变化时触发的事件 + handleSelectRowChange(event) { + console.log("handleSelectRowChange-event:", event) + const {type, row, column, value, target, $table} = event + console.log("groupMemberList-----------", JSON.stringify(this.groupMemberList)); + // target.$refs.vxe.columns[6].dictCode = this.stationIdCode; + target.$refs.vxe.columns[7].options = this.groupMemberList; + }, + }, +}; - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue b/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue index 891880ef..749e4fe3 100644 --- a/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue +++ b/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue @@ -55,7 +55,7 @@ import { getAction,putAction } from '@/api/manage' import ShowAnnouncement from '@/components/tools/ShowAnnouncement' import {JeecgListMixin} from '@/mixins/JeecgListMixin' - import DynamicNotice from '../../components/tools/DynamicNotice' + import DynamicNotice from '@/components/tools/DynamicNotice' export default { name: "UserAnnouncementList", diff --git a/ant-design-vue-jeecg/src/views/system/modules/StaffModal.vue b/ant-design-vue-jeecg/src/views/system/modules/StaffModal.vue index 24ea9132..98662df8 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/StaffModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/StaffModal.vue @@ -172,7 +172,7 @@ import {addUser,editUser,queryUserRole,queryall } from '@/api/api' import { disabledAuthFilter } from "@/utils/authFilter" import {duplicateCheck } from '@/api/api' - import JImageUpload from '../../../components/jeecg/JImageUpload' + import JImageUpload from '@/components/jeecg/JImageUpload' export default { name: "StaffModal", diff --git a/ant-design-vue-jeecg/src/views/workorder/WorkOrderList.vue b/ant-design-vue-jeecg/src/views/workorder/WorkOrderList.vue index 40d3defe..58d8d687 100644 --- a/ant-design-vue-jeecg/src/views/workorder/WorkOrderList.vue +++ b/ant-design-vue-jeecg/src/views/workorder/WorkOrderList.vue @@ -4,33 +4,6 @@
- - - - - - - - - - - - - - 查询 - 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - - -
@@ -43,6 +16,8 @@ 导入 + + 删除 @@ -124,6 +99,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import WorkOrderModal from './modules/WorkOrderModal' + import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'WorkOrderList', @@ -137,7 +113,7 @@ // 表头 columns: [ { - title: '序号', + title: '#', dataIndex: '', key:'rowIndex', width:60, @@ -146,40 +122,45 @@ return parseInt(index)+1; } }, -/* { - title:'工单ID', - align:"center", - dataIndex: 'workId' - },*/ { title:'工单编号', align:"center", - dataIndex: 'workCode' + dataIndex: 'productCode' }, -/* { - title:'订单ID', + { + title:'订单', align:"center", - dataIndex: 'orderId' - },*/ + dataIndex: 'ordersId' + }, { - title:'订单编号', + title:'订单商品', align:"center", - dataIndex: 'orderCode' + dataIndex: 'orderGoodsId' }, -/* { - title:'客户ID', + { + title:'商品数量', align:"center", - dataIndex: 'customerId' - },*/ + dataIndex: 'goodsNum' + }, { - title:'客户名称', + title:'下单时间', align:"center", - dataIndex: 'customerName' + dataIndex: 'orderTime' }, { - title:'完工百分比', + title:'交货期', align:"center", - dataIndex: 'finished' + dataIndex: 'deliveryTime' + }, + { + title:'工单状态', + align:"center", + dataIndex: 'workOrderStatus_dictText' + }, + { + title:'企业', + align:"center", + dataIndex: 'enterprisesId' }, { title: '操作', @@ -191,17 +172,19 @@ } ], url: { - list: "/workorder/workOrder/list", - delete: "/workorder/workOrder/delete", - deleteBatch: "/workorder/workOrder/deleteBatch", - exportXlsUrl: "/workorder/workOrder/exportXls", - importExcelUrl: "workorder/workOrder/importExcel", - + list: "/workOrder/workOrder/list", + delete: "/workOrder/workOrder/delete", + deleteBatch: "/workOrder/workOrder/deleteBatch", + exportXlsUrl: "/workOrder/workOrder/exportXls", + importExcelUrl: "workOrder/workOrder/importExcel", + }, dictOptions:{}, + superFieldList:[], } }, created() { + this.getSuperFieldList(); }, computed: { importExcelUrl: function(){ @@ -210,6 +193,18 @@ }, methods: { initDictConfig(){ + }, + getSuperFieldList(){ + let fieldList=[]; + fieldList.push({type:'string',value:'productCode',text:'工单编号',dictCode:''}) + fieldList.push({type:'string',value:'ordersId',text:'订单',dictCode:''}) + fieldList.push({type:'string',value:'orderGoodsId',text:'订单商品',dictCode:''}) + fieldList.push({type:'int',value:'goodsNum',text:'商品数量',dictCode:''}) + fieldList.push({type:'datetime',value:'orderTime',text:'下单时间'}) + fieldList.push({type:'int',value:'deliveryTime',text:'交货期',dictCode:''}) + fieldList.push({type:'int',value:'workOrderStatus',text:'工单状态',dictCode:'work_order_status'}) + fieldList.push({type:'string',value:'enterprisesId',text:'企业',dictCode:''}) + this.superFieldList = fieldList } } } diff --git a/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderForm.vue b/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderForm.vue index 1959c9f4..328c84e5 100644 --- a/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderForm.vue +++ b/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderForm.vue @@ -1,48 +1,50 @@ @@ -50,28 +52,13 @@ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderModal__Style#Drawer.vue index 54a756f7..8b394962 100644 --- a/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderModal__Style#Drawer.vue +++ b/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderModal__Style#Drawer.vue @@ -5,6 +5,7 @@ placement="right" :closable="false" @close="close" + destroyOnClose :visible="visible">
diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue new file mode 100644 index 00000000..cf817114 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue @@ -0,0 +1,318 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductForm.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductForm.vue new file mode 100644 index 00000000..0252e547 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductForm.vue @@ -0,0 +1,224 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal.vue new file mode 100644 index 00000000..40628c4d --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal__Style#Drawer.vue new file mode 100644 index 00000000..e55e8c59 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyOrdersList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue similarity index 86% rename from ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyOrdersList.vue rename to ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue index f6ff57bc..5536562f 100644 --- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyOrdersList.vue +++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue @@ -77,19 +77,19 @@
- 新增 - 导出 - - 导入 - - - - - - 删除 - - 批量操作 - + + + + + + + + + + + + +
@@ -137,15 +137,18 @@ - 拆单 - - 编辑 - + 派单 + + + + + 详情 - - 删除 - + + + + @@ -160,20 +163,20 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import ZyOrdersModal from '../zyorders/modules/ZyOrdersModal' + import ZyOrdersModal from '@/views/zyorders/modules/ZyOrdersModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import Area from '@/components/_util/Area' import { httpAction, getAction } from '@/api/manage' export default { - name: 'ZyOrdersList', + name: 'ZyProductionOrderList', mixins:[JeecgListMixin, mixinDevice], components: { ZyOrdersModal }, data () { return { - description: '订单基本信息管理管理页面', + description: '派单订单基本信息管理页面', // 表头 columns: [ { @@ -186,15 +189,15 @@ return parseInt(index)+1; } }, + // { + // title:'是否子单', + // align:"center", + // dataIndex: 'ischild_dictText' + // }, { - title:'是否子单', - align:"center", - dataIndex: 'ischild_dictText' - }, - { - title:'原订单', + title:'订单编号', align:"center", - dataIndex: 'orderId_dictText' + dataIndex: 'ordersNum' }, { title:'下单时间', @@ -204,11 +207,11 @@ return !text?"":(text.length>10?text.substr(0,10):text) } }, - { - title:'订单编号', - align:"center", - dataIndex: 'ordersNum' - }, + // { + // title:'订单编号', + // align:"center", + // dataIndex: 'ordersNum' + // }, { title:'总金额(元)', align:"center", @@ -244,11 +247,11 @@ align:"center", dataIndex: 'userId_dictText' }, - { - title:'商品条目数量', - align:"center", - dataIndex: 'goodsQuantity' - }, + // { + // title:'商品条目数量', + // align:"center", + // dataIndex: 'goodsQuantity' + // }, { title:'支付方式', align:"center", @@ -368,12 +371,12 @@ } ], url: { - list: "/zyorders/zyOrders/list", + list: "/workOrder/workOrder/productionlist", delete: "/zyorders/zyOrders/delete", deleteBatch: "/zyorders/zyOrders/deleteBatch", exportXlsUrl: "/zyorders/zyOrders/exportXls", importExcelUrl: "zyorders/zyOrders/importExcel", - chaidan:"/zyorders/zyOrders/chaidan", + paidan:"/workorder/workOrder/paidan", }, dictOptions:{}, @@ -391,19 +394,15 @@ }, }, methods: { - chaidan(record){ - if(record.ischild===0){ - getAction(this.url.chaidan,{id:record.id}).then((res) => { - if (res.success) { - this.$message.success("拆单成功！"); - this.loadData(); - }else{ - this.$message.error(res.message); - } - }) - }else{ - this.$message.warning("该订单为子单，不可进行拆单！"); - } + paidan(record){ + getAction(this.url.paidan,{id:record.id}).then((res) => { + if (res.success) { + this.$message.success("派单成功！"); + this.loadData(); + }else{ + this.$message.error(res.message); + } + }) }, getPcaText(code){ return this.pcaData.getText(code); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/WorkOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue similarity index 82% rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/WorkOrderList.vue rename to ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue index 480bb2eb..786379cc 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/WorkOrderList.vue +++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue @@ -93,22 +93,11 @@ - 编辑 + + + + 详情 - - - 更多 - - - 详情 - - - - 删除 - - - - @@ -123,21 +112,21 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import WorkOrderModal from './modules/WorkOrderModal' + import WorkOrderModal from '@/views/workorder/modules/WorkOrderModal' export default { - name: 'WorkOrderList', + name: 'ZyWorkOrderList', mixins:[JeecgListMixin, mixinDevice], components: { WorkOrderModal }, data () { return { - description: '工单订单完工管理页面', + description: '工单管理页面', // 表头 columns: [ { - title: '#', + title: '序号', dataIndex: '', key:'rowIndex', width:60, @@ -147,39 +136,44 @@ } }, { - title:'工单ID', + title:'工单编号', align:"center", - dataIndex: 'workId' + dataIndex: 'productCode' }, { - title:'工单编号', + title:'订单', align:"center", - dataIndex: 'workCode' + dataIndex: 'ordersId' }, { - title:'订单ID', + title:'订单商品', align:"center", - dataIndex: 'orderId' + dataIndex: 'orderGoodsId' }, { - title:'订单编号', + title:'商品数量', align:"center", - dataIndex: 'orderCode' + dataIndex: 'goodsNum' }, { - title:'客户ID', + title:'下单时间', align:"center", - dataIndex: 'customerId' + dataIndex: 'orderTime' }, { - title:'客户名称', + title:'交货期', align:"center", - dataIndex: 'customerName' + dataIndex: 'deliveryTime' }, { - title:'完工百分比', + title:'工单状态', align:"center", - dataIndex: 'finished' + dataIndex: 'workOrderStatus_dictText' + }, + { + title:'企业', + align:"center", + dataIndex: 'enterprisesId' }, { title: '操作', @@ -191,12 +185,12 @@ } ], url: { - list: "/workorder/workOrder/list", + list: "/workorder/workOrder/workList", delete: "/workorder/workOrder/delete", deleteBatch: "/workorder/workOrder/deleteBatch", exportXlsUrl: "/workorder/workOrder/exportXls", importExcelUrl: "workorder/workOrder/importExcel", - + }, dictOptions:{}, } diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue index e725b88a..04e1db22 100644 --- a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue @@ -18,7 +18,7 @@ // import ZyStyleAccessoriesForm from './ZyStyleAccessoriesForm' import ZyAccessoriesList from "./ZyAccessoriesList"; -import {postAction} from "../../../api/manage"; +import {postAction} from "@/api/manage"; export default { name: 'ZyStyleAccessoriesModal', diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue index 6163a2ff..83ed7dfb 100644 --- a/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue +++ b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue @@ -15,7 +15,7 @@ \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/controller/ZyProductController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/controller/ZyProductController.java new file mode 100644 index 00000000..5b0e085a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/controller/ZyProductController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.workproduct.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.workproduct.entity.ZyProduct; +import org.jeecg.modules.workproduct.service.IZyProductService; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 产品表 + * @Author: jeecg-boot + * @Date: 2023-01-07 + * @Version: V1.0 + */ +@Api(tags="产品表") +@RestController +@RequestMapping("/zyproduct/zyProduct") +@Slf4j +public class ZyProductController extends JeecgController { + @Autowired + private IZyProductService zyProductService; + + /** + * 分页列表查询 + * + * @param zyProduct + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "产品表-分页列表查询") + @ApiOperation(value="产品表-分页列表查询", notes="产品表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyProduct zyProduct, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProduct, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProductService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyProduct + * @return + */ + @AutoLog(value = "产品表-添加") + @ApiOperation(value="产品表-添加", notes="产品表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyProduct zyProduct) { + zyProductService.save(zyProduct); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyProduct + * @return + */ + @AutoLog(value = "产品表-编辑") + @ApiOperation(value="产品表-编辑", notes="产品表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyProduct zyProduct) { + zyProductService.updateById(zyProduct); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "产品表-通过id删除") + @ApiOperation(value="产品表-通过id删除", notes="产品表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyProductService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "产品表-批量删除") + @ApiOperation(value="产品表-批量删除", notes="产品表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyProductService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "产品表-通过id查询") + @ApiOperation(value="产品表-通过id查询", notes="产品表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ZyProduct zyProduct = zyProductService.getById(id); + if(zyProduct==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyProduct); + } + + /** + * 导出excel + * + * @param request + * @param zyProduct + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyProduct zyProduct) { + return super.exportXls(request, zyProduct, ZyProduct.class, "产品表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyProduct.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java new file mode 100644 index 00000000..72b95bd3 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java @@ -0,0 +1,157 @@ +package org.jeecg.modules.workproduct.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 产品表 + * @Author: jeecg-boot + * @Date: 2023-01-07 + * @Version: V1.0 + */ +@Data +@TableName("zy_product") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_product对象", description="产品表") +public class ZyProduct implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**产品编号*/ + @Excel(name = "产品编号", width = 15) + @ApiModelProperty(value = "产品编号") + private String productCode; + /**工单*/ + @Excel(name = "工单", width = 15) + @ApiModelProperty(value = "工单") + private String workOrderId; + /**生产时间*/ + @Excel(name = "生产时间", width = 15) + @ApiModelProperty(value = "生产时间") + private Integer produceTime; + /**合计（手工TMU）*/ + @Excel(name = "合计（手工TMU）", width = 15) + @ApiModelProperty(value = "合计（手工TMU）") + private Double totalManualTmu; + /**合计（设备TMU）*/ + @Excel(name = "合计（设备TMU）", width = 15) + @ApiModelProperty(value = "合计（设备TMU）") + private Double totalMachineTmu; + /**合计（手工秒）*/ + @Excel(name = "合计（手工秒）", width = 15) + @ApiModelProperty(value = "合计（手工秒）") + private Integer totalMaunal; + /**合计（设备秒）*/ + @Excel(name = "合计（设备秒）", width = 15) + @ApiModelProperty(value = "合计（设备秒）") + private Integer totalMachine; + /**企业*/ + @Excel(name = "企业", width = 15) + @ApiModelProperty(value = "企业") + private String enterprisesId; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private String userId; + /**结构图*/ + @Excel(name = "结构图", width = 15) + @ApiModelProperty(value = "结构图") + private String structureDiagram; + /**排料图*/ + @Excel(name = "排料图", width = 15) + @ApiModelProperty(value = "排料图") + private String layoutDiagram; + /**产品图片*/ + @Excel(name = "产品图片", width = 15) + @ApiModelProperty(value = "产品图片") + private String productPicture; + /**身高*/ + @Excel(name = "身高", width = 15) + @ApiModelProperty(value = "身高") + private Double height; + /**体重*/ + @Excel(name = "体重", width = 15) + @ApiModelProperty(value = "体重") + private Double weight; + /**下摆*/ + @Excel(name = "下摆", width = 15) + @ApiModelProperty(value = "下摆") + private Double hem; + /**袖口*/ + @Excel(name = "袖口", width = 15) + @ApiModelProperty(value = "袖口") + private Double cuff; + /**袖长*/ + @Excel(name = "袖长", width = 15) + @ApiModelProperty(value = "袖长") + private Double sleeveLength; + /**胸围*/ + @Excel(name = "胸围", width = 15) + @ApiModelProperty(value = "胸围") + private Double bust; + /**腰围*/ + @Excel(name = "腰围", width = 15) + @ApiModelProperty(value = "腰围") + private Double theWaist; + /**肩宽*/ + @Excel(name = "肩宽", width = 15) + @ApiModelProperty(value = "肩宽") + private Double shoulderwidth; + /**前身长*/ + @Excel(name = "前身长", width = 15) + @ApiModelProperty(value = "前身长") + private Double forebodylength; + /**领围*/ + @Excel(name = "领围", width = 15) + @ApiModelProperty(value = "领围") + private Double neck; + /**臀围*/ + @Excel(name = "臀围", width = 15) + @ApiModelProperty(value = "臀围") + private Double hipline; + /**衣长*/ + @Excel(name = "衣长", width = 15) + @ApiModelProperty(value = "衣长") + private Double length; + /**胸距*/ + @Excel(name = "胸距", width = 15) + @ApiModelProperty(value = "胸距") + private Double sternalDistance; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/ZyProductMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/ZyProductMapper.java new file mode 100644 index 00000000..0a166b9a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/ZyProductMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.workproduct.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.workproduct.entity.ZyProduct; + +/** + * @Description: 产品表 + * @Author: jeecg-boot + * @Date: 2023-01-07 + * @Version: V1.0 + */ +public interface ZyProductMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/xml/ZyProductMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/xml/ZyProductMapper.xml new file mode 100644 index 00000000..a4727bae --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/xml/ZyProductMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/IZyProductService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/IZyProductService.java new file mode 100644 index 00000000..ef03e365 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/IZyProductService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.workproduct.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.workproduct.entity.ZyProduct; + +/** + * @Description: 产品表 + * @Author: jeecg-boot + * @Date: 2023-01-07 + * @Version: V1.0 + */ +public interface IZyProductService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/impl/ZyProductServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/impl/ZyProductServiceImpl.java new file mode 100644 index 00000000..058309c7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/impl/ZyProductServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.workproduct.service.impl; + +import org.jeecg.modules.workproduct.entity.ZyProduct; +import org.jeecg.modules.workproduct.mapper.ZyProductMapper; +import org.jeecg.modules.workproduct.service.IZyProductService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 产品表 + * @Author: jeecg-boot + * @Date: 2023-01-07 + * @Version: V1.0 + */ +@Service +public class ZyProductServiceImpl extends ServiceImpl implements IZyProductService { + +}