修改pda查询

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

@@ -19,12 +19,15 @@ package com.logpm.distribution.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.OrderPackgeCodeDataVO;
+import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,6 +38,7 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 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;
@@ -49,6 +53,7 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 配送在库订单 控制器
@@ -64,6 +69,8 @@ public class DistributionStockArticleController extends BladeController {
 
 	private final IDistributionStockArticleService distributionStockArticleService;
 
+	private IBasicdataWarehouseClient warehouseClient;
+
 	private final IDictBizClient dictBizClient;
 
 	private final IUserClient userClient;
@@ -127,6 +134,11 @@ public class DistributionStockArticleController extends BladeController {
 		if(ObjectUtil.isNotEmpty(o2)){
 			queryWrapper.between("warehouse_entry_time",o2,o1);
 		}
+		String[] list = new String[]{"10","20","30","40","50","60","70"};
+		queryWrapper.in("order_status",list);
+		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWarehouseList();
+		List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+		queryWrapper.in("warehouse_id",collect);
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper);
 		return R.data(DistributionStockArticleWrapper.build().pageVO(pages));
 

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

@@ -315,12 +315,12 @@
         </where>
     </select>
     <select id="selectAppcustomListPage" resultType="com.logpm.distribution.vo.app.DistributionAppReservationVO">
-        SELECT ldr.id id,  ldr.consignee consignee, ldr.reservation_num reservationNum, COALESCE(lds.loaded_number + lds.loadedin_number, 0)  loadingNub,
+        SELECT DISTINCT ldr.id id,  ldr.consignee consignee, ldr.reservation_num reservationNum, COALESCE(lds.loaded_number + lds.loadedin_number, 0)  loadingNub,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_reservation_stockarticle ldrs WHERE ldrs.reservation_id =ldr.id  and ldrs.stock_article_status in (1,3) )   ordNub,
             COALESCE(lds.received_quantity + lds.receivedin_quantity, 0)  signNub, ldsk.stockup_area stockupArea
         FROM logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id and ldr.reservation_status != '40'
-        LEFT JOIN logpm_distribution_stockup_info ldsi on ldr.id =   lds.reservation_id
+        LEFT JOIN logpm_distribution_stockup_info ldsi on ldr.id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_stockup ldsk on ldsk.id = ldsi.stockup_id
         WHERE lds.is_deleted = 0 AND lds.delivery_id = #{id}
     </select>

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

@@ -710,6 +710,7 @@
             </if>
 
         </where>
+        /*ORDER BY lddl.create_time DESC*/
     </select>
     <select id="getDeliveryStockArticleInfo" resultType="com.logpm.distribution.vo.DistributionStockArticleVO">
         SELECT

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

@@ -188,4 +188,6 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @param id1
 	 */
     void deleteByReservationAndDeliveryId(@Param("reservationId") Long id,@Param("deliveryId") Long id1);
+
+	Integer updateSignforNum(@Param("deliveryId") Long deliveryId,@Param("reservationId") Long reservationId,@Param("packageNub") Integer packageNub);
 }

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

