Merge remote-tracking branch 'origin/master'

zhc4dev
wangjiadong 2 years ago
commit 39751a342d
  1. 23
      ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
  2. 15
      ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesTypeForm.vue
  3. 37
      ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
  4. 32
      ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue
  5. 18
      ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
  6. 2
      ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
  7. 27
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
  8. 31
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
  9. 10
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
  10. 16
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
  11. 14
      ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue
  12. 94
      ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolModal.vue
  13. 15
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
  14. 94
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesModal.vue
  15. 38
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
  16. 60
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue
  17. 15
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
  18. 94
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricModal.vue
  19. 15
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue
  20. 84
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineModal.vue
  21. 159
      ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue
  22. 214
      ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue
  23. 196
      ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue
  24. 193
      ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue
  25. 154
      ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue
  26. 4
      ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
  27. 63
      ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
  28. 4
      ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
  29. 12
      ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue
  30. 14
      ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue
  31. 3
      ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue
  32. 3
      ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue
  33. 24
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
  34. 14
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
  35. 2
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
  36. 3
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesMapper.java
  37. 3
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/mapper/ZyAccessoriesTypeMapper.java
  38. 1
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesService.java
  39. 1
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/IZyAccessoriesTypeService.java
  40. 7
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesServiceImpl.java
  41. 7
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/service/impl/ZyAccessoriesTypeServiceImpl.java
  42. 10
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java
  43. 9
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricTypeController.java
  44. 2
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java
  45. 4
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricMapper.java
  46. 3
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/mapper/ZyFabricTypeMapper.java
  47. 2
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricService.java
  48. 1
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/IZyFabricTypeService.java
  49. 5
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricServiceImpl.java
  50. 7
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/service/impl/ZyFabricTypeServiceImpl.java
  51. 2
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java
  52. 5
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java
  53. 11
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
  54. 8
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
  55. 223
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
  56. 6
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
  57. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
  58. 3
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java
  59. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java
  60. 1
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
  61. 4
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml
  62. 4
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsTypeMapper.xml
  63. 1
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java
  64. 3
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsComponentService.java
  65. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
  66. 7
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java
  67. 47
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
  68. 12
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularServiceImpl.java
  69. 47
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
  70. 8
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java
  71. 36
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java
  72. 8
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java
  73. 8
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java
  74. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessComponent.java
  75. 9
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
  76. 6
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java
  77. 15
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java
  78. 12
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java
  79. 9
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java
  80. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java
  81. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java
  82. 11
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/controller/ZyClothSampleController.java
  83. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java
  84. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java
  85. 1
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java
  86. 7
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java
  87. 12
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java

@ -8,7 +8,7 @@
<j-popup
v-model="model.typeName"
field="typeName"
org-fields="id,contents"
org-fields="nums,contents"
dest-fields="typeId,typeName"
code="zy_accessories_type"
:multi="false"
@ -20,7 +20,7 @@
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" ></a-input>
<a-input v-model="model.nums" placeholder="请输入编号" disabled ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -83,6 +83,7 @@
data () {
return {
model:{
nums:''
},
labelCol: {
xs: { span: 24 },
@ -107,7 +108,8 @@
url: {
add: "/accessories/zyAccessories/add",
edit: "/accessories/zyAccessories/edit",
queryById: "/accessories/zyAccessories/queryById"
queryById: "/accessories/zyAccessories/queryById",
sort:"/accessories/zyAccessories/sort"
}
}
},
@ -159,8 +161,19 @@
},
popupCallback(value,row){
this.model = Object.assign(this.model, row);
console.log(row);
},
var n=10;
console.log(this.model)
getAction(this.url.sort, {id:this.model.typeId}).then((res)=>{
console.log(res)
var num=parseInt(res.result,10)+1
num=num.toString()
while(num.length<n){
num="0"+num
}
this.model.nums="FL"+this.model.typeId+num;
console.log(this.model.nums)
// console.log(row);
})},
}
}
</script>

@ -5,7 +5,7 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" ></a-input>
<a-input v-model="model.nums" placeholder="请输入编号" disabled ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -39,6 +39,7 @@
data () {
return {
model:{
nums:''
},
labelCol: {
xs: { span: 24 },
@ -54,7 +55,8 @@
url: {
add: "/accessories/zyAccessoriesType/add",
edit: "/accessories/zyAccessoriesType/edit",
queryById: "/accessories/zyAccessoriesType/queryById"
queryById: "/accessories/zyAccessoriesType/queryById",
weiyi:"/accessories/zyAccessoriesType/weiyi"
}
}
},
@ -64,6 +66,15 @@
},
},
created () {
var n=4
getAction(this.url.weiyi,null).then((res)=>{
var num=parseInt(res.message,10)+1
num=num.toString()
while(num.length<n){
num="0"+num
}
this.model.nums=num;
})
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},

