Browse Source

1、常规参数工序卡1——字段备注修改

master
Aug 2 months ago
parent
commit
07fe6f7319
8 changed files with 23 additions and 23 deletions
  1. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/controller/WorkorderGeneralSteponeController.java
  2. +7
    -7
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/entity/WorkorderGeneralStepone.java
  3. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/mapper/WorkorderGeneralSteponeMapper.java
  4. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/service/IWorkorderGeneralSteponeService.java
  5. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/service/impl/WorkorderGeneralSteponeServiceImpl.java
  6. +4
    -4
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue/WorkorderGeneralSteponeList.vue
  7. +4
    -4
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue/modules/WorkorderGeneralSteponeForm.vue
  8. +4
    -4
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue3/WorkorderGeneralStepone.data.ts

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/controller/WorkorderGeneralSteponeController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/** /**
* @Description: 常规信息参数表_工序卡1(选配) * @Description: 常规信息参数表_工序卡1(选配)
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-28
* @Date: 2024-12-11
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags="常规信息参数表_工序卡1(选配)") @Api(tags="常规信息参数表_工序卡1(选配)")


+ 7
- 7
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/entity/WorkorderGeneralStepone.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/** /**
* @Description: 常规信息参数表_工序卡1(选配) * @Description: 常规信息参数表_工序卡1(选配)
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-28
* @Date: 2024-12-11
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@ -67,13 +67,13 @@ public class WorkorderGeneralStepone implements Serializable {
@Excel(name = "活塞料号2", width = 15) @Excel(name = "活塞料号2", width = 15)
@ApiModelProperty(value = "活塞料号2") @ApiModelProperty(value = "活塞料号2")
private java.lang.String piston2; private java.lang.String piston2;
/**片料号1*/
@Excel(name = "片料号1", width = 15)
@ApiModelProperty(value = "片料号1")
/**片料号1*/
@Excel(name = "片料号1", width = 15)
@ApiModelProperty(value = "片料号1")
private java.lang.String scribing1; private java.lang.String scribing1;
/**片料号2*/
@Excel(name = "片料号2", width = 15)
@ApiModelProperty(value = "片料号2")
/**片料号2*/
@Excel(name = "片料号2", width = 15)
@ApiModelProperty(value = "片料号2")
private java.lang.String scribing2; private java.lang.String scribing2;
/**中试作业员*/ /**中试作业员*/
@Excel(name = "中试作业员", width = 15) @Excel(name = "中试作业员", width = 15)


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/mapper/WorkorderGeneralSteponeMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @Description: 常规信息参数表_工序卡1(选配) * @Description: 常规信息参数表_工序卡1(选配)
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-28
* @Date: 2024-12-11
* @Version: V1.0 * @Version: V1.0
*/ */
public interface WorkorderGeneralSteponeMapper extends BaseMapper<WorkorderGeneralStepone> { public interface WorkorderGeneralSteponeMapper extends BaseMapper<WorkorderGeneralStepone> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/service/IWorkorderGeneralSteponeService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* @Description: 常规信息参数表_工序卡1(选配) * @Description: 常规信息参数表_工序卡1(选配)
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-28
* @Date: 2024-12-11
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IWorkorderGeneralSteponeService extends IService<WorkorderGeneralStepone> { public interface IWorkorderGeneralSteponeService extends IService<WorkorderGeneralStepone> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/service/impl/WorkorderGeneralSteponeServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/** /**
* @Description: 常规信息参数表_工序卡1(选配) * @Description: 常规信息参数表_工序卡1(选配)
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-28
* @Date: 2024-12-11
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service


+ 4
- 4
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue/WorkorderGeneralSteponeList.vue View File

@ -148,12 +148,12 @@
dataIndex: 'piston2' dataIndex: 'piston2'
}, },
{ {
title:'片料号1',
title:'片料号1',
align:"center", align:"center",
dataIndex: 'scribing1' dataIndex: 'scribing1'
}, },
{ {
title:'片料号2',
title:'片料号2',
align:"center", align:"center",
dataIndex: 'scribing2' dataIndex: 'scribing2'
}, },
@ -211,8 +211,8 @@
fieldList.push({type:'string',value:'cylinder2',text:'气缸料号2',dictCode:''}) fieldList.push({type:'string',value:'cylinder2',text:'气缸料号2',dictCode:''})
fieldList.push({type:'string',value:'piston1',text:'活塞料号1',dictCode:''}) fieldList.push({type:'string',value:'piston1',text:'活塞料号1',dictCode:''})
fieldList.push({type:'string',value:'piston2',text:'活塞料号2',dictCode:''}) fieldList.push({type:'string',value:'piston2',text:'活塞料号2',dictCode:''})
fieldList.push({type:'string',value:'scribing1',text:'片料号1',dictCode:''})
fieldList.push({type:'string',value:'scribing2',text:'片料号2',dictCode:''})
fieldList.push({type:'string',value:'scribing1',text:'片料号1',dictCode:''})
fieldList.push({type:'string',value:'scribing2',text:'片料号2',dictCode:''})
fieldList.push({type:'string',value:'operator',text:'中试作业员',dictCode:''}) fieldList.push({type:'string',value:'operator',text:'中试作业员',dictCode:''})
fieldList.push({type:'string',value:'templateId',text:'关联工单id',dictCode:"workorder_template,task_no,id"}) fieldList.push({type:'string',value:'templateId',text:'关联工单id',dictCode:"workorder_template,task_no,id"})
fieldList.push({type:'string',value:'stepId',text:'关联工序卡id',dictCode:"workorder_step,name,id"}) fieldList.push({type:'string',value:'stepId',text:'关联工序卡id',dictCode:"workorder_step,name,id"})


+ 4
- 4
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue/modules/WorkorderGeneralSteponeForm.vue View File

@ -29,13 +29,13 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="片料号1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scribing1">
<a-input v-model="model.scribing1" placeholder="请输入片料号1" ></a-input>
<a-form-model-item label="片料号1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scribing1">
<a-input v-model="model.scribing1" placeholder="请输入片料号1" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="片料号2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scribing2">
<a-input v-model="model.scribing2" placeholder="请输入片料号2" ></a-input>
<a-form-model-item label="片料号2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scribing2">
<a-input v-model="model.scribing2" placeholder="请输入片料号2" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">


+ 4
- 4
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderGeneralStepone/vue3/WorkorderGeneralStepone.data.ts View File

@ -30,12 +30,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'piston2' dataIndex: 'piston2'
}, },
{ {
title: '片料号1',
title: '片料号1',
align:"center", align:"center",
dataIndex: 'scribing1' dataIndex: 'scribing1'
}, },
{ {
title: '片料号2',
title: '片料号2',
align:"center", align:"center",
dataIndex: 'scribing2' dataIndex: 'scribing2'
}, },
@ -86,12 +86,12 @@ export const formSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
label: '片料号1',
label: '片料号1',
field: 'scribing1', field: 'scribing1',
component: 'Input', component: 'Input',
}, },
{ {
label: '片料号2',
label: '片料号2',
field: 'scribing2', field: 'scribing2',
component: 'Input', component: 'Input',
}, },


Loading…
Cancel
Save