2023-1-16详情

zhc4dev
lenovo 2 years ago
parent 0349664e9b
commit b81ed1eb38
  1. 10
      ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
  2. 27
      ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
  3. 18
      ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
  4. 4
      ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue
  5. 4
      ant-design-vue-jeecg/src/views/product/pdoperationtool/ProductOperationtoolList.vue
  6. 30
      ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue
  7. 10
      ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
  8. 6
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
  9. 4
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java
  10. 12
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java
  11. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdcomponentprocess/entity/ProductComponentProcess.java
  12. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmodulecomponent/entity/ProductModuleComponent.java
  13. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmoduleprocess/entity/ProductModuleProcess.java
  14. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdaccessories/entity/ProductAccessories.java
  15. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdfabric/entity/ProductFabric.java
  16. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java
  17. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdoperationtool/entity/ProductOperationtool.java
  18. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/entity/ZyProductProcess.java

@ -165,11 +165,11 @@
align:"center", align:"center",
dataIndex: 'specs' dataIndex: 'specs'
}, },
{ // {
title:'库存量', // title:'',
align:"center", // align:"center",
dataIndex: 'store' // dataIndex: 'store'
}, // },
{ {
title:'供货商信息', title:'供货商信息',
align:"center", align:"center",

@ -81,6 +81,9 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleDetail(record.accessoriesId)">详情</a>
<a-divider type="vertical" />
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<!-- <a-divider type="vertical" />--> <!-- <a-divider type="vertical" />-->
@ -92,7 +95,7 @@
</a-table> </a-table>
</div> </div>
<ZyAccessoriesFormDetail ref="ZyAccessoriesFormDetail"></ZyAccessoriesFormDetail>
<product-accessories-modal ref="modalForm" @ok="modalFormOk"></product-accessories-modal> <product-accessories-modal ref="modalForm" @ok="modalFormOk"></product-accessories-modal>
</a-card> </a-card>
</template> </template>
@ -105,12 +108,13 @@
import ProductAccessoriesModal from './modules/ProductAccessoriesModal' import ProductAccessoriesModal from './modules/ProductAccessoriesModal'
import {getAction} from "@api/manage"; import {getAction} from "@api/manage";
import {filterObj} from "@/utils/util"; import {filterObj} from "@/utils/util";
import ZyAccessoriesFormDetail from '@/views/erp/accessories/modules/ZyAccessoriesFormDetail'
export default { export default {
name: 'ProductAccessoriesList', name: 'ProductAccessoriesList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
ProductAccessoriesModal ProductAccessoriesModal,
ZyAccessoriesFormDetail
}, },
data () { data () {
return { return {
@ -129,16 +133,16 @@
return parseInt(index)+1; return parseInt(index)+1;
} }
}, },
{
title:'产品编号',
align:"center",
dataIndex: 'productId'
},
// { // {
// title:'', // title:'',
// align:"center", // align:"center",
// dataIndex: 'productId_dictText' // dataIndex: 'productId'
// }, // },
{
title:'产品编号',
align:"center",
dataIndex: 'productId_dictText'
},
{ {
title:'辅料', title:'辅料',
align:"center", align:"center",
@ -193,7 +197,7 @@
fanhui(){ fanhui(){
this.$router.push({ this.$router.push({
/*返回产品*/ /*返回产品*/
path: '',/*在引号中填写返回vue*/ path: '/WorkProduct',/*在引号中填写返回vue*/
}); });
}, },
initDictConfig(){ initDictConfig(){
@ -264,6 +268,9 @@
this.accessoriesId = '' this.accessoriesId = ''
this.loadData(1); this.loadData(1);
}, },
handleDetail(id){
this.$refs.ZyAccessoriesFormDetail.showModal(id)
}
} }
} }
</script> </script>