@ -8,7 +8,7 @@
<j-popup
v-model="model.typeName"
field="typeName"
org-fields="id,content"
org-fields="nums,content"
dest-fields="typeId,typeName"
code="zy_fabric_type"
:multi="false"
@ -17,9 +17,14 @@
<a-input v-model="model.typeId" hidden />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
<j-search-select-tag v-model="model.material" dict="material" @change="gaibian" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricNumber">
<a-input v-model="model.fabricNumber" placeholder="请输入编号" ></a-input>
<a-input v-model="model.fabricNumber" placeholder="请输入编号" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -37,11 +42,11 @@
<j-search-select-tag v-model="model.pattern" dict="pattern" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
<j-search-select-tag v-model="model.material" dict="material" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">-->
<!-- <j-search-select-tag v-model="model.material" dict="material" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">-->
<!-- <a-input v-model="model.description" placeholder="请输入描述" ></a-input>-->
@ -157,6 +162,7 @@
model:{
unit : '1',
status : '1',
fabricNumber:'',
},
labelCol: {
xs: { span: 24 },
@ -199,7 +205,8 @@
url: {
add: "/fabric/zyFabric/add",
edit: "/fabric/zyFabric/edit",
queryById: "/fabric/zyFabric/queryById"
queryById: "/fabric/zyFabric/queryById",
sort:"/fabric/zyFabric/sort"
}
}
},
@ -217,6 +224,20 @@
add () {
this.edit(this.modelDefault);
},
gaibian(){
var n=10;
console.log(this.model)
getAction(this.url.sort,this.model).then((res)=>{
console.log(res)
var num=parseInt(res.result,10)+1
num=num.toString()
while(num.length<n){
num="0"+num
}
this.model.fabricNumber="ML"+this.model.typeId+this.model.material+num;
console.log(this.model.typeId)
})
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;

@ -5,7 +5,7 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" ></a-input>
<a-input v-model="model.nums" placeholder="请输入编号" disabled ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -22,7 +22,7 @@
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import {randomString, validateDuplicateValue} from '@/utils/util'
export default {
name: 'ZyFabricTypeForm',
@ -39,6 +39,7 @@
data () {
return {
model:{
nums:''
},
labelCol: {
xs: { span: 24 },
@ -60,7 +61,8 @@
url: {
add: "/fabric/zyFabricType/add",
edit: "/fabric/zyFabricType/edit",
queryById: "/fabric/zyFabricType/queryById"
queryById: "/fabric/zyFabricType/queryById",
weiyi:"/fabric/zyFabricType/weiyi"
}
}
},
@ -70,7 +72,21 @@
},
},
created () {
//使使while
// this.model.nums=randomString(4)
var n=4
getAction(this.url.weiyi,{id:this.model.nums}).then((res)=>{
var num=parseInt(res.message,10)+1
num=num.toString()
while(num.length<n){
num="0"+num
}
this.model.nums=num;
console.log(num)
})
//model
console.log(this.model.nums)
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
@ -81,6 +97,16 @@
this.model = Object.assign({}, record);
this.visible = true;
},
randomString(len) {
  len = len || 32;
  var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
  var maxPos = $chars.length;
  var pwd = '';
  for (i = 0; i < len; i++) {
    pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
  }
  return pwd;
},
submitForm () {
const that = this;
//

@ -13,9 +13,9 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_cloths_component')">导出</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>
<!-- <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">
@ -145,12 +145,16 @@
align:"center",
dataIndex: 'partsName'
},
// {
// title:'',
// align:"center",
// dataIndex: 'componentType'
// },
{
title:'部件类型',
align:"center",
dataIndex: 'componentType'
title: '服装类型',
align: "center",
dataIndex: 'clothsTypeId_dictText'
},
// {
// title:'',
// align:"center",

@ -173,7 +173,7 @@ export default {
// dataIndex: 'description'
// },
{
title: '服类型',
title: '服类型',
align: "center",
dataIndex: 'clothsTypeId_dictText'
},

@ -8,6 +8,11 @@
<!-- <a-input v-model="model.addPeople" placeholder="请输入添加人" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="频率" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="freq">
<a-input-number v-model="model.freq" placeholder="请输入频率" style="width: 100%" />
@ -28,11 +33,7 @@
<a-input-number v-model="model.manualTmu" placeholder="请输入手工TMU" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
@ -60,6 +61,7 @@
return {
model:{
addPeople:'',
nums:'',
},
labelCol: {
xs: { span: 24 },
@ -88,7 +90,8 @@
url: {
add: "/base/zyClothAction/add",
edit: "/base/zyClothAction/edit",
queryById: "/base/zyClothAction/queryById"
queryById: "/base/zyClothAction/queryById",
sort:"/base/zyClothAction/sort"
}
}
},
@ -100,7 +103,17 @@
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
var n=5
getAction(this.url.sort,null).then((res)=>{
// console.log(res.message)
var num=parseInt(res.message,10)+1
num=num.toString()
while(num.length<n){
num="0"+num
}
this.model.nums="M"+num;
// console.log(this.model.nums)
})
},
methods: {
add () {

@ -8,9 +8,14 @@
<j-select-depart v-model="model.enterpriseId" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
<!-- <a-input v-model="model.nums" placeholder="请输入编号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" ></a-input>
<a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
<j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -19,10 +24,15 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="部件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentType">
<a-input v-model="model.componentType" placeholder="请输入部件类型" ></a-input>
<a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
<j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="部件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentType">-->
<!-- <a-input v-model="model.componentType" placeholder="请输入部件类型" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
@ -33,11 +43,7 @@
<j-image-upload isMultiple v-model="model.pictureUrl" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
<j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">-->
<!-- <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
@ -86,8 +92,11 @@
},
confirmLoading: false,
validatorRules: {
nums: [
{ required: true, message: '请输入编号!'},
// nums: [
// { required: true, message: '!'},
// ],
clothsTypeId: [
{ required: true, message: '请选择服装类型!'},
],
partsName: [
{ required: true, message: '请输入部件名称!'},

@ -13,6 +13,7 @@
<!-- <a-input v-model="model.nums" placeholder="请输入编号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="模块名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularName">
<a-input v-model="model.modularName" placeholder="请输入模块名称" ></a-input>
@ -23,14 +24,15 @@
<!-- <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
<a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
<j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择服装类型" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="衣服类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
<j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->

@ -18,11 +18,11 @@
{{ typeId }}
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" ></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
<!-- <a-input v-model="model.nums" placeholder="请输入编号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeName">
<a-input v-model="model.typeName" placeholder="请输入类型名称" ></a-input>
@ -74,9 +74,9 @@
},
confirmLoading: false,
validatorRules: {
nums: [
{ required: true, message: '请输入编号!'},
],
// nums: [
// { required: true, message: '!'},
// ],
typeName: [
{ required: true, message: '请输入类型名称!'},
{ pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;,。;、!?]{0,5}$/, message: '文本长度过长'},

@ -5,7 +5,7 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-form-model-item label="工具" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.toolid" placeholder="请输入工具名称" ></a-input>
</a-form-model-item>
</a-col>
@ -79,12 +79,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</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>
@ -94,7 +89,7 @@
</a-table>
</div>
<zy-operationtool-modal ref="modalForm" @ok="modalFormOk"></zy-operationtool-modal>
<zy-operationtool-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-operationtool-modal>
</a-card>
</template>
@ -103,7 +98,7 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyOperationtoolModal from "@/views/operationtool/modules/ZyOperationtoolModal"
import ZyOperationtoolModal from "./ZyOperationtoolModal"
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
@ -196,6 +191,9 @@
},
initDictConfig(){
},
valueChange(value){
if (value) this.loadData()
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'operationid',text:'工序',dictCode:'zy_process,process_name,id'})

@ -0,0 +1,94 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<!-- <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
<zy-tool-list ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-tool-list>
</j-modal>
</template>
<script>
import {postAction} from "../../../api/manage";
import ZyToolList from "./list/ZyToolList";
export default {
name: 'ZyToolModal',
components: {
ZyToolList,
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false,
model:{
operationid:'',
toolid:'',
},
url:{
add:"/operationtool/zyOperationtool/add"
}
}
},
methods: {
// add () {
// this.visible=true
// this.$nextTick(()=>{
// this.$refs.realForm.add();
// })
// },
add1 (id) {
this.visible=true
this.$nextTick(()=>{
// this.$refs.realForm.add1(id);
this.model.operationid=id;
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
// edit1 (record,code) {
// this.visible=true
// this.$nextTick(()=>{
// this.$refs.realForm.edit1(record,code);
// })
// },
close () {
this.$emit('close');
this.visible = false;
},
chuancan(res){
this.model.toolid=res;
},
handleOk () {
postAction(this.url.add,this.model).then((res)=>{
if(res.success){
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
this.$emit('valueChange',1)
this.close()
})},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -79,13 +79,13 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</a>
<!-- <a @click="handleEdit1(record,code)">编辑</a>-->
<a-divider type="vertical" />
<!-- <a-divider type="vertical" />-->
<a @click="handleDetail(record)">详情</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>
@ -95,7 +95,7 @@
</a-table>
</div>
<zy-process-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
<zy-process-accessories-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
</a-card>
</template>
@ -104,7 +104,7 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessAccessoriesModal from '@/views/cloths/modules/ZyProcessAccessoriesModal'
import ZyProcessAccessoriesModal from './ZyProcessAccessoriesModal'
export default {
name: 'ZyProcessAccessoriesList',
@ -195,6 +195,9 @@
this.visible = true;
},
valueChange(value){
if (value) this.loadData()
},
initDictConfig(){
},
getSuperFieldList(){

@ -0,0 +1,94 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<!-- <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
<zy-accessories-list ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-accessories-list>
</j-modal>
</template>
<script>
import {postAction} from "../../../api/manage";
import ZyAccessoriesList from "./list/ZyAccessoriesList";
export default {
name: 'ZyProcessActionModal',
components: {
ZyAccessoriesList,
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false,
model:{
processId:'',
accessoriesId:'',
},
url:{
add:"/pro/zyProcessAccessories/add"
}
}
},
methods: {
// add () {
// this.visible=true
// this.$nextTick(()=>{
// this.$refs.realForm.add();
// })
// },
add1 (id) {
this.visible=true
this.$nextTick(()=>{
// this.$refs.realForm.add1(id);
this.model.processId=id;
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
// edit1 (record,code) {
// this.visible=true
// this.$nextTick(()=>{
// this.$refs.realForm.edit1(record,code);
// })
// },
close () {
this.$emit('close');
this.visible = false;
},
chuancan(res){
this.model.accessoriesId=res;
},
handleOk () {
postAction(this.url.add,this.model).then((res)=>{
if(res.success){
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
this.$emit('valueChange',1)
this.close()
})},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -79,22 +79,25 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</a>
<a-divider type="vertical" />
<a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
<!-- <a-divider type="vertical" />-->
<!-- <a @click="handleDetail(record)">详情</a>-->
<!-- <a-divider type="vertical" />-->
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
<a-divider type="vertical" />
<a @click="up(record.id)">升序</a>
<a-divider type="vertical" />
<a @click="down(record.id)">降序</a>
</span>
</a-table>
</div>
<zy-process-action-modal ref="modalForm" @ok="modalFormOk"></zy-process-action-modal>
<zy-process-action-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-action-modal>
</a-card>
</template>
@ -105,6 +108,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessActionModal from './ZyProcessActionModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import {getAction} from "@api/manage";
export default {
name: 'ZyProcessActionList',
@ -173,6 +177,8 @@
deleteBatch: "/pro/zyProcessAction/deleteBatch",
exportXlsUrl: "/pro/zyProcessAction/exportXls",
importExcelUrl: "pro/zyProcessAction/importExcel",
up:"/pro/zyProcessAction/up",
down:"/pro/zyProcessAction/down"
},
dictOptions:{},
@ -193,12 +199,30 @@
edit (record) {
this.id = record;
this.queryParam.processId=this.id;
console.log("燕慧森1号")
this.url.list='/pro/zyProcessAction/list1'
this.loadData();
this.visible = true;
},
up(id){
getAction(this.url.up,{id:id}).then((res)=>{
if(res.success){
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.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
})},
valueChange(value){
if (value) this.loadData()
},
initDictConfig(){
},
getSuperFieldList(){

@ -8,37 +8,47 @@
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>
<!-- <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
<zy-cloth-action-list ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-cloth-action-list>
</j-modal>
</template>
<script>
import ZyProcessActionForm from './ZyProcessActionForm'
import ZyClothActionList from "./list/ZyClothActionList";
import {postAction} from "../../../api/manage";
export default {
name: 'ZyProcessActionModal',
components: {
ZyProcessActionForm
ZyClothActionList,
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
disableSubmit: false,
model:{
processId:'',
actionId:'',
},
url:{
add:"/pro/zyProcessAction/add"
}
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
// add () {
// this.visible=true
// this.$nextTick(()=>{
// this.$refs.realForm.add();
// })
// },
add1 (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add1(id);
// this.$refs.realForm.add1(id);
this.model.processId=id;
})
},
edit (record) {
@ -47,19 +57,31 @@
this.$refs.realForm.edit(record);
})
},
edit1 (record,code) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit1(record,code);
})
},
// edit1 (record,code) {
// this.visible=true
// this.$nextTick(()=>{
// this.$refs.realForm.edit1(record,code);
// })
// },
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
chuancan(res){
this.model.actionId=res;
console.log(res)
},
handleOk () {
postAction(this.url.add,this.model).then((res)=>{
if(res.success){
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
this.$emit('valueChange',1)
this.close()
})},
submitCallback(){
this.$emit('ok');
this.visible = false;

@ -84,12 +84,12 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</a>
<!-- <a @click="handleEdit1(record,code)">编辑</a>-->
<a-divider type="vertical" />
<!-- <a-divider type="vertical" />-->
<a @click="handleDetail(record)">详情</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>
@ -99,7 +99,7 @@
</a-table>
</div>
<zy-process-fabric-modal ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
<zy-process-fabric-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
</a-card>
</template>
@ -108,7 +108,7 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessFabricModal from '@/views/cloths/modules/ZyProcessFabricModal'
import ZyProcessFabricModal from './ZyProcessFabricModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
@ -199,6 +199,9 @@
this.loadData();
this.visible = true;
},
valueChange(value){
if (value) this.loadData()
},
initDictConfig(){
},
getSuperFieldList(){

@ -0,0 +1,94 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<!-- <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
<zy-fabric-list ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-fabric-list>
</j-modal>
</template>
<script>
import {postAction} from "../../../api/manage";
import ZyFabricList from "./list/ZyFabricList";
export default {
name: 'ZyProcessActionModal',
components: {
ZyFabricList,
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false,
model:{
processId:'',
fabricId:'',
},
url:{
add:"/pro/zyProcessFabric/add"
}
}
},
methods: {
// add () {
// this.visible=true
// this.$nextTick(()=>{
// this.$refs.realForm.add();
// })
// },
add1 (id) {
this.visible=true
this.$nextTick(()=>{
// this.$refs.realForm.add1(id);
this.model.processId=id;
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
// edit1 (record,code) {
// this.visible=true
// this.$nextTick(()=>{
// this.$refs.realForm.edit1(record,code);
// })
// },
close () {
this.$emit('close');
this.visible = false;
},
chuancan(res){
this.model.fabricId=res;
},
handleOk () {
postAction(this.url.add,this.model).then((res)=>{
if(res.success){
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
this.$emit('valueChange',1)
this.close()
})},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -84,13 +84,6 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</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>
@ -100,7 +93,7 @@
</a-table>
</div>
<zy-process-machine-modal ref="modalForm" @ok="modalFormOk"></zy-process-machine-modal>
<zy-process-machine-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-machine-modal>
</a-card>
</template>
@ -109,7 +102,7 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessMachineModal from '@/views/cloths/modules/ZyProcessMachineModal'
import ZyProcessMachineModal from './ZyProcessMachineModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
@ -194,10 +187,12 @@
},
},
methods: {
valueChange(value){
if (value) this.loadData()
},
edit (record) {
this.id = record;
this.queryParam.processId=this.id;
console.log("燕慧森1号")
this.loadData();
this.visible = true;

@ -0,0 +1,84 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-machine ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-machine>
</j-modal>
</template>
<script>
import ZyMachine from "./list/ZyMachine";
import {postAction} from "../../../api/manage";
export default {
name: 'ZyProcessMachineModal',
components: {
ZyMachine
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false,
model:{
machineId:'',
processId:''
},
url:{
add: "/pro/zyProcessMachine/add",
}
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
add1 (id) {
this.visible=true
this.model.processId=id;
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
chuancan(res){
this.model.machineId=res;
console.log(res)
},
handleOk () {
postAction(this.url.add,this.model).then((res)=>{
if(res.success){
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
this.$emit('valueChange',1)
this.close()
})},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,159 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
</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: onSelectChange1}"
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="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>
</a-table>
</div>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'ZyAccessoriesList',
mixins:[JeecgListMixin, mixinDevice],
components: {
},
data () {
return {
description: 'zy_accessories管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'编号',
align:"center",
dataIndex: 'nums'
},
{
title:'名称',
align:"center",
dataIndex: 'contents'
},
],
url: {
list: "/accessories/zyAccessories/list",
delete: "/accessories/zyAccessories/delete",
deleteBatch: "/accessories/zyAccessories/deleteBatch",
exportXlsUrl: "/accessories/zyAccessories/exportXls",
importExcelUrl: "accessories/zyAccessories/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
onSelectChange1(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
let ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ",";
}
this.$emit('onChangeRowKey',ids)
},
add (code) {
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'typeId',text:'类型id'})
fieldList.push({type:'string',value:'nums',text:'编号'})
fieldList.push({type:'string',value:'contents',text:'名称'})
fieldList.push({type:'string',value:'picture',text:'图片'})
fieldList.push({type:'string',value:'material',text:'材质'})
fieldList.push({type:'string',value:'specs',text:'规格'})
fieldList.push({type:'int',value:'store',text:'库存量'})
fieldList.push({type:'string',value:'supplierInfo',text:'供货商信息'})
this.superFieldList = fieldList
},
handleDetail(id){
this.$refs.ZyAccessoriesFormDetail.showModal(id)
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,214 @@
<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 :sm="5">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >
<a-input v-model="queryParam.descr" placeholder="请输入描述" ></a-input>
</a-form-model-item>
</a-col>
<a-col :sm="5">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.nums" placeholder="请输入编号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('zy_cloth_action')">导出</a-button>-->
<!-- &lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<!-- &lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- &lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- &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: onSelectChange1}"
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="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="handleEdit(record)">编辑</a>-->
<!-- <a-divider type="vertical" />-->
<!-- <a @click="handleDetail(record.id)">详情</a>-->
<!-- <a-divider type="vertical" />-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a>删除</a>-->
<!-- </a-popconfirm>-->
<!-- </span>-->
</a-table>
</div>
<!-- <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>-->
<!-- <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>-->
</a-card>
</template>
<script>
import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'ZyClothActionList',
mixins:[JeecgListMixin, mixinDevice],
components: {
},
data () {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
description: 'zy_cloth_action管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'编号',
align:"center",
dataIndex: 'nums'
},
{
title:'描述',
align:"center",
dataIndex: 'descr'
},
// {
// title: '',
// dataIndex: 'action',
// align:"center",
// fixed:"right",
// width:147,
// scopedSlots: { customRender: 'action' }
// }
],
url: {
list: "/base/zyClothAction/list",
delete: "/base/zyClothAction/delete",
deleteBatch: "/base/zyClothAction/deleteBatch",
exportXlsUrl: "/base/zyClothAction/exportXls",
importExcelUrl: "base/zyClothAction/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
onSelectChange1(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
let ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ",";
}
this.$emit('onChangeRowKey',ids)
},
add (code) {
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'addPeople',text:'添加人',dictCode:''})
fieldList.push({type:'int',value:'freq',text:'频率',dictCode:''})
fieldList.push({type:'string',value:'descr',text:'描述',dictCode:''})
fieldList.push({type:'int',value:'machineTmu',text:'机器TMU',dictCode:''})
fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
this.superFieldList = fieldList
},
handleDetail(id){
this.$refs.ZyClothActionFormDetail.showModal(id)
}
}
}
</script>
<style scoped lang="less">
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,196 @@
<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.pattern" dict="pattern"/>-->
<!-- </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.fabricNumber"></a-input>
</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.name"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<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">
</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: onSelectChange1}"
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="imgeSlot" slot-scope="text">
<img :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</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>
</a-table>
</div>
</a-card>
</template>
<script>
import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'ZyFabricList',
mixins:[JeecgListMixin, mixinDevice],
components: {
},
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: 'fabricNumber'
},
{
title:'名称',
align:"center",
dataIndex: 'name'
},
],
url: {
list: "/fabric/zyFabric/list",
delete: "/fabric/zyFabric/delete",
deleteBatch: "/fabric/zyFabric/deleteBatch",
exportXlsUrl: "/fabric/zyFabric/exportXls",
importExcelUrl: "/fabric/zyFabric/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
onSelectChange1(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
let ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ",";
}
this.$emit('onChangeRowKey',ids)
},
add (code) {
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'color',text:'颜色',dictCode:''})
fieldList.push({type:'sel_search',value:'pattern',text:'花样',dictTable:'', dictText:'', dictCode:'pattern'})
fieldList.push({type:'sel_search',value:'material',text:'材质',dictTable:'', dictText:'', dictCode:'material'})
fieldList.push({type:'sel_search',value:'ply',text:'厚度',dictTable:'ply', dictText:'', dictCode:''})
fieldList.push({type:'int',value:'money',text:'单价',dictCode:''})
fieldList.push({type:'string',value:'imageUrl',text:'图片地址',dictCode:''})
fieldList.push({type:'popup',value:'typeId',text:'面料类型id', popup:{code:'zy_fabric_type',field:'id',orgFields:'id',destFields:'content'}})
fieldList.push({type:'sel_search',value:'brandId',text:'材料品牌id',dictTable:'brand', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'fabricNumber',text:'材料编号',dictCode:''})
fieldList.push({type:'int',value:'unit',text:'1、为m。2:kg,等',dictCode:'unit1,,'})
fieldList.push({type:'int',value:'retailPrice',text:'零售价',dictCode:''})
fieldList.push({type:'sel_search',value:'density',text:'密度',dictTable:'density', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'clothW',text:'幅宽',dictCode:'clothW,,'})
fieldList.push({type:'string',value:'location',text:'所在地区',dictCode:''})
fieldList.push({type:'int',value:'status',text:'状态 o 为下架 1为上架 ',dictCode:'fabric_status,,'})
fieldList.push({type:'int',value:'fabricGrade',text:'等级',dictCode:'fabric_grade,,'})
fieldList.push({type:'string',value:'qRcode',text:'二维码',dictCode:''})
fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
fieldList.push({type:'sel_depart',value:'supplierInfo',text:'供货商信息'})
fieldList.push({type:'string',value:'createTime',text:'创建时间',dictCode:''})
this.superFieldList = fieldList
},
handleDetail(id){
this.$refs.ZyFabricFormDetailModel.showModal(id)
// this.$children[0].showModal(id)
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,193 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
</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('zy_cloth_action')">导出</a-button>-->
<!-- &lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<!-- &lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- &lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- &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: onSelectChange1}"
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="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="handleEdit(record)">编辑</a>-->
<!-- <a-divider type="vertical" />-->
<!-- <a @click="handleDetail(record.id)">详情</a>-->
<!-- <a-divider type="vertical" />-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a>删除</a>-->
<!-- </a-popconfirm>-->
<!-- </span>-->
</a-table>
</div>
<!-- <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>-->
<!-- <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>-->
</a-card>
</template>
<script>
import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'ZyClothActionList',
mixins:[JeecgListMixin, mixinDevice],
components: {
},
data () {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
description: 'zy_cloth_action管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'编号',
align:"center",
dataIndex: 'code'
},
{
title:'设备名称',
align:"center",
dataIndex: 'name'
},
// {
// title: '',
// dataIndex: 'action',
// align:"center",
// fixed:"right",
// width:147,
// scopedSlots: { customRender: 'action' }
// }
],
url: {
list: "/devicetype/zyDevicetype/list1",
importExcelUrl: "base/zyClothAction/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
onSelectChange1(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
let ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ",";
}
this.$emit('onChangeRowKey',ids)
},
add (code) {
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'addPeople',text:'添加人',dictCode:''})
fieldList.push({type:'int',value:'freq',text:'频率',dictCode:''})
fieldList.push({type:'string',value:'descr',text:'描述',dictCode:''})
fieldList.push({type:'int',value:'machineTmu',text:'机器TMU',dictCode:''})
fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
this.superFieldList = fieldList
},
handleDetail(id){
this.$refs.ZyClothActionFormDetail.showModal(id)
}
}
}
</script>
<style scoped lang="less">
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,154 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
</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: onSelectChange1}"
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="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>
</a-table>
</div>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'ZyToolList',
mixins:[JeecgListMixin, mixinDevice],
components: {
},
data () {
return {
description: 'zy_tool管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'编号',
align:"center",
dataIndex: 'nums'
},
{
title:'名称',
align:"center",
dataIndex: 'name'
},
],
url: {
list: "/tool/zyTool/list",
delete: "/tool/zyTool/delete",
deleteBatch: "/tool/zyTool/deleteBatch",
exportXlsUrl: "/tool/zyTool/exportXls",
importExcelUrl: "tool/zyTool/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
onSelectChange1(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
let ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ",";
}
this.$emit('onChangeRowKey',ids)
},
add (code) {
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'name',text:'工具名称'})
fieldList.push({type:'string',value:'nums',text:'工具编号'})
fieldList.push({type:'string',value:'function',text:'功能'})
fieldList.push({type:'string',value:'specs',text:'规格'})
fieldList.push({type:'string',value:'scope',text:'适用范围'})
fieldList.push({type:'string',value:'workshopSection',text:'责人工段'})
fieldList.push({type:'string',value:'status',text:'状态 ( 0 在库、1 在用、2 遗失 、3 损坏、4 报废)'})
fieldList.push({type:'string',value:'qrode',text:'二维码'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -215,9 +215,9 @@ export default {
// scopedSlots: {customRender: 'action1'}
// },
{
title: '用户名',
title: '企业',
align: "center",
dataIndex: 'userId'
dataIndex: 'userId_dictText'
},
{
title: '创建时间',

@ -4,17 +4,18 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<!-- <a-input v-model="model.nums || this.nums" placeholder="请输入编号"></a-input>-->
<a-input v-model="model.nums" placeholder="请输入编号"></a-input>
<a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
<j-select-depart v-model="model.userId" />
</a-form-model-item>
</a-col>
<!--关联服装款式表 zy_cloths_style 关联列名称 传值id-->
<a-col :span="24">
<a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
<j-dict-select-tag v-model="model.styleId" placeholder="请输入款式"
dict-code="zy_cloths_style,style_names,id"></j-dict-select-tag>
dict-code="zy_cloths_style,style_names,nums"></j-dict-select-tag>
</a-form-model-item>
<!-- 编码也是唯一的和id一样 -->
</a-col>
<a-col :span="24">
@ -23,22 +24,27 @@
<!-- <j-dict-select-tag v-model="model.stylemodelId" placeholder="请输入款式型号"-->
<!-- dict-code="zy_style_model,model_number,model_number"></j-dict-select-tag>-->
<j-dict-select-tag v-model="model.stylemodelId" placeholder="请选择款式型号"
dictCode="modenumber"></j-dict-select-tag>
dictCode="modenumber" @change="gaibian"></j-dict-select-tag>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<!-- <a-input v-model="model.nums || this.nums" placeholder="请输入编号"></a-input>-->
<a-input v-model="model.nums" placeholder="请输入编号" disabled></a-input>
</a-form-model-item>
</a-col>
<!--<j-dict-select-tag v-model="model.modelSample" placeholder="请选择模块样板"-->
<!-- dict-code="zy_module_sample, module_name, id"></j-dict-select-tag>-->
<!-- <j-search-select-tag v-model="model.modelSample" dict="zy_module_sample" dictText="module_name", dictCode="id" />-->
<!-- </a-form-model-item>-->
<a-col :span="24">
<a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<!-- <a-input v-model="model.userId" placeholder="请输入用户名"></a-input>-->
<j-dict-select-tag v-model="model.userId" placeholder="请输入用户名"
dict-code="sys_user,username,username"></j-dict-select-tag>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">-->
<!-- &lt;!&ndash; <a-input v-model="model.userId" placeholder="请输入用户名"></a-input>&ndash;&gt;-->
<!-- <j-dict-select-tag v-model="model.userId" placeholder="请输入用户名"-->
<!-- dict-code="sys_user,username,username"></j-dict-select-tag>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descr">
@ -81,7 +87,9 @@ export default {
selectedKey: '', // id
typeid: '', // ,
serialNumber: '', //
model: {},
model: {
nums:'',
},
labelCol: {
xs: {span: 24},
sm: {span: 5},
@ -93,12 +101,12 @@ export default {
confirmLoading: false,
/*效验规则*/
validatorRules: {
nums: [
//{pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{4}$/, message: '4wei'},
{ required:true, message: '编号不能为空'},
{ pattern: /^[0-9A-Za-z]{0,10}$/, message: '编号太长'},
//{pattern: /^(?=.*([0-9a-zA-Z]){5}).[A-Za-z0-9]+$/, message: ''},
],
// nums: [
// //{pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{4}$/, message: '4wei'},
// { required:true, message: ''},
// { pattern: /^[0-9A-Za-z]{0,20}$/, message: ''},
// //{pattern: /^(?=.*([0-9a-zA-Z]){5}).[A-Za-z0-9]+$/, message: ''},
// ],
styleId: [
{required: true, message: '款式不能为空'},
],
@ -117,6 +125,7 @@ export default {
add: "/zyclothsample/zyClothSample/add",
edit: "/zyclothsample/zyClothSample/edit",
queryById: "/zyclothsample/zyClothSample/queryById",
sort:"/zyclothsample/zyClothSample/sort"
}
}
},
@ -141,7 +150,19 @@ export default {
this.edit(this.modelDefault);
},
//
gaibian(){
var n=3;
console.log(this.model)
getAction(this.url.sort,this.model).then((res)=>{
console.log(res)
var num=parseInt(res.result,10)+1
num=num.toString()
while(num.length<n){
num="0"+num
}
this.model.nums=this.model.styleId+this.model.stylemodelId+num;
console.log( this.model.nums)
})},
// select
handleSelect(selectedKeys) {
this.selectedKey = selectedKeys;

@ -34,8 +34,8 @@
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">
<a-input v-model="model.styleNames" placeholder="请输入名称" ></a-input>
<a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">
<a-input v-model="model.styleNames" placeholder="请输入款式名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">

@ -38,13 +38,13 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('款式辅料管理')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- <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>
<!-- <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">

@ -5,7 +5,7 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col>
<a-button type="primary">{{biaoTi}}款式工序管理</a-button>
<a-button type="primary">{{biaoTi}}</a-button>
</a-col>
</a-row>
</a-form>
@ -16,13 +16,13 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('款式工序表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- <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>
<!-- <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">

@ -3,6 +3,7 @@
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row>
</a-row>
</a-form>
</div>
@ -160,7 +161,7 @@ export default {
},
//
loadParameter() {
if (this.loadRouteType == false) {
if (this.loadRouteType === false) {
this.styleId = this.$route.query.styleId;
console.log(this.styleId)
this.loadRouteType = true;

@ -19,7 +19,6 @@
name: 'ZyStyleModularModal',
components: {
ZyProcessList,
},
data () {
return {
@ -40,7 +39,7 @@
},
methods: {
add () {
this.model.styleId=this.$route.query.id;
this.model.styleId=this.$route.query.id;
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();

@ -20,6 +20,7 @@ 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.fabric.entity.ZyFabric;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@ -83,6 +84,12 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
@ApiOperation(value="zy_accessories-添加", notes="zy_accessories-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyAccessories zyAccessories) {
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("contents",zyAccessories.getContents());
int a= zyAccessoriesService.count(queryWrapper);
if(a>=1){
return Result.error("名称重复,请修改后重试!!");
}
zyAccessoriesService.save(zyAccessories);
return Result.OK("添加成功!");
}
@ -97,6 +104,12 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
@ApiOperation(value="zy_accessories-编辑", notes="zy_accessories-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ZyAccessories zyAccessories) {
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("contents",zyAccessories.getContents());
int a= zyAccessoriesService.count(queryWrapper);
if(a>=1){
return Result.error("名称重复,请修改后重试!!");
}
zyAccessoriesService.updateById(zyAccessories);
return Result.OK("编辑成功!");
}
@ -168,5 +181,14 @@ public class ZyAccessoriesController extends JeecgController<ZyAccessories, IZyA
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ZyAccessories.class);
}
@AutoLog(value = "排序")
@ApiOperation(value="排序", notes="排序")
@GetMapping(value = "/sort")
public Result<?> sort(@RequestParam(name="id",required=true) String id) {
String s=zyAccessoriesService.findSort(id);
if(s==null){
return Result.OK(0);
}else
return Result.OK(s.substring(6));
}
}

@ -83,6 +83,11 @@ public class ZyAccessoriesTypeController extends JeecgController<ZyAccessoriesTy
@ApiOperation(value="zy_accessories_type-添加", notes="zy_accessories_type-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyAccessoriesType zyAccessoriesType) {
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("contents",zyAccessoriesType.getContents());
int a=zyAccessoriesTypeService.count(queryWrapper);
if(a!=0)
return Result.error("名称重复,请重试!!!");
zyAccessoriesTypeService.save(zyAccessoriesType);
return Result.OK("添加成功!");
}
@ -169,4 +174,13 @@ public class ZyAccessoriesTypeController extends JeecgController<ZyAccessoriesTy
return super.importExcel(request, response, ZyAccessoriesType.class);
}
@GetMapping(value = "/weiyi")
public Result<?> weiyi() {
String a=zyAccessoriesTypeService.sort();
if(a==null){
return Result.ok(0);
}
return Result.ok(a);
}
}

@ -38,7 +38,7 @@ public class ZyAccessories implements Serializable {
/**类型id*/
@Excel(name = "类型id", width = 15)
@ApiModelProperty(value = "类型id")
@Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id")
@Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "nums")
private java.lang.String typeId;
/**编号*/
@Excel(name = "编号", width = 15)

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ZyAccessoriesMapper extends BaseMapper<ZyAccessories> {
@Select("select nums from zy_accessories where type_id=#{id} order by nums desc limit 0,1 ")
String findSort(String id);
}

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.accessories.entity.ZyAccessoriesType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ZyAccessoriesTypeMapper extends BaseMapper<ZyAccessoriesType> {
@Select("select nums from zy_accessories_type order by nums desc limit 0,1")
String sort();
}

@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IZyAccessoriesService extends IService<ZyAccessories> {
String findSort(String id);
}

@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IZyAccessoriesTypeService extends IService<ZyAccessoriesType> {
String sort();
}

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.service.impl;
import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
import org.jeecg.modules.demo.accessories.mapper.ZyAccessoriesMapper;
import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ZyAccessoriesServiceImpl extends ServiceImpl<ZyAccessoriesMapper, ZyAccessories> implements IZyAccessoriesService {
@Autowired
ZyAccessoriesMapper zyAccessoriesMapper;
@Override
public String findSort(String id) {
return zyAccessoriesMapper.findSort(id);
}
}

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.accessories.service.impl;
import org.jeecg.modules.demo.accessories.entity.ZyAccessoriesType;
import org.jeecg.modules.demo.accessories.mapper.ZyAccessoriesTypeMapper;
import org.jeecg.modules.demo.accessories.service.IZyAccessoriesTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ZyAccessoriesTypeServiceImpl extends ServiceImpl<ZyAccessoriesTypeMapper, ZyAccessoriesType> implements IZyAccessoriesTypeService {
@Autowired
ZyAccessoriesTypeMapper zyAccessoriesTypeMapper;
@Override
public String sort() {
return zyAccessoriesTypeMapper.sort();
}
}

@ -357,5 +357,15 @@ public class ZyFabricController extends JeecgController<ZyFabric, IZyFabricServi
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ZyFabric.class);
}
@AutoLog(value = "排序")
@ApiOperation(value="排序", notes="排序")
@GetMapping(value = "/sort")
public Result<?> sort(ZyFabric zyFabric) {
String s=zyFabricService.findSort(zyFabric.getTypeId(),zyFabric.getMaterial());
if(s==null){
return Result.OK(0);
}else
return Result.OK(s.substring(6));
}
}

@ -201,4 +201,13 @@ public class ZyFabricTypeController extends JeecgController<ZyFabricType, IZyFab
return super.importExcel(request, response, ZyFabricType.class);
}
@GetMapping(value = "/weiyi")
public Result<?> weiyi(@RequestParam(name="id",required=true) String id) {
String a=zyFabricTypeService.sort();
if(a==null){
return Result.ok(0);
}
return Result.ok(a);
}
}

@ -67,7 +67,7 @@ public class ZyFabric implements Serializable {
private java.lang.String imageUrl;
/**面料类型id*/
@Excel(name = "类型", width = 15 , dictTable = "zy_fabric_type", dicText = "content", dicCode = "id")
@Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "id")
@Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "nums")
@ApiModelProperty(value = "类型")
private java.lang.String typeId;

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.fabric.entity.ZyFabric;
import org.jeecg.modules.demo.statistic.vo.StaticDayVo;
@ -53,4 +54,7 @@ public interface ZyFabricMapper extends BaseMapper<ZyFabric> {
@Select("select id from zy_fabric_type where content like #{s}")
List<String> findAllid(String s);
@Select("select fabric_number from zy_fabric where type_id=#{typeId} and material=#{material} order by fabric_number desc limit 0,1")
String findSort(@Param("typeId") String typeId, @Param("material") String material);
}

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.fabric.entity.ZyFabricType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ZyFabricTypeMapper extends BaseMapper<ZyFabricType> {
@Select("select nums from zy_fabric_type order by nums desc limit 0,1")
String sort();
}

@ -70,4 +70,6 @@ public interface IZyFabricService extends IService<ZyFabric> {
public StaticThreeVo staticThreeNum();
List<String> findAllId(String s);
String findSort(String typeId, String material);
}

@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IZyFabricTypeService extends IService<ZyFabricType> {
String sort();
}

@ -180,6 +180,11 @@ public class ZyFabricServiceImpl extends ServiceImpl<ZyFabricMapper, ZyFabric> i
return zyFabricMapper.findAllid(s);
}
@Override
public String findSort(String typeId, String material) {
return zyFabricMapper.findSort(typeId,material);
}
/**
* 逻辑单个货品的扫码出库旧的删掉对应的库存表中的库存减一生成新的二维码
* @param fabric

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.fabric.service.impl;
import org.jeecg.modules.demo.fabric.entity.ZyFabricType;
import org.jeecg.modules.demo.fabric.mapper.ZyFabricTypeMapper;
import org.jeecg.modules.demo.fabric.service.IZyFabricTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ZyFabricTypeServiceImpl extends ServiceImpl<ZyFabricTypeMapper, ZyFabricType> implements IZyFabricTypeService {
@Autowired
ZyFabricTypeMapper zyFabricTypeMapper;
@Override
public String sort() {
return zyFabricTypeMapper.sort();
}
}

@ -68,5 +68,5 @@ public class ZyStyleModular implements Serializable {
/**序号*/
@Excel(name = "序号", width = 15,dicCode = "序号")
@ApiModelProperty(value = "序号")
private Integer order;
private Integer serialnumber;
}

@ -167,5 +167,10 @@ public class ZyClothActionController extends JeecgController<ZyClothAction, IZyC
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ZyClothAction.class);
}
@GetMapping(value = "/sort")
public Result<?> sort(){
String s=zyClothActionService.sort();
return Result.ok(s.substring(1));
}
}

