1.干线bug修复

2.修复库位操作bug

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java

@@ -17,6 +17,8 @@ public class AdvanceDTO implements Serializable {
 	private List<Long> warehouseIds;
 
 	private Long advanceId;
+	private Long waybillId;
+
 
 	private List<Long> advanceIds = new ArrayList<>();
 
@@ -36,6 +38,11 @@ public class AdvanceDTO implements Serializable {
 	private String trainNumber;
 	private String serviceNum;
 	private String brand;
+	private String orderPackageCode;
+	private String firstPackName;
+	private String secondPackName;
+	private String thirdPackName;
+	private String materialName;
 
 	private Integer hasPackage;
 	private Integer enterNum;

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java

@@ -1,5 +1,6 @@
 package com.logpm.trunkline.dto;
 
+import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -156,5 +157,7 @@ public class OpenOrderDTO implements Serializable {
 
 	private Integer isEdit;
 
+	private List<TrunklineAdvanceDetailEntity> updateAdvanceDetailList;
+
 
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java

@@ -211,5 +211,14 @@ public class TrunklineAdvanceDetailEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(name = "当前所在仓库名称", notes = "")
 	private String nowWarehouseName;
+	@ApiModelProperty(name = "收入品类id", notes = "")
+	private Long incomeCategoryId;//收入品类id
+	@ApiModelProperty(name = "收入品类名称", notes = "")
+	private String incomeCategoryName;//收入品类名称
+	@ApiModelProperty(name = "成本品类id", notes = "")
+	private Long costCategoryId;//成本品类id
+	@ApiModelProperty(name = "成本品类名称", notes = "")
+	private String costCategoryName;//成本品类名称
+
 
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailVO.java

@@ -0,0 +1,37 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class AdvanceDetailVO implements Serializable {
+
+	private Long advanceDetailId;//暂存单明细id
+
+	private String serviceNum;//服务号
+
+	private String orderCode;//订单号
+	private String trainNumber;//车次号
+
+	private String orderPackageCode;//包件码
+
+	private String firstPackName;//一级品类
+	private String secondPackName;//二级品类
+	private String thirdPackName;//三级品类
+	private String materialName;//物料名称
+
+	private Integer num;//数量
+	private BigDecimal weight;//重量
+	private BigDecimal volume;//体积
+
+	private String brand;//品牌
+
+	private Long incomeCategoryId;//收入品类id
+	private String incomeCategoryName;//收入品类名称
+
+	private Long costCategoryId;//成本品类id
+	private String costCategoryName;//成本品类名称
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java

@@ -842,7 +842,7 @@ public class WarehouseTrayAllocationListener {
 						String[] split = storageLocation.split(",");
 						List<String> allocationList = new ArrayList<>(Arrays.asList(split));
 						allocationList.add(allocationName);
-						updateStockListEntity.setTrayName(StringUtil.join(allocationList,","));
+						updateStockListEntity.setStorageLocation(StringUtil.join(allocationList,","));
 						updateStockListList.add(updateStockListEntity);
 					}
 				}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java

@@ -350,6 +350,60 @@ public class OpenOrderController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/findAdvanceDetailListByAdvanceIds")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询暂存单明细", notes = "传入waybillDTO")
+	public R findAdvanceDetailListByAdvanceIds(@RequestBody AdvanceDTO advanceDTO) {
+		String method = "############findAdvanceDetailListByAdvanceIds: ";
+		log.info(method + "请求参数{}", advanceDTO);
+		List<Long> advanceIds = advanceDTO.getAdvanceIds();
+		try{
+
+			if(CollUtil.isEmpty(advanceIds)){
+				log.warn(method+"未选择暂存单 advanceIds={}",advanceIds);
+				return R.fail(403,"未选择暂存单");
+			}
+
+			return openOrderService.findAdvanceDetailListByAdvanceIds(advanceDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+	@ResponseBody
+	@PostMapping("/findAdvanceDetailListByWaybillId")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询暂存单明细通过运单id", notes = "传入waybillDTO")
+	public R findAdvanceDetailListByWaybillId(@RequestBody AdvanceDTO advanceDTO) {
+		String method = "############findAdvanceDetailListByWaybillId: ";
+		log.info(method + "请求参数{}", advanceDTO);
+		Long waybillId = advanceDTO.getWaybillId();
+		try{
+
+			if(Objects.isNull(waybillId)){
+				log.warn(method+"未选择运单 waybillId={}",waybillId);
+				return R.fail(403,"未选择运单");
+			}
+
+			return openOrderService.findAdvanceDetailListByWaybillId(advanceDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+
+
 	@ResponseBody
 	@PostMapping("/advanceNoPackageToWaybillInfo")
 	@ApiOperationSupport(order = 1)

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java

@@ -2,6 +2,7 @@ package com.logpm.trunkline.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.trunkline.dto.AdvanceDTO;
 import com.logpm.trunkline.dto.AdvanceDetailDTO;
 import com.logpm.trunkline.dto.OrderDetailsDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
@@ -72,4 +73,8 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
 	void deletedAdvanceByOrderCode(String orderCode);
 
     void deleteByWaybillNo(@Param("waybillNo") String waybillNo);
+
+    List<AdvanceDetailVO> findAdvanceDetailListByAdvanceIds(@Param("param") AdvanceDTO advanceDTO);
+
+	List<AdvanceDetailVO> findAdvanceDetailListByWaybillId(@Param("param") AdvanceDTO advanceDTO);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -45,7 +45,8 @@
     </select>
 
     <select id="findGoodsListByAdvanceIds" resultType="com.logpm.trunkline.vo.AdvanceDetailGoodsVO">
-        select IFNULL(lbc.name,'其他') goodsName,
+        select lbfc.category_id goodsId,
+                IFNULL(lbfc.category,'其他') goodsName,
                ltad.charge_type chargeType,
                sum(ltad.quantity) num,
                 sum(ltad.weight) weight,
@@ -59,7 +60,7 @@
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        group by IFNULL(lbc.name,'其他'),
+        group by lbfc.category_id,IFNULL(lbfc.category,'其他'),
                 ltad.charge_type
     </select>
 
@@ -366,4 +367,117 @@
         </foreach>
     </select>
 
+    <select id="findAdvanceDetailListByAdvanceIds" resultType="com.logpm.trunkline.vo.AdvanceDetailVO">
+        select ltad.id advanceDetailId,
+               ltad.service_num serviceNum,
+               ltad.order_code orderCode,
+               ltad.train_number trainNumber,
+               ltad.order_package_code orderPackageCode,
+               ltad.brand brand,
+               ltad.first_pack_name firstPackName,
+               ltad.second_pack_name secondPackName,
+               ltad.third_pack_name thirdPackName,
+               ltad.material_name materialName,
+               ltad.quantity num,
+               ltad.weight weight,
+               ltad.volume volume,
+               lbfc1.category_id incomeCategoryId,
+               IFNULL(lbfc1.category,'其他') incomeCategoryName,
+               lbfc2.category_id costCategoryId,
+               IFNULL(lbfc2.category,'其他') costCategoryName
+        from logpm_trunkline_advance_detail ltad
+        left join logpm_basicdata_factory_category lbfc1 on lbfc1.brand = ltad.brand and lbfc1.firsts = ltad.first_pack_name and lbfc1.seconds = ltad.second_pack_name and lbfc1.thirds = ltad.third_pack_name and lbfc1.type = 1 AND lbfc1.materiel_name = ltad.material_name
+        left join logpm_basicdata_factory_category lbfc2 on lbfc2.brand = ltad.brand and lbfc2.firsts = ltad.first_pack_name and lbfc2.seconds = ltad.second_pack_name and lbfc2.thirds = ltad.third_pack_name and lbfc1.type = 2 AND lbfc2.materiel_name = ltad.material_name
+        where ltad.is_deleted = 0
+        <if test="param.advanceIds != null and param.advanceIds.size() > 0">
+            and ltad.advance_id in
+            <foreach collection="param.advanceIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.waybillId != null">
+            and ltad.waybill_id = #{param.waybillId}
+        </if>
+        <if test="param.serviceNum != null and param.serviceNum != ''">
+            and Locate(#{param.serviceNum}, ltad.service_num) > 0
+        </if>
+        <if test="param.orderCode != null and param.orderCode != ''">
+            and Locate(#{param.orderCode}, ltad.order_code) > 0
+        </if>
+        <if test="param.trainNumber != null and param.trainNumber != ''">
+            and Locate(#{param.trainNumber}, ltad.train_number) > 0
+        </if>
+        <if test="param.orderPackageCode != null and param.orderPackageCode != ''">
+            and Locate(#{param.orderPackageCode}, ltad.order_package_code) > 0
+        </if>
+        <if test="param.brand != null and param.brand != ''">
+            and Locate(#{param.brand}, ltad.brand) > 0
+        </if>
+        <if test="param.firstPackName != null and param.firstPackName != ''">
+            and Locate(#{param.firstPackName}, ltad.first_pack_name) > 0
+        </if>
+        <if test="param.secondPackName != null and param.secondPackName != ''">
+            and Locate(#{param.secondPackName}, ltad.second_pack_name) > 0
+        </if>
+        <if test="param.thirdPackName != null and param.thirdPackName != ''">
+            and Locate(#{param.thirdPackName}, ltad.third_pack_name) > 0
+        </if>
+        <if test="param.materialName != null and param.materialName != ''">
+            and Locate(#{param.materialName}, ltad.material_name) > 0
+        </if>
+    </select>
+
+
+    <select id="findAdvanceDetailListByWaybillId" resultType="com.logpm.trunkline.vo.AdvanceDetailVO">
+        select ltad.id advanceDetailId,
+        ltad.service_num serviceNum,
+        ltad.order_code orderCode,
+        ltad.train_number trainNumber,
+        ltad.order_package_code orderPackageCode,
+        ltad.brand brand,
+        ltad.first_pack_name firstPackName,
+        ltad.second_pack_name secondPackName,
+        ltad.third_pack_name thirdPackName,
+        ltad.material_name materialName,
+        ltad.quantity num,
+        ltad.weight weight,
+        ltad.volume volume,
+        ltad.income_category_id incomeCategoryId,
+        ltad.income_category_Name incomeCategoryName,
+        ltad.cost_category_id costCategoryId,
+        ltad.cost_category_name costCategoryName
+        from logpm_trunkline_advance_detail ltad
+        where ltad.is_deleted = 0
+        <if test="param.waybillId != null">
+            and ltad.waybill_id = #{param.waybillId}
+        </if>
+        <if test="param.serviceNum != null and param.serviceNum != ''">
+            and Locate(#{param.serviceNum}, ltad.service_num) > 0
+        </if>
+        <if test="param.orderCode != null and param.orderCode != ''">
+            and Locate(#{param.orderCode}, ltad.order_code) > 0
+        </if>
+        <if test="param.trainNumber != null and param.trainNumber != ''">
+            and Locate(#{param.trainNumber}, ltad.train_number) > 0
+        </if>
+        <if test="param.orderPackageCode != null and param.orderPackageCode != ''">
+            and Locate(#{param.orderPackageCode}, ltad.order_package_code) > 0
+        </if>
+        <if test="param.brand != null and param.brand != ''">
+            and Locate(#{param.brand}, ltad.brand) > 0
+        </if>
+        <if test="param.firstPackName != null and param.firstPackName != ''">
+            and Locate(#{param.firstPackName}, ltad.first_pack_name) > 0
+        </if>
+        <if test="param.secondPackName != null and param.secondPackName != ''">
+            and Locate(#{param.secondPackName}, ltad.second_pack_name) > 0
+        </if>
+        <if test="param.thirdPackName != null and param.thirdPackName != ''">
+            and Locate(#{param.thirdPackName}, ltad.third_pack_name) > 0
+        </if>
+        <if test="param.materialName != null and param.materialName != ''">
+            and Locate(#{param.materialName}, ltad.material_name) > 0
+        </if>
+    </select>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java

@@ -91,6 +91,11 @@ public interface IOpenOrderService {
 
 	R createOrderPackage(AdvanceDTO advanceDTO);
 
+	R findAdvanceDetailListByAdvanceIds(AdvanceDTO advanceDTO);
+
+	R findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO);
+
+
 
 //	R findWaybillInfo(String waybillNo);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java

@@ -2,13 +2,11 @@ package com.logpm.trunkline.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.vo.OrderPackgeCodeDataVO;
+import com.logpm.trunkline.dto.AdvanceDTO;
 import com.logpm.trunkline.dto.AdvanceDetailDTO;
 import com.logpm.trunkline.dto.OrderDetailsDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
-import com.logpm.trunkline.vo.AdvanceDetailGoodsVO;
-import com.logpm.trunkline.vo.AdvanceDetailStockNumVO;
-import com.logpm.trunkline.vo.BillladingPackageVO;
-import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
+import com.logpm.trunkline.vo.*;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
@@ -85,4 +83,8 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
     void deleteByWaybillNo(String waybillNo);
 
 	List<TrunklineAdvanceDetailEntity> findListByOrderPackageCodeList(List<String> orderPackageCodes);
+
+	List<AdvanceDetailVO> findAdvanceDetailListByAdvanceIds(AdvanceDTO advanceDTO);
+
+	List<AdvanceDetailVO> findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -262,48 +262,48 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		basicdataFreightApiVO.setDestination(openOrderVO.getDestinationCode());
 		basicdataFreightApiVO.setArrivalWarehouse(openOrderVO.getDestinationWarehouseId() + "");
 
-		if (goodsList.isEmpty()) {
-			List<AdvanceDetailGoodsVO> ls = new ArrayList<>();
-			//把list中的元素通过packName分组如果pickName为空则换为"其他"
-			Map<String, List<TrunklineAdvanceEntity>> groupedEntities = list.stream()
-				.collect(Collectors.groupingBy(entity -> {
-					String packName = entity.getPackName();
-					return packName != null ? packName : "其他";
-				}));
-
-			groupedEntities.keySet().forEach(packName -> {
-				int total;
-				List<TrunklineAdvanceEntity> advanceEntityList = groupedEntities.get(packName);
-				total = advanceEntityList.stream().mapToInt(TrunklineAdvanceEntity::getTotalNum).sum();
-				AdvanceDetailGoodsVO advanceDetailGoodsVO = new AdvanceDetailGoodsVO();
-				advanceDetailGoodsVO.setChargeType(1);
-				advanceDetailGoodsVO.setGoodsName(packName);
-				advanceDetailGoodsVO.setNum(total);
-				advanceDetailGoodsVO.setVolume(BigDecimal.ZERO);
-				advanceDetailGoodsVO.setWeight(BigDecimal.ZERO);
-				ls.add(advanceDetailGoodsVO);
-			});
-			goodsList = new ArrayList<>(ls);
-		} else {
-			for (AdvanceDetailGoodsVO advanceDetailGoodsVO : goodsList) {
-				String goodsName = advanceDetailGoodsVO.getGoodsName();
-				BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName);
-				Long goodsId = null;
-				if (Objects.isNull(basicdataCategoryEntity)) {
-					basicdataCategoryEntity = new BasicdataCategoryEntity();
-					basicdataCategoryEntity.setType(1);
-					basicdataCategoryEntity.setName(goodsName);
-					goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity);
-				} else {
-					goodsId = basicdataCategoryEntity.getId();
-				}
-				advanceDetailGoodsVO.setGoodsId(goodsId);
-				basicdataFreightApiVO.setCategory(goodsId + "");
-				List<BasicdataFreightDetailEntity> pirceList = basicdataFreightClient.pirce(basicdataFreightApiVO);
-				JSONArray price = JSONArray.parseArray(JSON.toJSONString(pirceList));
-				advanceDetailGoodsVO.setArrPirce(price);
-			}
-		}
+//		if (goodsList.isEmpty()) {
+//			List<AdvanceDetailGoodsVO> ls = new ArrayList<>();
+//			//把list中的元素通过packName分组如果pickName为空则换为"其他"
+//			Map<String, List<TrunklineAdvanceEntity>> groupedEntities = list.stream()
+//				.collect(Collectors.groupingBy(entity -> {
+//					String packName = entity.getPackName();
+//					return packName != null ? packName : "其他";
+//				}));
+//
+//			groupedEntities.keySet().forEach(packName -> {
+//				int total;
+//				List<TrunklineAdvanceEntity> advanceEntityList = groupedEntities.get(packName);
+//				total = advanceEntityList.stream().mapToInt(TrunklineAdvanceEntity::getTotalNum).sum();
+//				AdvanceDetailGoodsVO advanceDetailGoodsVO = new AdvanceDetailGoodsVO();
+//				advanceDetailGoodsVO.setChargeType(1);
+//				advanceDetailGoodsVO.setGoodsName(packName);
+//				advanceDetailGoodsVO.setNum(total);
+//				advanceDetailGoodsVO.setVolume(BigDecimal.ZERO);
+//				advanceDetailGoodsVO.setWeight(BigDecimal.ZERO);
+//				ls.add(advanceDetailGoodsVO);
+//			});
+//			goodsList = new ArrayList<>(ls);
+//		} else {
+//			for (AdvanceDetailGoodsVO advanceDetailGoodsVO : goodsList) {
+//				String goodsName = advanceDetailGoodsVO.getGoodsName();
+//				BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName);
+//				Long goodsId = null;
+//				if (Objects.isNull(basicdataCategoryEntity)) {
+//					basicdataCategoryEntity = new BasicdataCategoryEntity();
+//					basicdataCategoryEntity.setType(1);
+//					basicdataCategoryEntity.setName(goodsName);
+//					goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity);
+//				} else {
+//					goodsId = basicdataCategoryEntity.getId();
+//				}
+//				advanceDetailGoodsVO.setGoodsId(goodsId);
+//				basicdataFreightApiVO.setCategory(goodsId + "");
+//				List<BasicdataFreightDetailEntity> pirceList = basicdataFreightClient.pirce(basicdataFreightApiVO);
+//				JSONArray price = JSONArray.parseArray(JSON.toJSONString(pirceList));
+//				advanceDetailGoodsVO.setArrPirce(price);
+//			}
+//		}
 
 
 
@@ -508,18 +508,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				warehouseWayBillDetail.setWaybillNo(waybillEntity.getWaybillNo());
 				Long goodsId = waybillDetailDTO.getGoodsId();
 				String goodsName = waybillDetailDTO.getGoodsName();
-				if (Objects.isNull(goodsId)) {
-					//如果品名id没有就先通过goodsName查寻，没有就新增
-					BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName);
-					if (Objects.isNull(basicdataCategoryEntity)) {
-						basicdataCategoryEntity = new BasicdataCategoryEntity();
-						basicdataCategoryEntity.setName(goodsName);
-						basicdataCategoryEntity.setType(1);
-						goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity);
-					} else {
-						goodsId = basicdataCategoryEntity.getId();
-					}
-				}
+//				if (Objects.isNull(goodsId)) {
+//					//如果品名id没有就先通过goodsName查寻，没有就新增
+//					BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName);
+//					if (Objects.isNull(basicdataCategoryEntity)) {
+//						basicdataCategoryEntity = new BasicdataCategoryEntity();
+//						basicdataCategoryEntity.setName(goodsName);
+//						basicdataCategoryEntity.setType(1);
+//						goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity);
+//					} else {
+//						goodsId = basicdataCategoryEntity.getId();
+//					}
+//				}
 				warehouseWayBillDetail.setCreateUser(AuthUtil.getUserId());
 				warehouseWayBillDetail.setUpdateUser(AuthUtil.getUserId());
 				Date date = new Date();
@@ -582,6 +582,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//修改暂存单的状态为已开单
 		advanceService.updateBatchById(advanceEntityList);
 
+		//修改暂存单明细的结算品类
+		List<TrunklineAdvanceDetailEntity> updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList();
+		advanceDetailService.updateBatchById(updateAdvanceDetailList);
+
+
 		//计算扫码入库的包件是否需要把运单和提货单挂上
 		openOrderAsyncService.dealwithBillladingInfo(advanceIds,warehouseId,warehouseName,waybillId,waybillNo);
 
@@ -2165,6 +2170,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		String warehouseName = openOrderDTO.getWarehouseName();
 		String editReson = openOrderDTO.getEditReson();
 		String refer = openOrderDTO.getRefer();
+		List<TrunklineAdvanceDetailEntity> updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList();
 		WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
 
 		if (Objects.isNull(waybillEntity)) {
@@ -2184,6 +2190,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		warehouseWaybillClient.updateEntity(waybillEntity);
 
+		advanceDetailService.updateBatchById(updateAdvanceDetailList);
+
 //		String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg;
 		//异步存入日志
 		openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注："+refer+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity);
@@ -3441,6 +3449,23 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		return R.success("添加成功");
 	}
 
+	@Override
+	public R findAdvanceDetailListByAdvanceIds(AdvanceDTO advanceDTO) {
+		List<Long> advanceIds = advanceDTO.getAdvanceIds();
+
+		List<AdvanceDetailVO> advanceDetailVOList = advanceDetailService.findAdvanceDetailListByAdvanceIds(advanceDTO);
+
+		return R.data(advanceDetailVOList);
+	}
+
+	@Override
+	public R findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO) {
+
+		List<AdvanceDetailVO> advanceDetailVOList = advanceDetailService.findAdvanceDetailListByWaybillId(advanceDTO);
+
+		return R.data(advanceDetailVOList);
+	}
+
 	private List<EditOrderMsgVO> verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {
 		log.info("###################verifyData: 验证改单数据");
 //		StringBuilder stringBuilder = new StringBuilder();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@@ -11,6 +11,7 @@ import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
 import com.logpm.distribution.vo.OrderPackgeCodeDataVO;
+import com.logpm.trunkline.dto.AdvanceDTO;
 import com.logpm.trunkline.dto.AdvanceDetailDTO;
 import com.logpm.trunkline.dto.OrderDetailsDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
@@ -18,11 +19,7 @@ import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.mapper.TrunklineAdvanceDetailMapper;
 import com.logpm.trunkline.mapper.TrunklineAdvanceMapper;
 import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
-import com.logpm.trunkline.vo.AdvanceDetailGoodsVO;
-import com.logpm.trunkline.vo.AdvanceDetailStockNumVO;
-import com.logpm.trunkline.vo.BillladingPackageVO;
-import com.logpm.trunkline.vo.OrderDetailInfoVO;
-import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
+import com.logpm.trunkline.vo.*;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
@@ -350,4 +347,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		List<TrunklineAdvanceDetailEntity> advanceDetailEntities = baseMapper.selectList(queryWrapper);
 		return advanceDetailEntities;
 	}
+
+	@Override
+	public List<AdvanceDetailVO> findAdvanceDetailListByAdvanceIds(AdvanceDTO advanceDTO) {
+		return baseMapper.findAdvanceDetailListByAdvanceIds(advanceDTO);
+	}
+
+	@Override
+	public List<AdvanceDetailVO> findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO) {
+		return baseMapper.findAdvanceDetailListByWaybillId(advanceDTO);
+	}
 }

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

@@ -588,6 +588,13 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				throw new CustomerException(403, "订单信息不存在");
 			}
 
+			String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
+			if(!"20".equals(orderPackageStatus)){
+				log.warn("#################findUpShelfScanGoods: 包件已不在库 orderPackageStatus={}", orderPackageStatus);
+				throw new CustomerException(403, "包件已不在库");
+			}
+
+
 			String orderPackageGroundingStatus = parcelListEntity.getOrderPackageGroundingStatus();
 //			if("20".equals(orderPackageGroundingStatus)){
 //				log.warn("#################findUpShelfScanGoods: 包件已上架 code={}",code);