@ -81,6 +81,9 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleDetail(record.fabricId,record.fabricId_dictText)">详情</a>
<a-divider type="vertical" />
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<!-- <a-divider type="vertical" />--> <!-- <a-divider type="vertical" />-->
@ -91,7 +94,7 @@
</a-table> </a-table>
</div> </div>
<ZyFabricFormDetailModel ref="ZyFabricFormDetailModel"></ZyFabricFormDetailModel>
<product-fabric-modal ref="modalForm" @ok="modalFormOk"></product-fabric-modal> <product-fabric-modal ref="modalForm" @ok="modalFormOk"></product-fabric-modal>
</a-card> </a-card>
</template> </template>
@ -104,12 +107,13 @@
import ProductFabricModal from './modules/ProductFabricModal' import ProductFabricModal from './modules/ProductFabricModal'
import {getAction} from "@api/manage"; import {getAction} from "@api/manage";
import {filterObj} from "@/utils/util"; import {filterObj} from "@/utils/util";
import ZyFabricFormDetailModel from '@/views/erp/fabric/modules/ZyFabricFormDetailModel'
export default { export default {
name: 'ProductFabricList', name: 'ProductFabricList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
ProductFabricModal ProductFabricModal,
ZyFabricFormDetailModel
}, },
data () { data () {
return { return {
@ -131,7 +135,7 @@
{ {
title:'产品编号', title:'产品编号',
align:"center", align:"center",
dataIndex: 'productId' dataIndex: 'productId_dictText'
}, },
{ {
title:'面料', title:'面料',
@ -189,7 +193,7 @@
fanhui(){ fanhui(){
this.$router.push({ this.$router.push({
/*返回产品*/ /*返回产品*/
path: '',/*在引号中填写返回vue*/ path: '/WorkProduct',/*在引号中填写返回vue*/
}); });
}, },
getSuperFieldList(){ getSuperFieldList(){
@ -258,6 +262,10 @@
this.fabricId = '' this.fabricId = ''
this.loadData(1); this.loadData(1);
}, },
handleDetail(id,name){
this.$refs.ZyFabricFormDetailModel.showModal(id,name)
// this.$children[0].showModal(id)
}
} }
} }
</script> </script>

@ -132,7 +132,7 @@
{ {
title:'产品编号', title:'产品编号',
align:"center", align:"center",
dataIndex: 'productId' dataIndex: 'productId_dictText'
}, },
// { // {
// title:'', // title:'',
@ -189,7 +189,7 @@
fanhui(){ fanhui(){
this.$router.push({ this.$router.push({
/*返回产品*/ /*返回产品*/
path: '',/*在引号中填写返回vue*/ path: '/WorkProduct',/*在引号中填写返回vue*/
}); });
}, },
up(id){ up(id){

@ -132,7 +132,7 @@
{ {
title:'产品编号', title:'产品编号',
align:"center", align:"center",
dataIndex: 'productId' dataIndex: 'productId_dictText'
}, },
// { // {
// title:'', // title:'',
@ -189,7 +189,7 @@
fanhui(){ fanhui(){
this.$router.push({ this.$router.push({
/*返回产品*/ /*返回产品*/
path: '',/*在引号中填写返回vue*/ path: '/WorkProduct',/*在引号中填写返回vue*/
}); });
}, },
up(id){ up(id){

@ -1,5 +1,6 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -22,7 +23,8 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('产品工序')">导出</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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!-- <a-button type="primary" icon="import">导入</a-button>-->
@ -81,9 +83,10 @@
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<a>删除</a> <!-- <a>删除</a>-->
</a-popconfirm> <!-- </a-popconfirm>-->
<a @click="openDetail(record.processId)">详情</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a @click="up(record.id)">升序</a> <a @click="up(record.id)">升序</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
@ -92,7 +95,7 @@
</a-table> </a-table>
</div> </div>
<ZyProcessDetail ref="zyProcessDetail"></ZyProcessDetail>
<zy-product-process-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-product-process-modal> <zy-product-process-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-product-process-modal>
</a-card> </a-card>
</template> </template>
@ -105,17 +108,19 @@
import ZyProductProcessModal from './modules/ZyProductProcessModal' import ZyProductProcessModal from './modules/ZyProductProcessModal'
import {getAction} from "@api/manage"; import {getAction} from "@api/manage";
import {filterObj} from "@/utils/util"; import {filterObj} from "@/utils/util";
import ZyProcessDetail from '@/views/process/modules/ZyProcessDetail'
export default { export default {
name: 'ZyProductProcessList', name: 'ZyProductProcessList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
ZyProductProcessModal ZyProductProcessModal,
ZyProcessDetail
}, },
data () { data () {
return { return {
description: '产品工序管理页面', description: '产品工序管理页面',
processId:'', processId:'',
biaoTi:'',
// //
columns: [ columns: [
{ {
@ -175,6 +180,10 @@
}, },
}, },
methods: { methods: {
openDetail(id) {
this.$refs.zyProcessDetail.showModal(id)
// this.$children[0].showModal(id)
},
up(id){ up(id){
getAction(this.url.up,{id:id}).then((res)=>{ getAction(this.url.up,{id:id}).then((res)=>{
if(res.success){ if(res.success){
@ -208,6 +217,7 @@
loadParameter() { loadParameter() {
if (this.loadRouteType === false) { if (this.loadRouteType === false) {
this.id = this.$route.query.id; this.id = this.$route.query.id;
this.biaoTi=this.$route.query.productName+"产品工序管理";
console.log("***********") console.log("***********")
this.loadRouteType = true; this.loadRouteType = true;
} }
@ -261,6 +271,12 @@
this.processId = '' this.processId = ''
this.loadData(1); this.loadData(1);
}, },
fanhui(){
this.$router.push({
/*返回产品*/
path: '/WorkProduct',/*在引号中填写返回vue*/
});
},
} }
} }
</script> </script>

@ -76,6 +76,16 @@
<j-image-upload isMultiple v-model="model.url"></j-image-upload> <j-image-upload isMultiple v-model="model.url"></j-image-upload>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-model-item label="结构图(多副)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="structureDiagram">
<j-image-upload isMultiple v-model="model.structureDiagram"></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="排料图(一副)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="layoutDiagram">
<j-image-upload isMultiple v-model="model.layoutDiagram"></j-image-upload>
</a-form-model-item>
</a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>

@ -61,9 +61,9 @@ public class ZyAccessories implements Serializable {
@ApiModelProperty(value = "规格") @ApiModelProperty(value = "规格")
private java.lang.String specs; private java.lang.String specs;
/**库存量*/ /**库存量*/
@Excel(name = "库存量", width = 15) // @Excel(name = "库存量", width = 15)
@ApiModelProperty(value = "库存量") // @ApiModelProperty(value = "库存量")
private java.lang.Integer store; // private java.lang.Integer store;
/**供货商信息*/ /**供货商信息*/
@Excel(name = "供货商信息", width = 15) @Excel(name = "供货商信息", width = 15)
@ApiModelProperty(value = "供货商信息") @ApiModelProperty(value = "供货商信息")

@ -265,7 +265,7 @@ public class ZyFabricController extends JeecgController<ZyFabric, IZyFabricServi
@ApiOperation(value="面料表-添加", notes="面料表-添加") @ApiOperation(value="面料表-添加", notes="面料表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyFabric zyFabric) { public Result<?> add(@RequestBody ZyFabric zyFabric) {
zyFabric.setCreateTime(new Date().toLocaleString()); // zyFabric.setCreateTime(new Date().toLocaleString());
List<ZyFabric> list = zyFabricService.list(); List<ZyFabric> list = zyFabricService.list();
for (ZyFabric zy : list){ for (ZyFabric zy : list){
if (zy.getName().equals(zyFabric.getName())){ if (zy.getName().equals(zyFabric.getName())){
@ -286,7 +286,7 @@ public class ZyFabricController extends JeecgController<ZyFabric, IZyFabricServi
@ApiOperation(value="面料表-编辑", notes="面料表-编辑") @ApiOperation(value="面料表-编辑", notes="面料表-编辑")
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ZyFabric zyFabric) { public Result<?> edit(@RequestBody ZyFabric zyFabric) {
zyFabric.setUpdateTime(new Date().toLocaleString()); // zyFabric.setUpdateTime(new Date().toLocaleString());
List<ZyFabric> list = zyFabricService.list(); List<ZyFabric> list = zyFabricService.list();
ZyFabric zyFabric1 = zyFabricService.getById(zyFabric.getId()); ZyFabric zyFabric1 = zyFabricService.getById(zyFabric.getId());
list.remove(zyFabric1); list.remove(zyFabric1);

@ -144,20 +144,20 @@ public class ZyFabric implements Serializable {
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private java.lang.String createBy; private java.lang.String createBy;
/**创建时间*/ /**创建时间*/
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private java.lang.String createTime; private Date createTime;
/**更新人*/ /**更新人*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private java.lang.String updateBy; private java.lang.String updateBy;
/**更新时间*/ /**更新时间*/
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private java.lang.String updateTime; private Date updateTime;
/**所属部门*/ /**所属部门*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode; private java.lang.String sysOrgCode;

@ -46,7 +46,7 @@ public class ProductComponentProcess implements Serializable {
/**产品id*/ /**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
//@Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 表暂未设计暂时不打开 @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id")
private String productComponentId; private String productComponentId;
/**产品模块部件id*/ /**产品模块部件id*/
@Excel(name = "产品模块部件id", width = 15) @Excel(name = "产品模块部件id", width = 15)

@ -47,7 +47,7 @@ public class ProductModuleComponent implements Serializable {
/**产品id*/ /**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
//@Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 表暂未设计暂时不打开 @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id")
private String productId; private String productId;
/**产品模块id*/ /**产品模块id*/
@Excel(name = "产品模块id", width = 15) @Excel(name = "产品模块id", width = 15)

@ -48,7 +48,7 @@ public class ProductModuleProcess implements Serializable {
/**产品id*/ /**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
//@Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 表暂未设计暂时不打开 @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id")
private String productId; private String productId;
/**产品模块id*/ /**产品模块id*/
@Excel(name = "产品模块id", width = 15) @Excel(name = "产品模块id", width = 15)

@ -48,7 +48,7 @@ public class ProductAccessories implements Serializable {
/**产品id*/ /**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
// @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有,需要后期打开 @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id")
private String productId; private String productId;
/**辅料id*/ /**辅料id*/
@Excel(name = "辅料id", width = 15) @Excel(name = "辅料id", width = 15)

@ -48,7 +48,7 @@ public class ProductFabric implements Serializable {
/**产品id*/ /**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
// @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有,需要后期打开 @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id")
private String productId; private String productId;
/**面料id*/ /**面料id*/
@Excel(name = "面料id", width = 15) @Excel(name = "面料id", width = 15)

@ -44,7 +44,7 @@ public class ProductMachine implements Serializable {
/**产品id*/ /**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
// @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有,需要后期打开 @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id")
private String productId; private String productId;
/**设备d*/ /**设备d*/
@Excel(name = "设备d", width = 15) @Excel(name = "设备d", width = 15)

@ -45,7 +45,7 @@ public class ProductOperationtool implements Serializable {
/**产品id*/ /**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
// @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有,需要后期打开 @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id")
private String productId; private String productId;
/**工具id*/ /**工具id*/
@Excel(name = "工具id", width = 15) @Excel(name = "工具id", width = 15)

@ -56,7 +56,7 @@ public class ZyProductProcess implements Serializable {
/**产品id*/ /**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
// @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有,需要后期打开 @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id")
private String productId; private String productId;
/**工序id*/ /**工序id*/
@Excel(name = "工序id", width = 15) @Excel(name = "工序id", width = 15)

Loading…
Cancel
Save