1.修改货位导出

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

@@ -185,7 +185,7 @@
         SELECT
         ldsa.order_code orderCode,
         ldsa.mall_name mallName,
-        CONCAT(ldsa.customer_name, COALESCE(' (' || ldsa.customer_telephone || ')', ''))   customerName,
+        CONCAT(ldsa.customer_name, '(', ldsa.customer_telephone, ')')    customerName,
         GROUP_CONCAT(ldpl.material_name SEPARATOR '、') materialName,
         GROUP_CONCAT(ldpl.material_code SEPARATOR '、') materialCode,
         GROUP_CONCAT(ldpl.third_product SEPARATOR '、') thirdProduct,
@@ -237,9 +237,7 @@
         ldpl.firsts_code firstsCode,
         ldpl.second second,
         ldsa.mall_name mallName,
-
-
-        CONCAT(ldsa.customer_name, COALESCE(' (' || ldsa.customer_telephone || ')', ''))   customerName,
+        CONCAT(ldsa.customer_name, '(', ldsa.customer_telephone, ')')    customerName,
         ldpl.second_code secondCode,
         ldpl.third_product thirdProduct,
         ldpl.third_code thirdCode,
@@ -366,7 +364,7 @@
                  SELECT
                      ldsa.waybill_number waybillNumber,
                      ldsa.description_goods descriptionGoods,
-                    CONCAT(ldsa.consignee_person, COALESCE(' (' || ldsa.consignee_mobile || ')', ''))   consigneePerson,
+                        CONCAT(ldsa.consignee_person, '(', ldsa.consignee_mobile, ')')    consigneePerson,
                      CONCAT(lwug.position_code, '（', SUM(lwug.num), '）') positionInfo,
                      GROUP_CONCAT( lwtg.tray_code SEPARATOR ',' ) trayCode,
                      GROUP_CONCAT( lwug.create_user SEPARATOR ',' ) upUser,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java

@@ -21,10 +21,7 @@ import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.dto.app.queryOrderDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
-import com.logpm.distribution.vo.DistributionParcelListVO;
-import com.logpm.distribution.vo.DistributionParcelNumberVO;
-import com.logpm.distribution.vo.DistributionStockArticleVO;
-import com.logpm.distribution.vo.OrderPackgeCodeDataVO;
+import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.queryOrderVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
@@ -182,5 +179,5 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 
 	IPage<DistributionParcelListVO> getPackageListByStockArticleId(IPage<DistributionParcelListVO> page, Long orderId);
 
-	Object selectTemplate(List<Long> ids);
+	List<DistributionStockArticleQRCodeVO> selectTemplate(List<Long> ids);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -1149,8 +1149,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public Object selectTemplate(List<Long> ids) {
-		return null;
+	public List<DistributionStockArticleQRCodeVO> selectTemplate(List<Long> ids) {
+		ArrayList<DistributionStockArticleQRCodeVO> arrayList = new ArrayList<>();
+		for (Long id : ids) {
+			DistributionStockArticleQRCodeVO orderNoList = baseMapper.getOrderNoList(null,String.valueOf(id));
+			arrayList.add(orderNoList);
+		}
+		return arrayList;
 	}