Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -84,6 +84,9 @@
             <if test="po.palletCode !=null and po.palletCode != ''">
                and tray.pallet_code like concat('%',#{po.palletCode},'%')
             </if>
+            <if test="po.palletName !=null and po.palletName != ''">
+               and tray.pallet_name like concat('%',#{po.palletName},'%')
+            </if>
         </where>
             order by tray.create_time  desc
     </select>

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

@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.gson.JsonObject;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
 import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
@@ -5631,13 +5630,23 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				List<Map<String, Object>> spaclOrderList = buildSpaclOrders(distributionReservationEntity, 1);
 
 				map.put("定制品集合", spaclOrderList);
-				map.put("定制品合计", spaclOrderList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
+				Integer spaclNum = 0;
+				for (Map<String, Object> m:spaclOrderList){
+					Integer num = (Integer) m.get("数量");
+					spaclNum = spaclNum + num;
+				}
+				map.put("定制品合计", spaclNum);
 
 				// 通过预约单查询预约下面的订单 --1 或者 库存品 --2
 				List<Map<String, Object>> spaclStockList = buildSpaclOrders(distributionReservationEntity, 2);
 				if (spaclStockList.size() > 0 && !spaclStockList.isEmpty()) {
 					map.put("库存品集合", spaclStockList);
-					map.put("库存品合计", spaclStockList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
+					Integer spaclStockNum = 0;
+					for (Map<String, Object> m:spaclStockList){
+						Integer num = (Integer) m.get("数量");
+						spaclStockNum = spaclStockNum + num;
+					}
+					map.put("库存品合计", spaclStockNum);
 				}
 
 
@@ -5794,11 +5803,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (ObjectUtils.isNull(distributionStockListEntity)) {
 						continue;
 					}
+					Integer reservationNum = reservationStocklistEntity.getReservationNum();
 					temp.put("合同号", distributionStockListEntity.getOrderCode());
-					temp.put("产品名称", distributionStockListEntity.getDescriptionGoods());
+					temp.put("产品名称", distributionStockListEntity.getDescriptionGoods()+"("+reservationNum+")");
 					//todo 单位是否需要查询物料表
 					temp.put("单位", Optional.ofNullable(distributionStockListEntity.getCargoUnit()).orElse(null));
-					temp.put("数量", reservationStocklistEntity.getReservationNum());
+					temp.put("数量", reservationNum);
 					temp.put("备货区", getStockupArea(distributionReservationEntity.getId()));
 					//todo 这里还没完成
 					List<String> allocationList = distributionReservationMapper.getStockListAllocation(distributionStockListEntity.getId(), distributionReservationEntity.getId());

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

@@ -1808,7 +1808,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					list1.add(distributionStock);
 				}
 			});
-			String collect = voList.stream().map(DistributionStockPackageVO::getPacketBarCode).collect(Collectors.joining(","));
+
 			Long warehouseId ;
 			if(one.getStockUpType().equals("3")){
 				DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = distrilbutionBillLadingMapper.selectById(stockupDTO.getReservationId());
@@ -1820,8 +1820,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if(ObjectUtils.isNull(warehouseId)){
 				throw new ServiceException("预约信息不存在，无法备货！");
 			}
+			String  trayCode= stockupDTO.getTrayBarCode() ;
 			//货位下架
-			R r = warehouseUpdownTypeClient.downPackage(collect,warehouseId );
+			R r = warehouseUpdownTypeClient.downTray(trayCode,warehouseId );
 			if(r.getCode() != 200){
 				throw new ServiceException("下架失败！！");
 			}