修改PC备货查询

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

@@ -140,7 +140,7 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "客户id")
 	@TableField(exist = false)
-	private String marketId;
+	private Long marketId;
 	/**
 	 * 物料Id
 	 */

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

@@ -9,7 +9,7 @@
         select ldpl.id parcelListId,ldpl.order_package_code packetBarCode,ldbs.stock_article_id  stockArticleId,ldbs.bill_lading_id reservationId,ldpl.order_code orderCode
 
         from logpm_distrilbution_bill_stock ldbs
-        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id and ldpl.order_package_status != '70'
         where ldbs.bill_lading_id = #{reservationId} and ldpl.order_package_code is NOT null
     </select>
 

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

@@ -67,11 +67,13 @@ public interface IDistributionStockService extends BaseService<DistributionStock
 
 	/**
 	 * 查询修改订单状态
-	 * @return
+	 *
 	 * @param pageId 包件ID
 	 * @param type
+	 * @param num
+	 * @return
 	 */
-	void  getUpdateOrderState(Long pageId,int type);
+	void  getUpdateOrderState(Long pageId,int type,Integer num);
 
 
 	Integer selectCount(Long id,Long parseLong);

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

@@ -38,6 +38,7 @@ import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusCon
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -202,25 +203,30 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 //		DistributionStockDTO distributionStock1 = JSONObject.parseObject(JSONObject.toJSONString(distributionStocks), DistributionStockDTO.class);
 		List<String> ids = distributionStocks.getIds();
 		List<DistributionStockEntity> list = new ArrayList<>();
-
-
-		ids.forEach( i ->{
+		for (int ii = 0; ii < ids.size(); ii++) {
+			String i = ids.get(ii);
 			DistributionStockEntity stockEntity = new DistributionStockEntity();
 			stockEntity.setParcelListId(Long.parseLong(i)); // 包件id
 			DistributionParcelListEntity byId = distributionParcelListService.getById(i);
 			DistributionStockArticleEntity byId1 = distributionStockArticleService.getById(byId.getStockArticleId());
 			//查询包件数量
-			getUpdateOrderState(Long.parseLong(i),1 );
+			getUpdateOrderState(Long.parseLong(i),1,0 );
+			//选择预约库存品
 			List<DistributionStockVO> stockVOList = baseMapper.selectReservationDelivery(String.valueOf(distributionStocks.getStockupId()));
-			if (stockVOList.size() > 0) {
+			if (stockVOList.isEmpty()) {
+				continue;
+			}
+			if(ObjectUtils.isNotNull(distributionStocks.getStockupType()) && distributionStocks.getStockupType().equals("ZT")){
+				stockEntity.setBillLadingId(stockVOList.get(0).getReservationId());
+			}else{
 				stockEntity.setReservationId(stockVOList.get(0).getReservationId());
+			}
 			stockEntity.setDeliveryListId(stockVOList.get(0).getDeliveryListId());
 			stockEntity.setDeliveryListCode(stockVOList.get(0).getDeliveryListCode());
-			}
 //			DistributionStockArticleEntity byId1 = distributionStockArticleService.getById(byId.getStockArticleId());
 			stockEntity.setGoodsAllocation(byId.getGoodsAllocation()); // 货位
 			stockEntity.setMaterialId(byId.getMaterialId()); // 物料
-			stockEntity.setMarketId(byId.getMaterialId()); // 商场
+			stockEntity.setMarketId(byId1.getMallId()); // 商场
 			stockEntity.setStockArticle(byId.getStockArticleId()); // 在库订单ID
 			stockEntity.setCoding(byId.getOrderPackageCode()); //包条码
 			stockEntity.setConditions("1"); //状态
@@ -239,18 +245,13 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 			parcelListEntity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
 			distributionParcelListService.updateById(parcelListEntity);
 //			distributionStockService.list(Wrappers.<S>query().lambda().eq());
-
-
-
-
-
-		});
+		}
 		if(ObjectUtils.isNotNull(distributionStocks.getStockupType()) && distributionStocks.getStockupType().equals("ZT")){
 			//修改备货状态 自提
-			getUpdateOrderState(distributionStocks.getStockupId(),3 );
+			getUpdateOrderState(distributionStocks.getStockupId(),3,list.size() );
 		}else{
-			//修改备货状态
-			getUpdateOrderState(distributionStocks.getStockupId(),2 );
+			//修改备货状态 市 商
+			getUpdateOrderState(distributionStocks.getStockupId(),2,list.size() );
 		}
 
 		return this.saveBatch(list);
@@ -262,7 +263,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 	 * @param type
 	 */
 	@Override
