Merge remote-tracking branch 'origin/test' into test

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

 package com.clx.performance.vo.app;
 
 import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.enums.OrderGoodsEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -241,10 +242,20 @@ public class OrderChildVO {
     @ApiModelProperty(value = "发货-是否需要系统排队 0 否  1 是")
     private Integer sendWaitSystem;
 
+    @ApiModelProperty(value = "发货-是否需要系统排队 描述：  需要 不需要")
+    public String getSendWaitSystemMsg() {
+        return OrderGoodsEnum.SendWaitSystemMsgEnum.getMsgByCode(sendWaitSystem);
+    }
+
     @ApiModelProperty(value = "发货-排队系统名称")
     private String sendWaitSystemName;
 
     @ApiModelProperty(value = "发货-排队系统形式  1:小程序  2:app")
     private Integer sendWaitMode;
 
+    @ApiModelProperty(value = "发货-排队系统形式 描述：  微信小程序  app")
+    public String getSendWaitModeMsg() {
+        return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(sendWaitMode);
+    }
+
 }

performance-web/src/main/java/com/clx/performance/job/WeighingOderPictureJob.java

@@ -105,7 +105,9 @@ public class WeighingOderPictureJob implements InitializingBean {
                 List<WeighingSignatureDto> weighSignatures = weighSignature.getData();
                 if (CollectionUtils.isNotEmpty(weighSignatures)) {
                     for(WeighingSignatureDto weighingSignatureDto:weighSignatures){
-                        pictures.add(pictureStruct.convert(weighingSignatureDto));//对象转换
+                        OrderChildWeighPicture picture = pictureStruct.convert(weighingSignatureDto);
+                        picture.setChildNo(orderChild.getChildNo());//对象转换
+                        pictures.add(picture);
                     }
                 }