zhc4dev
YTD 2 years ago
parent 3db2f6b37d
commit ad23078296
  1. 4
      ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue
  2. 4
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
  3. 10
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
  4. 4
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
  5. 12
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue
  6. 4
      ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue
  7. 4
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
  8. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java
  9. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAction.java
  10. 3
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessFabric.java
  11. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java
  12. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessAccessoriesMapper.java
  13. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
  14. 4
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessFabricMapper.java
  15. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java
  16. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/entity/ZyOperationtool.java
  17. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java

@ -141,7 +141,7 @@
{
title:'工序编号',
align:"center",
dataIndex: 'operationid'
dataIndex: 'processCode'
},
{
title:'工序',
@ -151,7 +151,7 @@
{
title:'工具编号',
align:"center",
dataIndex: 'toolid'
dataIndex: 'nums'
},
{
title:'工具',

@ -140,7 +140,7 @@
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
dataIndex: 'processCode'
},
{
title:'工序',
@ -150,7 +150,7 @@
{
title:'辅料编号',
align:"center",
dataIndex: 'accessoriesId'
dataIndex: 'nums'
},
{
title:'辅料',

@ -138,11 +138,21 @@
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processCode'
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'动作编号',
align:"center",
dataIndex: 'nums'
},
{
title:'动作',
align:"center",

@ -145,7 +145,7 @@
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
dataIndex: 'processCode'
},
{
title:'工序',
@ -155,7 +155,7 @@
{
title:'面料编号',
align:"center",
dataIndex: 'fabricId'
dataIndex: 'fabricNumber'
},
{
title:'面料',

@ -144,11 +144,11 @@
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
},
{
title:'工序编号',
align:"center",
dataIndex: 'processCode'
},
{
title:'工序',
align:"center",
@ -157,7 +157,7 @@
{
title:'设备编号',
align:"center",
dataIndex: 'machineId'
dataIndex: 'code'
},
{
title:'设备名称',

@ -99,7 +99,9 @@
{
title:'名称',
align:"center",
dataIndex: 'contents'
dataIndex: 'contents',
width:10,
colspan:2
},
{
title:'图片',

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

@ -65,5 +65,7 @@ public class ZyProcessAccessories implements Serializable {
@ApiModelProperty(value = "面料表id")
private String accessoriesId;
private String processCode;
private String nums;
}

@ -54,5 +54,7 @@ public class ZyProcessAction implements Serializable {
@ApiModelProperty(value = "创建时间")
private Date createTime;
private String processCode;
private String nums;
}

@ -50,4 +50,7 @@ public class ZyProcessFabric implements Serializable {
@ApiModelProperty(value = "创建时间")
private Date createTime;
private String processCode;
private String fabricNumber;
}

@ -49,4 +49,6 @@ public class ZyProcessMachine implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private Date createTime;
private String processCode;
private String code;
}

@ -24,6 +24,6 @@ public interface ZyProcessAccessoriesMapper extends BaseMapper<ZyProcessAccessor
List<ZyAccessories> selectByid(String id);
@Select("<script>select * from zy_process_accessories <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and accessories_id in (select id from zy_accessories where contents like #{m})</if></where></script>")
IPage<ZyProcessAccessories> page(Page<ZyProcessAccessories> page, @Param("p") String s, @Param("m") String t);
@Select("<script>select * from zy_process_accessories <where>process_id =#{p}<if test=\" m != null\"> and accessories_id in (select id from zy_accessories where contents like #{m})</if></where></script>")
@Select("<script>select a.*,b.process_code,c.nums from zy_process_accessories as a,zy_process as b,zy_accessories as c <where>a.process_id=b.id and a.accessories_id=c.id and a.process_id =#{p}<if test=\" m != null\"> and accessories_id in (select id from zy_accessories where contents like #{m})</if></where></script>")
IPage<ZyProcessAccessories> page1(Page<ZyProcessAccessories> page, @Param("p") String s, @Param("m") String t);
}

@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface ZyProcessActionMapper extends BaseMapper<ZyProcessAction> {
@Select("<script>select * from zy_process_action <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and action_id in (select id from zy_cloth_action where descr like #{m})</if></where></script>")
IPage<ZyProcessAction> page(Page<ZyProcessAction> page, @Param("p") String s, @Param("m") String t);
@Select("<script>select * from zy_process_action <where>process_id =#{p}<if test=\" m != null\"> and action_id in (select id from zy_cloth_action where descr like #{m})</if></where></script>")
@Select("<script>select a.*,b.process_code,c.nums from zy_process_action as a,zy_process as b,zy_cloth_action as c <where> a.process_id=b.id and a.action_id=c.id and a.process_id =#{p}<if test=\" m != null\"> and action_id in (select id from zy_cloth_action where descr like #{m})</if></where></script>")
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);

@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface ZyProcessFabricMapper extends BaseMapper<ZyProcessFabric> {
@Select("<script>select * from zy_process_fabric <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and fabric_id in (select id from zy_fabric where name like #{m})</if></where></script>")
@Select("<script>select a.*,b.process_code,c.fabric_number from zy_process_fabric as a,zy_process as b,zy_fabric as c <where><if test=\" p != null\">a.process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and a.fabric_id in (select id from zy_fabric where name like #{m})</if></where></script>")
IPage<ZyProcessFabric> page(Page<ZyProcessFabric> page, @Param("p") String s, @Param("m") String t);
@Select("<script>select * from zy_process_fabric <where>process_id =#{p}<if test=\" m != null\"> and fabric_id in (select id from zy_fabric where name like #{m})</if></where></script>")
@Select("<script>select a.*,b.process_code,c.fabric_number from zy_process_fabric as a,zy_process as b,zy_fabric as c <where>a.fabric_id=c.id and b.id=a.process_id and a.process_id =#{p}<if test=\" m != null\"> and a.fabric_id in (select id from zy_fabric where name like #{m})</if></where></script>")
IPage<ZyProcessFabric> page1(Page<ZyProcessFabric> page, @Param("p") String s, @Param("m") String t);
@Select("select * from zy_fabric where id in (select fabric_id from zy_process_fabric where process_id=#{id})")
List<ZyFabric> selectByid(String id);

@ -21,6 +21,6 @@ public interface ZyProcessMachineMapper extends BaseMapper<ZyProcessMachine> {
@Select("<script>select * from zy_process_machine <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
IPage<ZyProcessMachine> page(Page<ZyProcessMachine> page, @Param("p") String processId, @Param("m") String machineId);
@Select("<script>select * from zy_process_machine <where>process_id=#{p} <if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
@Select("<script>select a.*,b.process_code,c.code from zy_process_machine as a,zy_process as b,zy_devicetype as c <where> a.process_id=b.id and a.machine_id=c.id and a.process_id=#{p} <if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
IPage<ZyProcessMachine> page1(Page<ZyProcessMachine> page, @Param("p") String s, @Param("m") String t);
}

@ -70,8 +70,11 @@ public class ZyOperationtool implements Serializable {
// private String tools;
@Excel(name = "工具", width = 15, dictTable = "zy_tool_types", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_tool_types", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "工具")
private String toolid;
private String processCode;
private String nums;
}

@ -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 * from zy_operationtool <where>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_types where name like #{m})</if></where></script>")
IPage<ZyOperationtool> page1(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
}

Loading…
Cancel
Save