自提BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.feign.IBasicdataTripartiteWarehouseClient;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.mapper.*;
+import com.logpm.distribution.service.IDistributionLoadscaninvnService;
 import com.logpm.distribution.service.IDistributionSignforService;
 import com.logpm.distribution.service.IDistributionStockService;
 import com.logpm.distribution.vo.DistributionSignPrintVO;
@@ -34,6 +35,7 @@ import com.logpm.oldproject.feign.IWarehouseClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RedisKeyConstant;
+import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -73,6 +75,7 @@ public class DistributionSignforClient implements IDistributionSignforClient {
 	private final DistributionSignforMapper distributionSignforMapper;
 	private final DistributionDeliveryListMapper distributionDeliveryListMapper;
 	private final DistributionReservationMapper distributionReservationMapper;
+	private final IDistributionLoadscaninvnService distributionLoadscaninvnService;
 
 	private final DistributionDeliverySelfMapper distributionDeliverySelfMapper;
 
@@ -121,7 +124,11 @@ public class DistributionSignforClient implements IDistributionSignforClient {
 
 
 
-		return null;
+
+
+
+
+		return distributionSignforService.clerkInventoryCheckPushData(orderPackageCode);
 	}
 
 

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

@@ -52,7 +52,7 @@
         dbl.total_cost AS totalCost,
         dbl.pick_up_plate AS pickUpPlate,
         dbl.pickup_batch AS pickupBatch,
-        ( SELECT IFNULL(SUM(quantity),0 FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = dbl.id ) AS stopNum,
+        ( SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = dbl.id ) AS stopNum,
         (
         SELECT
         group_concat( splice )

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

@@ -369,10 +369,11 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 */
 	List<DistributionAddvaluePackageDTO> checkAddValuePCPackageList(Long reservationId);
 
+
 	/**
-	 *
-	 * @param orderCode
+	 * 推送库存品包件
+	 * @param orderPackageCode
 	 * @return
 	 */
-	Map<String, Object> clerkCheckPushZeroData(String orderCode);
+	Map<String, Object> clerkInventoryCheckPushData(String orderPackageCode);
 }

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

@@ -6803,15 +6803,27 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return list;
 	}
 
-	@Override
-	public Map<String, Object> clerkCheckPushZeroData(String orderCode) {
-
 
+	@Override
+	public Map<String, Object> clerkInventoryCheckPushData(String orderPackageCode) {
+		//查询此包件
+		List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda()
+			.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, orderPackageCode)
+			.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+		);
+		if (!loadscaninvnEntityList.isEmpty()) {
+			//未进行装车
+		}
+		if (loadscaninvnEntityList.size()>1) {
+			//存在多个记录
+		}
+		DistributionLoadscaninvnEntity loadscaninvnEntity = loadscaninvnEntityList.get(0);
 
 
 
 
 		return null;
+
 	}
 
 	private void buildNameAndPhone(List<SignPushDataUnitDTO> pushOldPackageSigning) {