From 171a1f08e977bdfd2a31789d8945cc652d303de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Sun, 14 May 2023 08:47:13 +0800 Subject: [PATCH] 2023-05-14-01-bug --- .../impl/HangerLocationServiceImpl.java | 16 +- .../modules/workorder/entity/WorkOrder.java | 198 +++++++++--------- 2 files changed, 114 insertions(+), 100 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java index f9f831dc..cc7ba3a7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java @@ -19,6 +19,8 @@ import org.jeecg.modules.productplan.entity.ZyPlanProcess; import org.jeecg.modules.productplan.entity.ZyProductPlan; import org.jeecg.modules.productplan.mapper.ZyPlanProcessMapper; import org.jeecg.modules.productplan.mapper.ZyProductPlanMapper; +import org.jeecg.modules.workorder.entity.WorkOrder; +import org.jeecg.modules.workorder.mapper.WorkOrderMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +44,10 @@ public class HangerLocationServiceImpl extends ServiceImpl workList=workOrderMapper.selectBatchIds(woList); + // + List workCodeList=new ArrayList<>(); + for(WorkOrder wk:workList) + { + workCodeList.add(wk.getProductCode()); + } QueryWrapper qwProduct=new QueryWrapper<>(); - qwProduct.in("product_code",woList); + qwProduct.in("product_code",workCodeList); List productPlanList=zyProductPlanMapper.selectList(qwProduct); //查找有所传感器 QueryWrapper qws=new QueryWrapper<>(); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java index 46179645..ac991a91 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java @@ -1,99 +1,99 @@ -package org.jeecg.modules.workorder.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 工单订单完工 - * @Author: jeecg-boot - * @Date: 2023-01-07 - * @Version: V1.0 - */ -@Data -@TableName("work_order") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="work_order对象", description="工单订单完工") -public class WorkOrder implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - /**工单编号*/ - @Excel(name = "工单编号", width = 15) - @ApiModelProperty(value = "工单编号") - private String productCode; -// /**订单*/ -// @Excel(name = "订单", width = 15) -// @ApiModelProperty(value = "订单") -// private String ordersId; - /**原订单id*/ - @Excel(name = "订单", width = 15) - @Dict(dictTable = "zy_orders", dicText = "orders_num", dicCode = "id") - @ApiModelProperty(value = "订单") - private java.lang.String ordersId; - - /**订单商品*/ - @Excel(name = "订单商品", width = 15) - @ApiModelProperty(value = "订单商品") - private String orderGoodsId; - /**商品数量*/ - @Excel(name = "商品数量", width = 15) - @ApiModelProperty(value = "商品数量") - private Integer goodsNum; - /**下单时间*/ - @Excel(name = "下单时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "下单时间") - private Date orderTime; - /**交货期*/ - @Excel(name = "交货期", width = 15) - @ApiModelProperty(value = "交货期") - private Integer deliveryTime; - /**工单状态*/ - @Excel(name = "工单状态", width = 15, dicCode = "work_order_status") - @Dict(dicCode = "work_order_status") - @ApiModelProperty(value = "工单状态") - private Integer workOrderStatus; - /**企业*/ - @Excel(name = "企业", width = 15) - @Dict(dictTable = "sys_depart",dicText = "depart_name", dicCode = "id") - @ApiModelProperty(value = "企业") - private String enterprisesId; -} +package org.jeecg.modules.workorder.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 工单 + * @Author: jeecg-boot + * @Date: 2023-01-07 + * @Version: V1.0 + */ +@Data +@TableName("work_order") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="work_order对象", description="工单订单完工") +public class WorkOrder implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**工单编号*/ + @Excel(name = "工单编号", width = 15) + @ApiModelProperty(value = "工单编号") + private String productCode; +// /**订单*/ +// @Excel(name = "订单", width = 15) +// @ApiModelProperty(value = "订单") +// private String ordersId; + /**原订单id*/ + @Excel(name = "订单", width = 15) + @Dict(dictTable = "zy_orders", dicText = "orders_num", dicCode = "id") + @ApiModelProperty(value = "订单") + private java.lang.String ordersId; + + /**订单商品*/ + @Excel(name = "订单商品", width = 15) + @ApiModelProperty(value = "订单商品") + private String orderGoodsId; + /**商品数量*/ + @Excel(name = "商品数量", width = 15) + @ApiModelProperty(value = "商品数量") + private Integer goodsNum; + /**下单时间*/ + @Excel(name = "下单时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "下单时间") + private Date orderTime; + /**交货期*/ + @Excel(name = "交货期", width = 15) + @ApiModelProperty(value = "交货期") + private Integer deliveryTime; + /**工单状态*/ + @Excel(name = "工单状态", width = 15, dicCode = "work_order_status") + @Dict(dicCode = "work_order_status") + @ApiModelProperty(value = "工单状态") + private Integer workOrderStatus; + /**企业*/ + @Excel(name = "企业", width = 15) + @Dict(dictTable = "sys_depart",dicText = "depart_name", dicCode = "id") + @ApiModelProperty(value = "企业") + private String enterprisesId; +}