Merge branch 'v20.6_carrier_station_pound_20240802' into test

performance-web/src/main/java/com/clx/performance/dao/OrderChildWeighPictureDao.java

@@ -4,6 +4,8 @@ import com.clx.performance.mapper.OrderChildWeighPictureMapper;
 import com.clx.performance.model.OrderChildWeighPicture;
 import com.msl.common.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * @author liruixin
  * Date 2024-08-02
@@ -11,4 +13,6 @@ import com.msl.common.dao.BaseDao;
  */
 public interface OrderChildWeighPictureDao extends BaseDao<OrderChildWeighPictureMapper, OrderChildWeighPicture, Integer> {
 
+    List<OrderChildWeighPicture> getImages(String childNo);
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildWeighPictureDaoImpl.java

@@ -6,6 +6,8 @@ import com.clx.performance.model.OrderChildWeighPicture;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author liruixin
  * Date 2024-08-02
@@ -13,4 +15,10 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderChildWeighPictureDaoImpl extends BaseDaoImpl<OrderChildWeighPictureMapper, OrderChildWeighPicture, Integer> implements OrderChildWeighPictureDao {
+    @Override
+    public List<OrderChildWeighPicture> getImages(String childNo) {
+        return list(lQrWrapper()
+                .eq(OrderChildWeighPicture::getChildNo, childNo)
+        );
+    }
 }

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

@@ -99,7 +99,7 @@ public class WeighingOderPictureJob implements InitializingBean {
                 //通过运单号码查询电子磅单图片
                 WeighingSignatureAction weightAction = new WeighingSignatureAction();
                 weightAction.setChildNo(orderChild.getChildNo());
-                weightAction.setCompanyNo(companyNoConfig.getCompanyNo());
+                weightAction.setCustomerRelationNo(String.valueOf(companyNoConfig.getCompanyNo()));
                 log.info("请求电子磅单参数,{}",weightAction);
                 Result<List<WeighingSignatureDto>> weighSignature = OpenClient.doAction(config, weightAction);
                 log.info("请求电子磅单返回结果,{}",weighSignature);

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -272,6 +272,10 @@ public class OrderChildServiceImpl implements OrderChildService {
     private ClxMessageOpenapiFeign clxMessageOpenapiFeign;
     @Autowired
     private ClxMessageConfig messageConfig;
+    @Autowired
+    private OrderChildWeighPictureDao pictureDao;
+
+
 
     @PostConstruct
     public void init(){
@@ -2161,6 +2165,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             result.setPoundRemark(orderChildPoundAuditDao.getPoundAuditDetail(childNo).orNull().getRemark());
         }
 
+        //首次回显过磅电子磅单，其他情况回显用户上传的图片
         List<OrderChildImage> imageList = orderChildImageDao.listLoadAndUnload(childNo).orElse(new ArrayList<>());
         result.setLoadImageList(imageList.stream().filter(
                 item -> Objects.equals(item.getType(), OrderChildImage.Type.LOAD.getCode())).map(
@@ -2169,6 +2174,13 @@ public class OrderChildServiceImpl implements OrderChildService {
                 item -> Objects.equals(item.getType(), OrderChildImage.Type.UNLOAD.getCode())).map(
                 item -> item.getImage()).collect(Collectors.toList()));
 
+        if(CollectionUtils.isEmpty(result.getUnloadImageList())){
+            List<OrderChildWeighPicture> images = pictureDao.getImages(childNo);
+            result.setUnloadImageList(images.stream().filter(
+                    item -> Objects.equals(item.getType(), 2)).map(
+                    item -> item.getOriginalImg()).collect(Collectors.toList()));
+        }
+
         result.setArriveSendTime(orderChild.getArriveSendTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveSendTime()));
         result.setFirstLoadTime(orderChild.getFirstLoadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstLoadTime()));
         result.setArriveReceiveTime(orderChild.getArriveReceiveTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveReceiveTime()));