修改pc 备货问题

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.dto.DistributionAddvalueDTO;
-import com.logpm.distribution.dto.DistributionReservationStocklistDTO;
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.entity.DistributionSignPrintEntity;
 import com.logpm.distribution.entity.DistributionSignforEntity;
@@ -42,7 +41,6 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -292,12 +290,8 @@ public class DistributionSignforController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionSignfor")
 	public void exportDistributionSignfor(@ApiIgnore @RequestParam Map<String, Object> distributionSignfor, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionSignforEntity> queryWrapper = Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionSignfor::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionSignforEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionSignforExcel> list = distributionSignforService.exportDistributionSignfor(queryWrapper);
+
+		List<DistributionSignforExcel> list = distributionSignforService.exportDistributionSignfor(distributionSignfor);
 		ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "签收管理数据表", list, DistributionSignforExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java

@@ -41,48 +41,7 @@ public class DistributionSignforExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+
 	/**
 	 * 订单自编号;订单关联id
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java

@@ -57,7 +57,7 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionSignforExcel> exportDistributionSignfor(@Param("ew") Wrapper<DistributionSignforEntity> queryWrapper);
+	List<DistributionSignforVO> exportDistributionSignfor(@Param("ew") Wrapper<DistributionSignforEntity> queryWrapper);
 	/**
 	 * 订单总数
 	 *

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -376,7 +376,7 @@
     </select>
 
 
-    <select id="exportDistributionSignfor" resultType="com.logpm.distribution.excel.DistributionSignforExcel">
+    <select id="exportDistributionSignfor" resultType="com.logpm.distribution.vo.DistributionSignforVO">
         SELECT * FROM logpm_distribution_signfor ${ew.customSqlSegment}
     </select>
     <select id="selectOrdersNub" resultType="java.lang.Integer">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml

@@ -115,7 +115,9 @@
     </select>
     <select id="getBillOrderDetail" resultType="com.logpm.distribution.vo.DistributionBillOrderVO">
 
-        select DISTINCT ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus,ldsa.hand_quantity handQuantity,
+        select DISTINCT ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus,
+        (select COUNT(id) from  logpm_distrilbution_bill_package
+        where  stock_article_id = ldsa.id and packet_bar_status in (1,3)) handQuantity,
         (select GROUP_CONCAT(IFNULL(ldpl.material_name , '') SEPARATOR ', ')
         from logpm_distribution_parcel_list ldpl
         where  ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id)   materialName,

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

@@ -16,7 +16,6 @@
  */
 package com.logpm.distribution.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.logpm.distribution.bean.Resp;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionAddvalueDTO;
@@ -57,10 +56,9 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
-	 * @return
+	 * @param distributionSignfor@return
 	 */
-	List<DistributionSignforExcel> exportDistributionSignfor(Wrapper<DistributionSignforEntity> queryWrapper);
+	List<DistributionSignforExcel> exportDistributionSignfor(Map<String, Object> distributionSignfor);
 	/**
 	 * 签收订单统计
 	 *

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

@@ -16,7 +16,6 @@
  */
 package com.logpm.distribution.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -50,16 +49,18 @@ import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.loading.LoadScanSigningStatusConstant;
 import org.springblade.common.constant.loading.LoadingIsInsertConstant;
 import org.springblade.common.constant.loading.LoadingStatusConstant;
-import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.*;
 import org.springblade.common.constant.reservation.*;
 import org.springblade.common.constant.signing.SignforDriverSigningStatusConstant;
 import org.springblade.common.serviceConstant.ServiceConstant;
 import org.springblade.common.utils.GaoDeApiUtil;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.feign.IDictBizClient;
 import org.springframework.beans.BeanUtils;
@@ -69,7 +70,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -152,12 +152,34 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 
 	@Override
-	public List<DistributionSignforExcel> exportDistributionSignfor(Wrapper<DistributionSignforEntity> queryWrapper) {
-		List<DistributionSignforExcel> distributionSignforList = baseMapper.exportDistributionSignfor(queryWrapper);
-		//distributionSignforList.forEach(distributionSignfor -> {
-		//	distributionSignfor.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionSignfor.getType()));
-		//});
-		return distributionSignforList;
+	public List<DistributionSignforExcel> exportDistributionSignfor(Map<String, Object> distributionSignfor) {
+
+
+		Object o = distributionSignfor.get("ids");
+		if(ObjectUtils.isNotNull(o)){
+			distributionSignfor.remove("ids");
+		}
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtils.isNull()){
+			throw new ServiceException("请选择仓库！");
+		}
+
+		QueryWrapper<DistributionSignforEntity> queryWrapper = Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class);
+		queryWrapper.lambda().eq(DistributionSignforEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		if(ObjectUtils.isNotNull(o)){
+			queryWrapper.in("id",String.valueOf(o).split(","));
+		}
+		queryWrapper.eq("warehouse_id",myCurrentWarehouse.getId());
+		List<DistributionSignforVO> distributionSignforList = baseMapper.exportDistributionSignfor(queryWrapper);
+		List<DistributionSignforExcel> list = new ArrayList<>();
+		distributionSignforList.forEach(d -> {
+//			distributionSignfor.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionSignfor.getType()));
+			DistributionSignforExcel signforExcel = new DistributionSignforExcel();
+			BeanUtils.copyProperties(d,signforExcel);
+//			signforExcel.setConsignee();
+			list.add(signforExcel);
+		});
+		return list;
 	}
 
 	@Override

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

@@ -61,6 +61,9 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 	private IDistributionParcelListService distributionParcelListService;
 
 	private IDistributionReservationService distributionReservationService;
+	private IDistributionReservationPackageService distributionReservationPackageService;
+
+	private IDistrilbutionBillPackageService distrilbutionBillPackageService;
 
 	private DistributionStockupMapper distributionStockupMapper;
 
@@ -217,9 +220,19 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 				continue;
 			}
 			if(ObjectUtils.isNotNull(distributionStocks.getStockupType()) && distributionStocks.getStockupType().equals("ZT")){
-				stockEntity.setBillLadingId(stockVOList.get(0).getReservationId());
+				List<DistrilbutionBillPackageEntity> list1 = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
+					.eq(DistrilbutionBillPackageEntity::getParceListId, i)
+					.apply("packet_bar_status in (1,3)")
+					.orderByDesc(DistrilbutionBillPackageEntity::getCreateTime)
+				);
+				stockEntity.setBillLadingId(list1.get(0).getBillLadingId());
 			}else{
-				stockEntity.setReservationId(stockVOList.get(0).getReservationId());
+				List<DistributionReservationPackageEntity> list1 = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+					.eq(DistributionReservationPackageEntity::getParceListId, i)
+					.apply("packet_bar_status in (1,3)")
+					.orderByDesc(DistributionReservationPackageEntity::getCreateTime)
+				);
+				stockEntity.setReservationId(list1.get(0).getReservationId());
 			}
 			stockEntity.setDeliveryListId(stockVOList.get(0).getDeliveryListId());
 			stockEntity.setDeliveryListCode(stockVOList.get(0).getDeliveryListCode());