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

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml

@@ -139,6 +139,8 @@
         FROM
         logpm_basicdata_client lbcc
         LEFT JOIN  logpm_basicdata_store_brand lbsbb ON lbcc.id = lbsbb.client_id
+        WHERE
+        lbsbb.is_deleted = 0
         GROUP BY
         lbcc.id
         ) AS t ON t.id = lbc.id

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml

@@ -6,7 +6,7 @@
     <select id="findRukuTime" resultType="java.util.Date">
         select create_time
         from ht_scan_log
-        where unit_no = #{unitNo} and warehouse_id = #{oldWarehouseId}
+        where unitNo = #{unitNo} and warehouse_id = #{oldWarehouseId}
         and type in (1,4)
         order by create_time desc
         limit 1

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml

@@ -118,7 +118,7 @@
         select ltlso.id id,
         ltlso.load_id loadId,
         ltlso.warehouse_id warehouseId,
-        lww.warehouse_name warehouseName,
+        lww.name warehouseName,
         ltlso.plan_num planNum,
         ltlso.load_sign_code loadSignCode,
         ltlso.sign_num signNum,

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -1834,6 +1834,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			updateMaterialList.add(updateMaterialEntity);
 		});
 
+		if(CollUtil.isNotEmpty(updateMaterialList)){
+			advanceDetailService.updateBatchById(updateMaterialList);
+		}
 
 		//排除importStandardOuPaiDTOS中orderPackageCode在hasOrderPackageCodeList中存在的元素
 		importStandardOuPaiDTOS = importStandardOuPaiDTOS.stream().filter(item -> !hasOrderPackageCodeList.contains(item.getOrderPackageCode())).collect(Collectors.toList());