-	public void getUpdateOrderState(Long pageId,int type) {
+	public void getUpdateOrderState(Long pageId,int type,Integer num ) {
 		switch (type){
 			case 1: //修改订单备货状态
 				DistributionStockVO distributionStockVO =  baseMapper.selectParcelList(pageId); //查询有多少待备货的包件
@@ -278,16 +279,23 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 					}
 				}
 			break;
-			case 2: //备货
+			case 2: //备货 商 市
+				//查询还没有扫的数量
 				DistributionStockVO distributionStockVO1 = baseMapper.selectStockupInfo(pageId);
+
+				if(ObjectUtils.isNotNull(distributionStockVO1)){
+					//有订单
+					if(ObjectUtils.isNotNull(distributionStockVO1.getScanned()) && !distributionStockVO1.getScanned().equals(0)){
+						//没有完成
+						getUpdateStockup(pageId,1);
+					}else{
 						//查询库存品
 						DistributionDeliveryDetailsVO distributionOrder = distributionDeliveryDetailsService.selectOrderCount(pageId);
-				if(ObjectUtils.isNotNull(distributionStockVO1.getScanned()) && distributionStockVO1.getScanned() == 0 ){ //已扫数为o
 						//修改备货任务
 						if(ObjectUtils.isNotNull(distributionOrder)){
 							int i = ObjectUtils.isNotNull(distributionOrder.getEsauNum()) ? distributionOrder.getEsauNum() : 0;
 							int ii = ObjectUtils.isNotNull(distributionOrder.getWholeNum()) ? distributionOrder.getWholeNum() : 0;
-						if(i == ii){
+							if(i >= ii){
 								//查询备货状态
 								getUpdateStockup(pageId,2);
 							}
@@ -296,30 +304,33 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 							getUpdateStockup(pageId,2);
 						}
 					}
+				}
+
 			break;
 			case 3://自提
 				DistributionStockVO distributionStockSelf = baseMapper.selectStockupInfoSelf(pageId);
 				//查询库存品
 				DistributionDeliveryDetailsVO distributionSelf = distributionDeliveryDetailsService.selectCount(pageId);
-				if(ObjectUtils.isNotNull(distributionStockSelf.getScanned())){
-					if(distributionStockSelf.getScanned() == distributionStockSelf.getWhole()){
-						//订单已扫完
+				 int ys = 0; //已扫
+				 int qb = 0; //全部
 				if(ObjectUtils.isNotNull(distributionSelf)){
-							int i = ObjectUtils.isNotNull(distributionSelf.getEsauNum()) ? distributionSelf.getEsauNum() : 0;
-							int ii = ObjectUtils.isNotNull(distributionSelf.getWholeNum()) ? distributionSelf.getWholeNum() : 0;
-							if(i == ii){
+					//有库存品
+					ys += distributionSelf.getEsauNum();
+					qb += distributionSelf.getWholeNum();
+				}
+				if(ObjectUtils.isNotNull(distributionStockSelf)){
+					//有订单
+					ys += distributionStockSelf.getScanned();
+					qb += distributionStockSelf.getWhole();
+				}
+
+				if(ys + num >= qb){
 					//修改备货任务
 					getUpdateStockup(pageId,2);
 				}else{
 					//没有完成
 					getUpdateStockup(pageId,1);
 				}
-						}else{
-							//修改备货任务
-							getUpdateStockup(pageId,2);
-						}
-					}
-				}
 
 			break;
 

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

@@ -426,6 +426,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					if(!list1.isEmpty()){
 						//有
 						i.setPlanNum(list1.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum());
+					}else{
+						i.setPlanNum(0);
 					}
 						//没有
 						List<DistributionStockPackageVO> list2 = distrilbutionBillStockService.listPackageSelf(i.getReservationId());
@@ -736,11 +738,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 								wu.setPallet(wu.getPallet()+","+i.getPallet());
 							}
 							//订单自编号信息
-							if(ObjectUtils.isNotNull(wu.getOrderCode()) && !wu.getOrderCode().equals(i.getOrderCode())){
+							if(ObjectUtils.isNotNull(wu.getOrderCode()) && !wu.getOrderCode().contains(i.getOrderCode())){
 								wu.setOrderCode(wu.getOrderCode()+","+i.getOrderCode());
 							}
 							//订单id信息
-							if(ObjectUtils.isNotNull(wu.getStockArticleId()) && !wu.getStockArticleId().equals(i.getStockArticleId())){
+							if(ObjectUtils.isNotNull(wu.getStockArticleId()) && !wu.getStockArticleId().contains(i.getStockArticleId())){
 								wu.setStockArticleId(wu.getStockArticleId()+","+i.getStockArticleId());
 							}
 							if(wu.getPlanNum().equals(wu.getScanNum())){