Bladeren bron

首件-接口-追加订单号

wuzhenyue 3 jaren geleden
bovenliggende
commit
353e0bb06b

+ 3 - 0
application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleItemResult.java

@@ -66,6 +66,9 @@ public class FirstArticleItemResult implements Serializable {
 
 	@ApiModelProperty(value = "异常信息")
 	private String abnormal;
+	
+	@ApiModelProperty(value = "订单号")
+	private String orderNumber;
 
 	@TableField(exist = false)
 	@ApiModelProperty(value = "所属task状态-小程序用")

+ 3 - 0
application-facade/src/main/java/com/factory/web/entity/fa/req/AddFaItemResultReq.java

@@ -52,5 +52,8 @@ public class AddFaItemResultReq {
 	
 	@ApiModelProperty(value = "异常信息")
 	private String abnormal;
+	
+	@ApiModelProperty(value = "订单号")
+	private String orderNumber;
 
 }

+ 3 - 0
application-facade/src/main/java/com/factory/web/entity/fa/req/EditFaItemResultReq.java

@@ -53,4 +53,7 @@ public class EditFaItemResultReq {
 	@ApiModelProperty(value = "异常信息")
 	private String abnormal;
 	
+	@ApiModelProperty(value = "订单号")
+	private String orderNumber;
+	
 }

+ 3 - 0
application-facade/src/main/java/com/factory/web/entity/fa/res/FaItemListForPadRes.java

@@ -105,4 +105,7 @@ public class FaItemListForPadRes implements Serializable {
 	
 	@ApiModelProperty(value = "异常信息")
 	private String abnormal;
+	
+	@ApiModelProperty(value = "订单号")
+	private String orderNumber;
 }

+ 3 - 0
application-facade/src/main/java/com/factory/web/entity/fa/res/FaItemNoGoListRes.java

@@ -109,5 +109,8 @@ public class FaItemNoGoListRes implements Serializable {
 	
 	@ApiModelProperty(value = "异常信息")
 	private String abnormal;
+	
+	@ApiModelProperty(value = "订单号")
+	private String orderNumber;
 
 }

+ 3 - 0
application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -780,6 +780,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     itemInfo.setValDescCheck(firstArticleItemResult.getValDesc());
                     itemInfo.setToolDescCheck(firstArticleItemResult.getToolDesc());
                     itemInfo.setAbnormal(firstArticleItemResult.getAbnormal());
+                    itemInfo.setOrderNumber(firstArticleItemResult.getOrderNumber());
                 }
 
                 listRes.add(itemInfo);
@@ -866,6 +867,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     .sno(addFaItemResult.getSno())
                     .toolDesc(addFaItemResult.getToolDesc())
                     .abnormal(addFaItemResult.getAbnormal())
+                    .orderNumber(addFaItemResult.getOrderNumber())
                     .build();
             firstArticleItemResultService.save(firstArticleItemResult);
         }
@@ -1012,6 +1014,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     .sno(editFaItemResult.getSno())
                     .toolDesc(editFaItemResult.getToolDesc())
                     .abnormal(editFaItemResult.getAbnormal())
+                    .orderNumber(editFaItemResult.getOrderNumber())
                     .build();
             firstArticleItemResultService.updateById(firstArticleItemResult);
         }

+ 1 - 0
application-facade/src/main/resources/mapper/FirstArticleMapper.xml

@@ -178,6 +178,7 @@
 			fair.result,
 			fair.tool_desc AS tool_desc_check,
 			fair.abnormal,
+			fair.order_number,
 			fai.workshop_id,
 			fai.item_content,
 			fai.item_standard,