diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
index 22643f86..fe45a212 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
@@ -177,7 +177,7 @@
{
title:'供货商信息',
align:"center",
- dataIndex: 'supplierInfo'
+ dataIndex: 'supplierInfo_dictText'
},
{
title: '操作',
diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
index 88aa62ba..3716f4bf 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
@@ -52,9 +52,14 @@
+
+
+
+
+
-
+
@@ -104,6 +109,10 @@
contents: [
{ required: true, message: '请输入名称!'},
],
+ store: [
+ {
+ pattern: /^\d*\.?\d+$/,message:'请输入正数'
+ }],
},
url: {
add: "/accessories/zyAccessories/add",
diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
index f87c343b..83a5e190 100644
--- a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
@@ -63,12 +63,12 @@
-
+
-
+
@@ -83,7 +83,7 @@
-
+
@@ -189,6 +189,14 @@
name: [
{ required: true, message: '请输入名称!'},
],
+ money: [
+ { required: true, message: '请输入单价!'},
+ {pattern: /^\d+$/,message:'请输入正整数'}
+ ],
+ retailPrice: [
+ { required: true, message: '请输入零售价!'},
+ {pattern: /^\d+$/,message:'请输入正整数'}
+ ],
// money: [
// { required: false},
// { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
index e56374db..9a55745f 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
@@ -75,12 +75,15 @@
validatorRules: {
freq: [
{ required: true, message: '请输入频率!'},
+ {pattern: /^\d+$/,message:'请输入正整数'}
],
machineTmu: [
{ required: true, message: '请输入机器TMU!'},
+ {pattern: /^\d+$/,message:'请输入正整数'}
],
manualTmu: [
{ required: true, message: '请输入手工TMU!'},
+ {pattern: /^\d+$/,message:'请输入正整数'}
],
nums: [
{ required: true, message: '请输入编号!'},
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
index 03512483..b632d2ef 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
@@ -5,7 +5,12 @@
-
+
+
+
+
+
+
@@ -18,11 +23,7 @@
{{ typeId }}
-
-
-
-
-
+
@@ -62,6 +63,7 @@
data () {
return {
model:{
+ nums:''
},
typeId:"",
labelCol: {
@@ -88,7 +90,8 @@
url: {
add: "/base/zyClothsType/add",
edit: "/base/zyClothsType/edit",
- queryById: "/base/zyClothsType/queryById"
+ queryById: "/base/zyClothsType/queryById",
+ weiyi:"/base/zyClothsType/weiyi"
}
}
},
@@ -102,6 +105,20 @@
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
+ bianhao(){
+ var n=6
+ getAction(this.url.weiyi,null).then((res)=>{
+ var num=parseInt(res.result,10)+1
+ console.log(num)
+ num=num.toString()
+ while(num.length{
if(res.success){
+ this.loadData();
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
@@ -215,6 +221,7 @@
down(id){
getAction(this.url.down,{id:id}).then((res)=>{
if(res.success){
+ this.loadData();
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
index 8309243e..777262af 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
@@ -1,14 +1,14 @@
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -72,38 +65,38 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -112,12 +105,12 @@
-
-
+
+
-
+
@@ -153,12 +146,12 @@
-
+
-
+
@@ -168,37 +161,54 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -236,12 +246,30 @@
xs: { span: 24 },
sm: { span: 16 },
},
+ labelCol1: {
+ xs: { span: 24 },
+ sm: { span: 3 },
+ },
+ wrapperCol1: {
+ xs: { span: 24 },
+ sm: { span: 21 },
+ },
+ labelCol2: {
+ xs: { span: 24 },
+ sm: { span: 3 },
+ },
+ wrapperCol2: {
+ xs: { span: 24 },
+ sm: { span: 21 },
+ },
confirmLoading: false,
validatorRules: {
fabricNum: [
{ required: true, message: '请输入面料代码!'},
],
-
+ price:[{
+ pattern: /^\d*\.?\d+$/,message:'请输入正数'
+ },],
processCode: [
{ required: true, message: '请输入工序代码!'},
],
@@ -324,4 +352,9 @@
},
}
}
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal.vue
index ec080206..a12cb503 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal.vue
@@ -23,7 +23,7 @@
data () {
return {
title:'',
- width:800,
+ width:1000,
visible: false,
disableSubmit: false
}
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
index 258decea..5c7caa1c 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
@@ -67,6 +67,7 @@ public class ZyAccessories implements Serializable {
/**供货商信息*/
@Excel(name = "供货商信息", width = 15)
@ApiModelProperty(value = "供货商信息")
+ @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private java.lang.String supplierInfo;
/**创建人*/
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
index 5440da7a..3cfb88a5 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
@@ -96,7 +96,7 @@ public class ZyClothsTypeController extends JeecgController weiyi() {
+ String a=zyClothsTypeService.sort();
+ if(a==null){
+ return Result.OK("0");
+ }
+ return Result.OK(a.substring(4));
+ }
+
+
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
index 7ebf1bd1..f485abab 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
@@ -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.ZyClothsType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,4 +18,7 @@ public interface ZyClothsTypeMapper extends BaseMapper {
List selectNumsList();
List listByTypeId(String typeId);
+
+ @Select("select nums from zy_cloths_type where nums like 'QIYE%' order by nums desc limit 0,1 ")
+ String sort();
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
index 0f1b4359..5f17c12d 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
@@ -13,4 +13,6 @@ public interface IZyClothsTypeService extends IService {
/**nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）*/
String generateNumber();
+
+ String sort();
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
index 265a785b..ee8a39ab 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
@@ -40,6 +40,15 @@ public class ZyClothsTypeServiceImpl extends ServiceImpl listString = zyClothsTypeMapper.selectNumsList();
//System.out.println(listString);
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
index 7b9c6d07..9f57d9e5 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface ZyProcessActionMapper extends BaseMapper {
@Select("")
IPage page(Page page, @Param("p") String s, @Param("m") String t);
- @Select("")
+ @Select("")
IPage page1(Page 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 selectByid(String id);