备货BUG修复

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -205,6 +205,13 @@ public class DistributionParcelListEntity extends TenantEntity {
 	@TableField(exist = false)
 	private Long marketId;
 
+	/**
+	 * 商场id
+	 */
+	@ApiModelProperty(value = "商场id")
+	@TableField(exist = false)
+	private Long mallId;
+
 	/**
 	 * 商场名称
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -1486,6 +1486,7 @@ public class DistributionStockupAppController extends BladeController {
 							warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
 							entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 						}
+						entity.setTenantId(AuthUtil.getTenantId());
 						distributionStockService.save(entity);
 						//这里尝试修改备货库存品包件的备货状态
 						boolean update = distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
@@ -1493,7 +1494,7 @@ public class DistributionStockupAppController extends BladeController {
 							.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
 							.eq(DistributionParcelListEntity::getConditions, "2")
 							.eq(DistributionParcelListEntity::getMaterialId, entity.getMaterialId())
-							.eq(DistributionParcelListEntity::getMarketId, entity.getMarketId())
+							.eq(entity.getStockArticle() != null,DistributionParcelListEntity::getStockArticleId, entity.getStockArticle())
 							.set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.yibeihu.getValue())
 						);
 

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

@@ -2544,6 +2544,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					Date loadScanTime = new Date();
 					distributionLoadscanEntity.setScanTime(simpleDateFormat.format(loadScanTime));
 					distributionLoadscanEntity.setPackageId(collect.get(0).getId());
+					distributionLoadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
+					distributionLoadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
 					distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode());
 					Date signingTime = new Date(System.currentTimeMillis() + (1000 * 60));
 					distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(signingTime));