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

performance-web/src/main/java/com/clx/performance/config/PerformanceSmartCompanyNoConfig.java

+package com.clx.performance.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "performance.smart")
+@Getter
+@Setter
+public class PerformanceSmartCompanyNoConfig {
+    private Long companyNo;
+}

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

 package com.clx.performance.job;
 
+import com.clx.performance.config.PerformanceSmartCompanyNoConfig;
 import com.clx.performance.dao.AppDao;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderChildWeighPictureDao;
@@ -44,6 +45,9 @@ public class WeighingOderPictureJob implements InitializingBean {
     @Autowired
     private OrderChildWeighPictureDao pictureDao;
 
+    @Autowired
+    private PerformanceSmartCompanyNoConfig companyNoConfig;
+
     @Autowired
     private AppDao appDao;
     private App app;
@@ -95,6 +99,7 @@ public class WeighingOderPictureJob implements InitializingBean {
                 //通过运单号码查询电子磅单图片
                 WeighingSignatureAction weightAction = new WeighingSignatureAction();
                 weightAction.setChildNo(orderChild.getChildNo());
+                weightAction.setCompanyNo(companyNoConfig.getCompanyNo());
                 log.info("请求电子磅单参数,{}",weightAction);
                 Result<List<WeighingSignatureDto>> weighSignature = OpenClient.doAction(config, weightAction);
                 log.info("请求电子磅单返回结果,{}",weighSignature);