fix: 修复运单保存的时候出现的多个物品信息

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java

@@ -165,6 +165,11 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	@ApiModelProperty(value = "ids")
 	private List<Long> clientIds;
 
+	/**
+	 * 是否零担显示
+	 */
+	private String isZeroString;
+
 	private Integer unreceivedQuantity;
 
 

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

@@ -636,6 +636,11 @@
             <if test="par.warehouseId != null and par.warehouseId != '' ">
                 and ldsa.warehouse_id = #{par.warehouseId}
             </if>
+
+            <if test="par.isZero != null ">
+                and ldsa.is_zero = #{par.isZero}
+            </if>
+
             <if test="par.orderCode != null and par.orderCode != '' ">
                 and ldsa.order_code like concat('%',#{par.orderCode},'%')
             </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -69,6 +69,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 					break;
 			}
 		}
+//		distributionStockupVO.setIsZeroString("1".equals(distributionStockupVO.getIsZero())?"是":"否");
 		distributionStockupVO.setReservationNum(entity.getHandQuantity()-entity.getDeliveryQuantity());
 		buildVoInfor(distributionStockupVO);
 		return distributionStockupVO;

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WaybillDesServiceImpl.java

@@ -20,7 +20,8 @@ public class WaybillDesServiceImpl implements IWaybillDesService {
 	@Override
 	public List<WaybillDesEntity> getDesList(String waybillNo) {
 		QueryWrapper<WaybillDesEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("waybill_no",waybillNo);
+		queryWrapper.eq("waybill_no",waybillNo).eq("delete_time",0);
+
 
 		return waybillDesMapper.selectList(queryWrapper);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java

@@ -201,28 +201,6 @@ public class WarehouseWaybillController extends BladeController {
 		}
 
 
-//		Integer state = Integer.parseInt(distributionStockArticleEntity.getOrderStatus());//订单状态
-//		Long orderId = distributionStockArticleEntity.getId();//订单id
-//		if (state > 30) {
-//			log.warn("################splitOrder: 当前在库订单已进入配送流程，不能拆单 waybillNo={}", waybillNo);
-//			return R.fail(405, "当前在库订单已进入配送流程");
-//		}
-		//判断拆单后的数值是否等于总数量
-//		Integer total = new Integer("0");
-//		for (SplitOrderDTO splitOrderDTO : splitOrderDTOList) {
-//			List<ProductDTO> products = splitOrderDTO.getProducts();
-//			for (ProductDTO productDTO : products) {
-//				Integer splitNum = productDTO.getSplitNum();
-//				if (!Objects.isNull(splitNum)) {
-//					total = total + splitNum;
-//				}
-//			}
-//		}
-//		if (stockCount < total) {
-//			log.warn("################splitOrder: 拆单数量不能小于在库数量 waybillNo={}", waybillNo);
-//			return R.fail(405, "拆单数量不能小于在库数量");
-//		}
-
 		try {
 			//拆单操作
 			warehouseWaybillService.splitOrder(splitOrderDTOList, distributionStockArticleEntity);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -333,56 +333,6 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			log.error(">>>>> createStockArticle",e);
 		}
 
-
-		//存入包件信息
-//		List<WarehouseWayBillDetail> details = warehouseWayBillDetailService.findByWaybillId(waybillId);
-//
-//
-//		// 查询运单的附件
-//		List<DistributionParcelListEntity> tesmn = distributionParcelListClient.findEntityListByOrderCode(distributionStockArticleEntity.getOrderCode());
-//
-//		if(ObjectUtils.isEmpty(tesmn)||tesmn.isEmpty()){
-//			// 新增
-//			DistributionParcelListEntity entity = new DistributionParcelListEntity();
-//
-//			entity.setQuantity(stockCount);
-//			entity.setConditions(3);
-//			entity.setStockArticleId(id);
-//			entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
-//			entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
-//			entity.setOrderCode(distributionStockArticleEntity.getOrderCode());
-//
-//
-//
-//
-//			for (WarehouseWayBillDetail warehouseWayBillDetail : details) {
-//				entity.setMaterialName((StringUtil.isBlank(entity.getMaterialName())?"":entity.getMaterialName())+warehouseWayBillDetail.getProductName());
-//			}
-//			distributionParcelListClient.add(entity);
-//		}else{
-//			// 更新
-//			DistributionParcelListEntity distributionParcelListEntity = tesmn.get(0);
-//			distributionParcelListEntity.setQuantity(stockCount);
-//			distributionParcelListClient.update(distributionParcelListEntity);
-//		}
-
-
-//		List<DistributionParcelListEntity> ls = new ArrayList<>();
-//		for (WarehouseWayBillDetail warehouseWayBillDetail : details) {
-//			DistributionParcelListEntity entity = new DistributionParcelListEntity();
-//			entity.setMaterialName(warehouseWayBillDetail.getProductName());
-//			entity.setQuantity(warehouseWayBillDetail.getNum());
-//			entity.setConditions(3);
-//			entity.setStockArticleId(id);
-//			ls.add(entity);
-//		}
-//		boolean b = distributionParcelListClient.addBatch(ls);
-//		if (!b) {
-//			log.warn("#################createStockArticle: 保存包件信息失败  orderSelfNum={}", waybillNo);
-//			throw new CustomerException(405, "保存包件信息失败");
-//		}
-		// 判断运单的货物是否齐套
-
 	}
 
 
@@ -576,7 +526,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		warehouseWaybill.setTotalWeight(wayBillEntity.getWeight());
 		warehouseWaybill.setTotalVolume(wayBillEntity.getVolume());
 		warehouseWaybill.setDeliveryMethod(wayBillEntity.getSendType());
-		warehouseWaybill.setUrgency(wayBillEntity.getUrgency()+"");
+		warehouseWaybill.setUrgency(wayBillEntity.getUrgency());
 		warehouseWaybill.setReceiptCount(wayBillEntity.getReceiptNum());
 		warehouseWaybill.setReceiptRequirement(wayBillEntity.getReceiptAsk());
 		//--------------2023-07-28-------------