@@ -51,6 +51,9 @@
     <update id="updateloadreduceByReservationId">
         UPDATE logpm_distribution_signfor lds    set lds.loaded_number = ( lds.loaded_number - #{nub} )  WHERE lds.is_deleted =0 and lds.reservation_id = #{reservationId} and loaded_number !=0 and lds.delivery_id = #{deliveryId}
     </update>
+    <update id="updateSignforNum">
+        UPDATE logpm_distribution_signfor lds    set lds.received_quantity = ( lds.received_quantity + #{packageNub} )  WHERE lds.is_deleted =0 and lds.reservation_id = #{reservationId} and lds.delivery_id  =#{deliveryId}
+    </update>
     <update id="updateSignforByReservationId">
         UPDATE logpm_distribution_signfor lds    set lds.received_quantity = ( lds.received_quantity + #{packageNub} ),lds.loaded_number = ( lds.loaded_number + #{packageNub} )  WHERE lds.is_deleted =0 and lds.reservation_id = #{reservationId} and lds.delivery_id  =#{deliveryId}
     </update>

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

@@ -302,14 +302,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	@Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
 	public Resp loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-		String s = distrilbutionloadingscanDTO.getBarcode() + distrilbutionloadingscanDTO.getReservationId();
-		String barcode = distrilbutionloadingscanDTO.getBarcode();
-		Object o = bladeRedis.get(barcode);
-		if(ObjectUtils.isNotNull(o)){
-			bladeRedis.del(barcode);
-		 return Resp.scanSuccess("重复扫描！！","重复扫描！！");
-		}
-		bladeRedis.setEx(barcode,s, 500L);
 		//获取当前用户司机
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
 		//异步确认包条扫描信息
@@ -657,6 +649,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		Long deliveryId = distrilbutionloadingscanDTO.getDeliveryId();
 //		distributionAsyncService.changeOrderStatus(distrilbutionloadingscanDTO.getBarcode(),deliveryId);
 		distributionAsyncService.changeDeliveryListStatus(distrilbutionloadingscanDTO.getBarcode(),deliveryId);
+		//修改配送任务状态
+
 		return Resp.scanSuccess("成功", "成功");
 	}
 

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

@@ -572,6 +572,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public R oneclick(DistributionSignforDTO distributionSignfor) {
+		//查询数据
 		DistributionSignforEntity distributionSignforEntity = baseMapper.selectOne(new QueryWrapper<DistributionSignforEntity>().lambda()
 			.eq(DistributionSignforEntity::getDeliveryId, distributionSignfor.getDeliveryId())
 			.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
@@ -590,11 +591,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignfor.getDeliveryId());
 		DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
 		if (distributionDeliveryListEntity.getKind().equals("1")) {
+			//自主
 			distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(new QueryWrapper<DistributionDeliverySelfEntity>().lambda()
 				.eq(DistributionDeliverySelfEntity::getIsMaster, 2)
 				.eq(DistributionDeliverySelfEntity::getDeliveryId, distributionSignfor.getDeliveryId())
 			);
 		} else {
+			//三方
 			DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper<DistributionDeliveryTripartiteEntity>().lambda()
 				.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distributionSignfor.getDeliveryId())
 			);
@@ -607,14 +610,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntitiesopen = distributionDeliveryListMapper.selectdeliverOnevnopen(distributionSignfor.getReservationId(), distributionSignfor.getDeliveryId());
 		//将该客户所有的物品上该车辆
 		if (distributionLoadscanEntities.size() > 0) {
+			//配送订单数据
 			for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
-				//查询是否重复扫码
+				//查询该包件是否扫码
 				List<DistributionLoadscanEntity> distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
 					.eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getDeliveryId())
 					.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
 					.ne(DistributionLoadscanEntity::getScanStatus, 1)
 				);
 				if (distributionLoadscanEntitiesflag.size() > 0) {
+					//有扫码记录
 					// 修改该记录
 					for (DistributionLoadscanEntity loadscanEntity : distributionLoadscanEntitiesflag) {
 						if (loadscanEntity.getSignforState() == 2) break;
@@ -625,49 +630,54 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							.set(DistributionLoadscanEntity::getSignforState, 2)
 							.set(DistributionLoadscanEntity::getReceivedQuantity, 1)
 						);
+						//修改签收数量
+						distributionSignforMapper.updateSignforNum(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
 						//更新签收表的签收数量和装车数量
-						Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+//						Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
 					}
 //					distributionLoadscanService.update()
 					continue;
-				}
-				//依次插入该装车记录,设置车辆,
-				if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverId())) {
-					distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
-				}
-				distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
-				distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
-				distributionLoadscanEntity.setScanStatus(2);
-				distributionLoadscanEntity.setReceivedQuantity(1);
-				if (null == distributionLoadscanEntity.getPackageNub()) {
-					distributionLoadscanEntity.setPackageNub(1);
-					distributionLoadscanEntity.setLoadedNub(distributionLoadscanEntity.getPackageNub());
-				}
-				distributionLoadscanEntity.setScanType("1");
-				distributionLoadscanEntity.setMsg("司机签收");
-				if (distributionSignfor.getIsClerk()) {
-					distributionLoadscanEntity.setMsg("文员签收");
-				}
+				}else{
+					//没有扫码数据
+					//依次插入该装车记录,设置车辆,
+					if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverId())) {
+						distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+					}
+					distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
+					distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
+					distributionLoadscanEntity.setScanStatus(2);
+					distributionLoadscanEntity.setReceivedQuantity(1);
+					if (null == distributionLoadscanEntity.getPackageNub()) {
+						distributionLoadscanEntity.setPackageNub(1);
+						distributionLoadscanEntity.setLoadedNub(distributionLoadscanEntity.getPackageNub());
+					}
+					distributionLoadscanEntity.setScanType("1");
+					distributionLoadscanEntity.setMsg("司机签收");
+					if (distributionSignfor.getIsClerk()) {
+						distributionLoadscanEntity.setMsg("文员签收");
+					}
 //				distributionLoadscanEntity.setOneClick(2);
-				distributionLoadscanEntity.setSignforState(2);
-				distributionLoadscanEntity.setOneQclick(2);
+					distributionLoadscanEntity.setSignforState(2);
+					distributionLoadscanEntity.setOneQclick(2);
 //				distributionLoadscanEntity.setScanTime(new Date());
-				if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverPhone())) {
-					distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
-				}
-				if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getVehicleId())) {
-					distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+					if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverPhone())) {
+						distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
+					}
+					if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getVehicleId())) {
+						distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+					}
+					distributionLoadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
+					distributionLoadscanService.save(distributionLoadscanEntity);
 				}
-				distributionLoadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
 				//查询本车次是否第一次扫码,没有则更新上车时间
 //				Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
 				//更新签收表的签收数量和装车数量
 				Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
-				distributionLoadscanService.save(distributionLoadscanEntity);
+
 			}
 		}
-
 		if (distributionLoadscanvnEntitiesopen.size() > 0) {
+			//库存品数据
 			for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntitiesopen) {
 				//查询是否重复扫码
 				List<DistributionLoadscaninvnEntity> distributionLoadscaninvnEntitiesflag = distributionLoadscaninvnMapper.selectList(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()