@ -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;
@ -88,6 +89,16 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
@ApiOperation(value = "zy_cloths_component-添加", notes = "zy_cloths_component-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyClothsComponent zyClothsComponent) {
//编码规则:服装类型(10)+序号(8)
zyClothsComponent.setNums(zyClothsComponentService.generateNumber(zyClothsComponent));
//部件名称不能重复
LambdaQueryWrapper<ZyClothsComponent> queryWrapper = new LambdaQueryWrapper<>();
List<ZyClothsComponent> zyClothsComponentList = zyClothsComponentService.list(queryWrapper);
for (ZyClothsComponent zy : zyClothsComponentList) {
if (zyClothsComponent.getPartsName().equals(zy.getPartsName())){
return Result.error("添加失败!数据已存在");
}
}
zyClothsComponentService.save(zyClothsComponent);
return Result.OK("添加成功!");
}

@ -12,6 +12,7 @@ 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 org.jeecg.modules.demo.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyClothsModular;
import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.service.IZyClothsModularService;
@ -105,6 +106,13 @@ public class ZyClothsModularController extends JeecgController<ZyClothsModular,
public Result<?> add(@RequestBody ZyClothsModular zyClothsModular) {
//nums,编号,varchar,18,非空,不重复,编码规则:服装类型(10)+序号(8)
zyClothsModular.setNums(zyClothsModularService.generateNumber(zyClothsModular));
//模块名称不能重复
List<ZyClothsModular> zyClothsModularList = zyClothsModularService.list();
for (ZyClothsModular zy : zyClothsModularList) {
if (zyClothsModular.getModularName().equals(zy.getModularName())){
return Result.error("添加失败!模块名称已存在");
}
}
zyClothsModularService.save(zyClothsModular);
return Result.OK("添加成功!");
}

