springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
@@ -9,7 +9,7 @@ @Data @TableName("`flowcard`") public class FlowCard { public class Flowcard { private Integer id;// 自增id private String flowcard;// 流程卡id private Integer number;// 玻璃数量 springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
@@ -9,7 +9,7 @@ @Data @TableName("`flowcard`") public class FlowCard { public class Flowcard { private Integer id;// 自增id private String flowcard;// 流程卡id private Integer number;// 玻璃数量 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -3,7 +3,7 @@ import org.apache.ibatis.annotations.*; import com.example.springboot.entity.CarPosition; import com.example.springboot.entity.FlowCard; import com.example.springboot.entity.Flowcard; import com.example.springboot.entity.GlassInfo; import com.example.springboot.entity.StorageCage; import com.example.springboot.entity.StorageTask; @@ -272,7 +272,7 @@ void StorageCageAddGlass(String cell, GlassInfo glassInfo); @Select("select * from flowcard where state!=2") List<FlowCard> SelectOrderTask(); List<Flowcard> SelectOrderTask(); @Select("select gi.*,sum(sc.number) as cageno from glassinfo gi left join storage_cage sc on gi.glasstype=sc.glasstype where gi.flowcard=#{flowcard} group by gi.id order by gi.mateid,gi.tier") List<GlassInfo> SelectOrderView(String flowcard); springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -14,7 +14,7 @@ import com.example.springboot.component.PLCAutoMes; import com.example.springboot.component.Plchome; import com.example.springboot.component.S7control; import com.example.springboot.entity.FlowCard; import com.example.springboot.entity.Flowcard; import com.example.springboot.entity.GlassInfo; import com.example.springboot.entity.Queue; import com.example.springboot.entity.StorageCage; @@ -289,9 +289,9 @@ } // 查询订单任务 public List<FlowCard> SelectOrderTask() { List<FlowCard> OrderTask = homeMapper.SelectOrderTask(); for (FlowCard flowcard : OrderTask) { public List<Flowcard> SelectOrderTask() { List<Flowcard> OrderTask = homeMapper.SelectOrderTask(); for (Flowcard flowcard : OrderTask) { flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard())); } return OrderTask;