@ -9,6 +9,7 @@ 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;
@ -27,6 +28,7 @@ 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.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@ -36,133 +38,144 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
/**
* @Description: zy_cloths_type
* @Author: jeecg-boot
* @Date: 2021-11-10
* @Date: 2021-11-10
* @Version: V1.0
*/
@Api(tags="zy_cloths_type")
@Api(tags = "zy_cloths_type")
@RestController
@RequestMapping("/base/zyClothsType")
@Slf4j
public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClothsTypeService> {
@Autowired
private IZyClothsTypeService zyClothsTypeService;
@Autowired
private IZyClothsTypeService zyClothsTypeService;
/**
* 分页列表查询
*
* @param zyClothsType
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "zy_cloths_type-分页列表查询")
@ApiOperation(value="zy_cloths_type-分页列表查询", notes="zy_cloths_type-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(ZyClothsType zyClothsType,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize);
IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param zyClothsType
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "zy_cloths_type-分页列表查询")
@ApiOperation(value = "zy_cloths_type-分页列表查询", notes = "zy_cloths_type-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(ZyClothsType zyClothsType,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize);
IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param zyClothsType
* @return
*/
@AutoLog(value = "zy_cloths_type-添加")
@ApiOperation(value="zy_cloths_type-添加", notes="zy_cloths_type-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyClothsType zyClothsType) {
zyClothsTypeService.save(zyClothsType);
return Result.OK("添加成功!");
}
/**
* 添加
*
* @param zyClothsType
* @return
*/
@AutoLog(value = "zy_cloths_type-添加")
@ApiOperation(value = "zy_cloths_type-添加", notes = "zy_cloths_type-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyClothsType zyClothsType) {
//类型名称输入时没有最大长度限制,提交时才提示。前端校验、后台校验
//type_name,类型名称,varchar,50,非空,同类型下不重复
String typeName = zyClothsType.getTypeName();
if (!StringUtils.hasText(typeName)) {
return Result.error("类型名称 不能为空");
}
if (typeName.length() > 10) {
return Result.error("类型名称长度不能超过10");
}
//生成编号 nums,编号,varchar,10,非空,不重复,企业缩写(4)+顺序号(6)在service层处理
zyClothsType.setNums(zyClothsTypeService.generateNumber());
zyClothsTypeService.save(zyClothsType);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param zyClothsType
* @return
*/
@AutoLog(value = "zy_cloths_type-编辑")
@ApiOperation(value="zy_cloths_type-编辑", notes="zy_cloths_type-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ZyClothsType zyClothsType) {
zyClothsTypeService.updateById(zyClothsType);
return Result.OK("编辑成功!");
}
/**
* 编辑
*
* @param zyClothsType
* @return
*/
@AutoLog(value = "zy_cloths_type-编辑")
@ApiOperation(value = "zy_cloths_type-编辑", notes = "zy_cloths_type-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ZyClothsType zyClothsType) {
zyClothsTypeService.updateById(zyClothsType);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "zy_cloths_type-通过id删除")
@ApiOperation(value="zy_cloths_type-通过id删除", notes="zy_cloths_type-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
zyClothsTypeService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "zy_cloths_type-通过id删除")
@ApiOperation(value = "zy_cloths_type-通过id删除", notes = "zy_cloths_type-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
zyClothsTypeService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "zy_cloths_type-批量删除")
@ApiOperation(value="zy_cloths_type-批量删除", notes="zy_cloths_type-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.zyClothsTypeService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "zy_cloths_type-批量删除")
@ApiOperation(value = "zy_cloths_type-批量删除", notes = "zy_cloths_type-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.zyClothsTypeService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "zy_cloths_type-通过id查询")
@ApiOperation(value="zy_cloths_type-通过id查询", notes="zy_cloths_type-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ZyClothsType zyClothsType = zyClothsTypeService.getById(id);
if(zyClothsType==null) {
return Result.error("未找到对应数据");
}
return Result.OK(zyClothsType);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "zy_cloths_type-通过id查询")
@ApiOperation(value = "zy_cloths_type-通过id查询", notes = "zy_cloths_type-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
ZyClothsType zyClothsType = zyClothsTypeService.getById(id);
if (zyClothsType == null) {
return Result.error("未找到对应数据");
}
return Result.OK(zyClothsType);
}
/**
* 导出excel
*
* @param request
* @param zyClothsType
*/
* 导出excel
*
* @param request
* @param zyClothsType
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ZyClothsType zyClothsType) {
return super.exportXls(request, zyClothsType, ZyClothsType.class, "制衣类型表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ZyClothsType.class);

@ -52,6 +52,12 @@ public class ZyClothsComponent implements Serializable {
@Excel(name = "图片地址", width = 15)
@ApiModelProperty(value = "图片地址")
private java.lang.String pictureUrl;
/**服装类型id*/
@Excel(name = "服装类型id", width = 15, dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id")
@Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id")
@ApiModelProperty(value = "服装类型id")
private java.lang.String clothsTypeId;
/**模块*/
@Excel(name = "模块", width = 15, dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id")
@Dict(dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id")

@ -179,7 +179,7 @@ public class ZyProcess implements Serializable {
*/
@Excel(name = "类型名称", width = 15)
@ApiModelProperty(value = "类型名称")
@Dict(dictTable = "zy_cloths_type", dicText = "zy_cloths_type", dicCode = "nums")
@Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "nums")
private java.lang.String styleId;
/**
* 工段代码

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.base.entity.ZyClothAction;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ZyClothActionMapper extends BaseMapper<ZyClothAction> {
@Select("select nums from zy_cloth_action order by nums desc limit 0,1")
String sort();
}

@ -22,4 +22,6 @@ public interface ZyClothsComponentMapper extends BaseMapper<ZyClothsComponent> {
public List<ZyClothsComponent> selectByModular(@Param("modular_id")String modular_id);
String getComponentNameById(String componentId);
List<String> selectNumsList2();
}

@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ZyClothsTypeMapper extends BaseMapper<ZyClothsType> {
List<String> selectNumsList();
}

@ -29,4 +29,8 @@
from zy_cloths_component
where id = #{componentId}
</select>
<select id="selectNumsList2" resultType="java.lang.String">
select nums
from zy_cloths_component
</select>
</mapper>

@ -2,4 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper">
<select id="selectNumsList" resultType="java.lang.String">
SELECT nums
FROM zy_cloths_type
</select>
</mapper>

@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IZyClothActionService extends IService<ZyClothAction> {
String sort();
}

@ -18,4 +18,7 @@ public interface IZyClothsComponentService extends IService<ZyClothsComponent> {
List<ZyProcessVo> selectList(String id);
public List<ZyClothsComponent> selectByModular(String modular_id);
/**编码规则:服装类型(10)+序号(8)*/
String generateNumber(ZyClothsComponent zyClothsComponent);
}

@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IZyClothsTypeService extends IService<ZyClothsType> {
/**nums,编号,varchar,10,非空,不重复,企业缩写(4)+顺序号(6)*/
String generateNumber();
}

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.service.impl;
import org.jeecg.modules.demo.base.entity.ZyClothAction;
import org.jeecg.modules.demo.base.mapper.ZyClothActionMapper;
import org.jeecg.modules.demo.base.service.IZyClothActionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ZyClothActionServiceImpl extends ServiceImpl<ZyClothActionMapper, ZyClothAction> implements IZyClothActionService {
@Autowired
ZyClothActionMapper zyClothActionMapper;
@Override
public String sort() {
return zyClothActionMapper.sort();
}
}

@ -2,16 +2,23 @@ package org.jeecg.modules.demo.base.service.impl;
import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyClothsModular;
import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper;
import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper;
import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
/**
* @Description: zy_cloths_component
@ -21,8 +28,10 @@ import java.util.List;
*/
@Service
public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentMapper, ZyClothsComponent> implements IZyClothsComponentService {
@Autowired
@Resource
private ZyClothsComponentMapper zyClothsComponentMapper;
@Resource
ZyClothsTypeMapper zyClothsTypeMapper;
@Override
public List<ZyProcessVo> selectList(String id) {
@ -30,9 +39,43 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM
List<ZyProcessVo> zyProcessVoList=baseMapper.selectProcessVo(list);
return zyProcessVoList;
}
@Override
public List<ZyClothsComponent> selectByModular(String modular_id) {
return zyClothsComponentMapper.selectByModular(modular_id);
}
/**
* 编码规则服装类型10+序号8
*/
@Override
public String generateNumber(ZyClothsComponent zyClothsComponent) {
String nums = zyClothsComponent.getClothsTypeId();
ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums);
String nums1 = zyClothsType.getNums();
//String substring = nums.substring(nums.length() - 10);
String format = String.format("%06d", orderNumber());
return nums1 + format;
}
private Long orderNumber() {
List<String> listString = zyClothsComponentMapper.selectNumsList2();
//System.err.println(listString);
List<Long> listLong = new ArrayList<>();
for (String nums : listString) {
String REGEX = "[^0-9]";
String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim();
if (!StringUtils.hasText(newNums)){
newNums = "0";
}
if (newNums.length() > 8) {
String substring = nums.substring(nums.length() - 8);
listLong.add(Long.valueOf(substring));
}else {
listLong.add(Long.valueOf(newNums));
}
}
System.out.println(listLong);
return Collections.max(listLong)+1;
}
}

@ -1,7 +1,9 @@
package org.jeecg.modules.demo.base.service.impl;
import org.jeecg.modules.demo.base.entity.ZyClothsModular;
import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper;
import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper;
import org.jeecg.modules.demo.base.service.IZyClothsModularService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -24,6 +26,8 @@ import java.util.regex.Pattern;
public class ZyClothsModularServiceImpl extends ServiceImpl<ZyClothsModularMapper, ZyClothsModular> implements IZyClothsModularService {
@Resource
private ZyClothsModularMapper zyClothsModularMapper;
@Resource
ZyClothsTypeMapper zyClothsTypeMapper;
@Override
public List<ZyClothsModular> selectByType(String cloths_type_id) {
@ -36,9 +40,11 @@ public class ZyClothsModularServiceImpl extends ServiceImpl<ZyClothsModularMappe
@Override
public String generateNumber(ZyClothsModular zyClothsModular) {
String nums = zyClothsModular.getClothsTypeId();
String substring = nums.substring(nums.length() - 10);
String format = String.format("%08d", orderNumber());
return substring + format;
ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums);
String nums1 = zyClothsType.getNums();
// String substring = nums.substring(nums.length() - 10);
String format = String.format("%06d", orderNumber());
return nums1 + format;
}

@ -6,6 +6,13 @@ import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
/**
* @Description: zy_cloths_type
@ -16,4 +23,44 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ZyClothsTypeServiceImpl extends ServiceImpl<ZyClothsTypeMapper, ZyClothsType> implements IZyClothsTypeService {
@Resource
ZyClothsTypeMapper zyClothsTypeMapper;
/**
* nums编号varchar10非空不重复企业缩写4+顺序号6
*/
@Override
public String generateNumber() {
//先拿到类型编号
String nums = "QIYE";
//再来一个顺序号
String format = String.format("%06d", orderNumber());
//生成编码
String result = nums + format;
System.err.println(result);
return nums + format;
}
private Long orderNumber() {
List<String> listString = zyClothsTypeMapper.selectNumsList();
System.out.println(listString);
List<Long> listLong = new ArrayList<>();
for (String nums : listString) {
System.err.println(nums);
String REGEX = "[^0-9]";
//只要数字
String newNums = Pattern.compile(REGEX).matcher(nums).replaceAll("").trim();
System.err.println(newNums);
if (!StringUtils.hasText(newNums)){
newNums = "0";
}
if (newNums.length() > 6) {
//拿到后6位
String substring = newNums.substring(newNums.length() - 6);
listLong.add(Long.valueOf(substring));
}else {
listLong.add(Long.valueOf(newNums));
}
}
return Collections.max(listLong)+1;
}
}

@ -109,13 +109,17 @@ public class ZyProcessAccessoriesController extends JeecgController<ZyProcessAcc
@ApiOperation(value="面料表-添加", notes="面料表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyProcessAccessories zyProcessAccessories) {
String[] split = zyProcessAccessories.getAccessoriesId().split(",");
for (String k : split) {
zyProcessAccessories.setAccessoriesId(k);
QueryWrapper s=new QueryWrapper();
s.eq("process_id",zyProcessAccessories.getProcessId());
s.eq("accessories_id",zyProcessAccessories.getAccessoriesId());
int a=zyProcessAccessoriesService.count(s);
if(a>=1)
return Result.error("已存在本信息");
if(a==0)
zyProcessAccessoriesService.save(zyProcessAccessories);
zyProcessAccessories.setId(null);
}
return Result.OK("添加成功!");
}

@ -108,13 +108,18 @@ public class ZyProcessActionController extends JeecgController<ZyProcessAction,
@ApiOperation(value="zy_process_action-添加", notes="zy_process_action-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyProcessAction zyProcessAction) {
QueryWrapper s=new QueryWrapper();
s.eq("process_id",zyProcessAction.getProcessId());
s.eq("action_id",zyProcessAction.getActionId());
int a=zyProcessActionService.count(s);
if(a>=1)
return Result.error("已存在本信息");
zyProcessActionService.save(zyProcessAction);
String[] split = zyProcessAction.getActionId().split(",");
for (String k : split) {
zyProcessAction.setActionId(k);
QueryWrapper s=new QueryWrapper();
s.eq("process_id",zyProcessAction.getProcessId());
s.eq("action_id",zyProcessAction.getActionId());
int a=zyProcessActionService.count(s);
if(a==0)
zyProcessActionService.save(zyProcessAction);
zyProcessAction.setId(null);
}
return Result.OK("添加成功!");
}
@ -205,5 +210,22 @@ public class ZyProcessActionController extends JeecgController<ZyProcessAction,
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ZyProcessAction.class);
}
@AutoLog(value = "排序")
@ApiOperation(value="排序", notes="排序")
@GetMapping(value = "/up")
public Result<?> shang(@RequestParam(name="id",required=true) String id) {
zyProcessActionService.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=zyProcessActionService.findSort(id);
if(a==0)
return Result.error("当前已经是最低级别!!!");
zyProcessActionService.down(id);
return Result.ok("降序成功");
}
}

@ -106,13 +106,17 @@ public class ZyProcessFabricController extends JeecgController<ZyProcessFabric,
@ApiOperation(value="zy_process_fabric-添加", notes="zy_process_fabric-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyProcessFabric zyProcessFabric) {
String[] split = zyProcessFabric.getFabricId().split(",");
for (String k : split) {
zyProcessFabric.setFabricId(k);
QueryWrapper s=new QueryWrapper();
s.eq("process_id",zyProcessFabric.getProcessId());
s.eq("fabric_id",zyProcessFabric.getFabricId());
int a=zyProcessFabricService.count(s);
if(a>=1)
return Result.error("已存在本信息");
if(a==0)
zyProcessFabricService.save(zyProcessFabric);
zyProcessFabric.setId(null);
}
return Result.OK("添加成功!");
}

@ -105,13 +105,17 @@ public class ZyProcessMachineController extends JeecgController<ZyProcessMachine
@ApiOperation(value="zy_process_machine-添加", notes="zy_process_machine-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyProcessMachine zyProcessMachine) {
String[] split = zyProcessMachine.getMachineId().split(",");
for (String k : split) {
zyProcessMachine.setMachineId(k);
QueryWrapper s=new QueryWrapper();
s.eq("process_id",zyProcessMachine.getProcessId());
s.eq("machine_id",zyProcessMachine.getMachineId());
int a=zyProcessMachineService.count(s);
if(a>=1)
return Result.error("已存在本信息");
if(a==0)
zyProcessMachineService.save(zyProcessMachine);
zyProcessMachine.setId(null);
}
return Result.OK("添加成功!");
}

@ -52,7 +52,7 @@ public class ZyProcessComponent implements Serializable {
/**序号*/
@Excel(name = "序号", width = 15,dicCode = "序号")
@ApiModelProperty(value = "序号")
private Integer order;
private Integer serialnumber;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.demo.base.entity.ZyClothAction;
import org.jeecg.modules.demo.pro.entity.ZyProcessAction;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -25,4 +26,12 @@ public interface ZyProcessActionMapper extends BaseMapper<ZyProcessAction> {
IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, @Param("p") String s, @Param("m") String t);
@Select("select * from zy_cloth_action where id in (select action_id from zy_process_action where process_id=#{id}) ")
List<ZyClothAction> selectByid(String id);
@Update("UPDATE zy_process_action SET sort_action=sort_action+1 WHERE id=#{id} ")
void up(String id);
@Update("UPDATE zy_process_action SET sort_action=sort_action-1 WHERE id=#{id} ")
void down(String id);
@Select("select sort_action from zy_process_action where id=#{id} ")
int findSort(String id);
}

@ -22,4 +22,10 @@ public interface IZyProcessActionService extends IService<ZyProcessAction> {
IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, String s, String t);
List<ZyClothAction> selectByid(String id);
void up(String id);
int findSort(String id);
void down(String id);
}

@ -39,4 +39,19 @@ public class ZyProcessActionServiceImpl extends ServiceImpl<ZyProcessActionMappe
public List<ZyClothAction> selectByid(String id) {
return zyProcessActionMapper.selectByid(id);
}
@Override
public void up(String id) {
zyProcessActionMapper.up(id);
}
@Override
public int findSort(String id) {
return zyProcessActionMapper.findSort(id);
}
@Override
public void down(String id) {
zyProcessActionMapper.down(id);
}
}

@ -119,6 +119,18 @@ public class ZyDevicetypeController extends JeecgController<ZyDevicetype, IZyDev
return Result.OK(pageList);
}
@AutoLog(value = "设备类型-分页列表查询")
@ApiOperation(value="设备类型-分页列表查询", notes="设备类型-分页列表查询")
@GetMapping(value = "/list1")
public Result<?> queryPageList1(ZyDevicetype zyDevicetype,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ZyDevicetype> queryWrapper = QueryGenerator.initQueryWrapper(zyDevicetype, req.getParameterMap());
Page<ZyDevicetype> page = new Page<ZyDevicetype>(pageNo, pageSize);
IPage<ZyDevicetype> pageList = zyDevicetypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**

@ -50,7 +50,6 @@ public class ZyOperationtoolController extends JeecgController<ZyOperationtool,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
//QueryWrapper<ZyOperationtool> queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap());
System.out.println("asdadad*********************************************");
String s=null,t=null;
if(zyOperationtool.getOperationid()!=null){
s="%"+zyOperationtool.getOperationid()+"%";
@ -89,13 +88,17 @@ public class ZyOperationtoolController extends JeecgController<ZyOperationtool,
@ApiOperation(value="工序工具-添加", notes="工序工具-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyOperationtool zyOperationtool) {
String[] split = zyOperationtool.getToolid().split(",");
for (String k : split) {
zyOperationtool.setToolid(k);
QueryWrapper s=new QueryWrapper();
s.eq("operationid",zyOperationtool.getOperationid());
s.eq("toolid",zyOperationtool.getToolid());
int a=zyOperationtoolService.count(s);
if(a>=1)
return Result.error("已存在本信息");
if(a==0)
zyOperationtoolService.save(zyOperationtool);
zyOperationtool.setId(null);
}
return Result.OK("添加成功!");
}

@ -20,6 +20,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface ZyOperationtoolMapper extends BaseMapper<ZyOperationtool> {
@Select("<script>select * from zy_operationtool <where><if test=\" p != null\">operationid in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and toolid in (select id from zy_tool_types where name like #{m})</if></where></script>")
IPage<ZyOperationtool> page(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
@Select("<script>select a.*,b.process_code,c.nums from zy_operationtool as a,zy_process as b,zy_tool as c <where>a.operationid=b.id and a.toolid=c.id and a.operationid =#{p}<if test=\" m != null\"> and toolid in (select id from zy_tool_types where name like #{m})</if></where></script>")
@Select("<script>select a.*,b.process_code,c.nums from zy_operationtool as a,zy_process as b,zy_tool as c <where>a.operationid=b.id and a.toolid=c.id and a.operationid =#{p}<if test=\" m != null\"> and toolid in (select id from zy_tool where name like #{m})</if></where></script>")
IPage<ZyOperationtool> page1(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
}

@ -65,5 +65,5 @@ public class ZyProcessModular implements Serializable {
/**序号*/
@Excel(name = "序号", width = 15,dicCode = "序号")
@ApiModelProperty(value = "序号")
private Integer order;
private Integer serialnumber;
}

@ -185,4 +185,15 @@ public class ZyClothSampleController extends JeecgController<ZyClothSample, IZyC
return super.importExcel(request, response, ZyClothSample.class);
}
@AutoLog(value = "排序")
@ApiOperation(value="排序", notes="排序")
@GetMapping(value = "/sort")
public Result<?> sort(ZyClothSample zyClothSample) {
String s=zyClothSampleService.findSort(zyClothSample.getStyleId(),zyClothSample.getStylemodelId());
if(s==null){
return Result.OK(0);
}else
return Result.OK(s.substring(21));
}
}

@ -47,7 +47,7 @@ public class ZyClothSample implements Serializable {
*/
@Excel(name = "款式", width = 15)
@ApiModelProperty(value = "款式")
@Dict(dicCode = "id",dictTable = "zy_cloths_style",dicText = "style_names")
@Dict(dicCode = "nums",dictTable = "zy_cloths_style",dicText = "style_names")
private String styleId;
/**型号*/
@Excel(name = "型号", width = 15)
@ -69,6 +69,7 @@ public class ZyClothSample implements Serializable {
/**用户*/
@Excel(name = "用户", width = 15)
@ApiModelProperty(value = "用户")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String userId;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

@ -3,6 +3,7 @@ package org.jeecg.modules.zyclothsample.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.zyclothsample.entity.ZyClothSample;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -15,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface ZyClothSampleMapper extends BaseMapper<ZyClothSample> {
@Select("select nums from zy_cloth_sample where style_id=#{styleId} and stylemodel_id=#{stylemodelId} order by nums desc limit 0,1")
String findSort(@Param("styleId") String styleId, @Param("stylemodelId") String stylemodelId);
}

@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IZyClothSampleService extends IService<ZyClothSample> {
String findSort(String styleId, String stylemodelId);
}

@ -3,6 +3,7 @@ package org.jeecg.modules.zyclothsample.service.impl;
import org.jeecg.modules.zyclothsample.entity.ZyClothSample;
import org.jeecg.modules.zyclothsample.mapper.ZyClothSampleMapper;
import org.jeecg.modules.zyclothsample.service.IZyClothSampleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ZyClothSampleServiceImpl extends ServiceImpl<ZyClothSampleMapper, ZyClothSample> implements IZyClothSampleService {
@Autowired
ZyClothSampleMapper zyClothSampleMapper;
@Override
public String findSort(String styleId, String stylemodelId) {
return zyClothSampleMapper.findSort(styleId,stylemodelId);
}
}

@ -3,6 +3,8 @@ package org.jeecg.modules.zyclothsstyle.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.bytedeco.javacpp.freenect;
import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.mapper.ZyClothsTypeMapper;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
@ -30,6 +32,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
@Resource
private ZyClothsStyleMapper zyClothsStyleMapper;
@Resource
ZyClothsTypeMapper zyClothsTypeMapper;
/**
* 生成编号 类型编号10位+顺序号8位
*
@ -39,12 +43,14 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
public String generateNumber(ZyClothsStyle zyClothsStyle) {
//先拿到类型编号
String nums = zyClothsStyle.getTypeId();
ZyClothsType zyClothsType = zyClothsTypeMapper.selectById(nums);
String nums1 = zyClothsType.getNums();
//截取后十位
String substring = nums.substring(nums.length() - 10);
//String substring = nums.substring(nums.length() - 10);
//再来一个顺序号
String format = String.format("%08d", orderNumber());
String format = String.format("%06d", orderNumber());
//生成编码
return substring + format;
return nums1 + format;
}
private Long orderNumber() {

Loading…
Cancel
Save