Merge remote-tracking branch 'origin/pre-production'

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -308,6 +308,7 @@
             <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30,40) and lap.processing_status = '4'  </if>
             <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100)  and lacr.warehouse_id=#{param.warehouseId} </if>
             <if test="param.customerServiceState!= null and param.customerServiceState == 80 ">and lawo.work_order_status in (20,30,10,40,60,100,21,70)   </if>
+            GROUP BY lawo.id
             ORDER BY lawo.create_time DESC
         </where>
     </select>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -118,9 +118,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	@Override
 	public List<AftersalesWorkOrderExcel> exportAftersalesWorkOrder(Map<String, Object> aftersalesWorkOrder) {
-		Object o = aftersalesWorkOrder.get("ids");
-
-
+		String o = (String) aftersalesWorkOrder.get("ids");
+		if (!Objects.isNull(o)){
+			aftersalesWorkOrder.put("ids",o);
+		}
 		//查询用户角色信息
 		BladeUser user = AuthUtil.getUser();
 		String roleName = user.getRoleName();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -183,14 +184,28 @@ public class BasicdataDriverArteryController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicdataDriverArtery")
 	public R save(@Valid @RequestBody BasicdataDriverArteryDTO basicdataDriverArtery) {
-		List<BasicdataDriverArteryEntity> list = basicdataDriverArteryService.list(Wrappers.<BasicdataDriverArteryEntity>query().lambda()
-			.eq(BasicdataDriverArteryEntity::getUserId, basicdataDriverArtery.getUserId())
+		LambdaQueryWrapper<BasicdataDriverArteryEntity> eq = Wrappers.<BasicdataDriverArteryEntity>query().lambda();
+		String phone = basicdataDriverArtery.getPhone();
+		if (Objects.isNull(phone)){
+			return R.fail("请输入司机手机号码!!!");
+		}
+		LambdaQueryWrapper<BasicdataDriverArteryEntity> wrapper = eq.eq(BasicdataDriverArteryEntity::getPhone, phone);
+		List<BasicdataDriverArteryEntity> list1 = basicdataDriverArteryService.list(wrapper);
+		if (!list1.isEmpty()) {
+			return R.fail("此电话已绑定司机！不要重复绑定！！！");
+		}
+		String name = basicdataDriverArtery.getName();
+		if (Objects.isNull(name)){
+			return R.fail("请输入司机手机号码!!!");
+		}
+		List<BasicdataDriverArteryEntity> list2 = basicdataDriverArteryService.list(Wrappers.<BasicdataDriverArteryEntity>query().lambda()
+			.eq(BasicdataDriverArteryEntity::getUserId, AuthUtil.getUserId())
 			.eq(BasicdataDriverArteryEntity::getIsDeleted, 0)
 		);
-		if (!list.isEmpty()) {
+		if (!list2.isEmpty()) {
 			return R.fail("绑定的用户已存在！不要重复绑定！！！");
 		}
-		String phone = basicdataDriverArtery.getPhone();
+
 		R<User> userR = userClient
 			.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);
 		if (Func.isNotEmpty(userR.getData())) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionLoadscanAbnormalController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.controller;
 
+import com.logpm.distribution.dto.DistributionLoadscanAbnormalDTO;
 import com.logpm.distribution.entity.DistributionLoadscanAbnormalEntity;
 import com.logpm.distribution.excel.DistributionLoadscanAbnormalExcel;
 import com.logpm.distribution.service.IDistributionLoadscanAbnormalService;
@@ -90,6 +91,18 @@ public class DistributionLoadscanAbnormalController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 异常记录
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入distributionLoadscanAbnormal")
+	public R pageList(DistributionLoadscanAbnormalDTO distributionLoadscanAbnormal, Query query) {
+		R r = distributionLoadscanAbnormalService.pageList(Condition.getPage(query), distributionLoadscanAbnormal);
+		String aa ="";
+		return r ;
+	}
+
 	/**
 	 * 异常装车扫描表 新增
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionLoadscanAbnormalDTO.java

@@ -20,6 +20,8 @@ import com.logpm.distribution.entity.DistributionLoadscanAbnormalEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 异常装车扫描表 数据传输对象实体类
  *
@@ -31,4 +33,6 @@ import lombok.EqualsAndHashCode;
 public class DistributionLoadscanAbnormalDTO extends DistributionLoadscanAbnormalEntity {
 	private static final long serialVersionUID = 1L;
 
+	private List<Long> warehouseIds;
+
 }

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

@@ -764,6 +764,7 @@
             AND EXISTS (
             SELECT 1
             FROM logpm_distribution_parcel_list ldpll
+            LEFT JOIN logpm_warehouse_waybill AS lww ON ldpll.waybill_number = lww.waybill_no AND lww.is_deleted = 0
             WHERE
             ldsa.id = ldpll.stock_article_id
             AND ldpll.is_transfer = 0
@@ -773,6 +774,7 @@
             AND ldpll.conditions != 2
             AND ldpll.warehouse_id = #{par.warehouseId}
             AND ldsa.type_service = #{par.typeService}
+            AND IFNULL(lww.abolish_status,0) = 0
             <if test="par.orderCode != null and par.orderCode != '' ">
                 and ldpll.order_code like concat('%',#{par.orderCode},'%')
             </if>

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

@@ -18,10 +18,13 @@ package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionLoadscanAbnormalDTO;
 import com.logpm.distribution.entity.DistributionLoadscanAbnormalEntity;
 import com.logpm.distribution.excel.DistributionLoadscanAbnormalExcel;
 import com.logpm.distribution.vo.DistributionLoadscanAbnormalVO;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
 import java.util.List;
 
 /**
@@ -66,4 +69,13 @@ public interface IDistributionLoadscanAbnormalService extends BaseService<Distri
 	 * @return
 	 */
     boolean isHaveAbnormalPackage(Long reservationId, Long deliveryId, Long warehouseId);
+
+	/**
+	 * 查询异常记录列表
+	 * @param page
+	 * @param distributionLoadscanAbnormal
+	 * @return
+	 */
+	R pageList(IPage<Object> page, DistributionLoadscanAbnormalDTO distributionLoadscanAbnormal);
+
 }

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

@@ -824,7 +824,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //	synchronized
 	public R loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 
-
 		//查询该包件是否能够从库存品包件表中查到
 		String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
 

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

@@ -17,18 +17,25 @@
 package com.logpm.distribution.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.dto.DistributionLoadscanAbnormalDTO;
 import com.logpm.distribution.entity.DistributionLoadscanAbnormalEntity;
 import com.logpm.distribution.excel.DistributionLoadscanAbnormalExcel;
 import com.logpm.distribution.mapper.DistributionLoadscanAbnormalMapper;
 import com.logpm.distribution.service.IDistributionLoadscanAbnormalService;
 import com.logpm.distribution.vo.DistributionLoadscanAbnormalVO;
+import lombok.AllArgsConstructor;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.loading.LoadingAbnormalAuditingStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 异常装车扫描表 服务实现类
@@ -37,8 +44,11 @@ import java.util.List;
  * @since 2023-09-22
  */
 @Service
+@AllArgsConstructor
 public class DistributionLoadscanAbnormalServiceImpl extends BaseServiceImpl<DistributionLoadscanAbnormalMapper, DistributionLoadscanAbnormalEntity> implements IDistributionLoadscanAbnormalService {
 
+	private final IBasicdataWarehouseClient warehouseClient;
+
 	@Override
 	public IPage<DistributionLoadscanAbnormalVO> selectDistributionLoadscanAbnormalPage(IPage<DistributionLoadscanAbnormalVO> page, DistributionLoadscanAbnormalVO distributionLoadscanAbnormal) {
 		return page.setRecords(baseMapper.selectDistributionLoadscanAbnormalPage(page, distributionLoadscanAbnormal));
@@ -66,4 +76,22 @@ public class DistributionLoadscanAbnormalServiceImpl extends BaseServiceImpl<Dis
 		return baseMapper.isHaveAbnormalPackage(reservationId,deliveryId,warehouseId) == 0;
 	}
 
+	@Override
+	public R pageList(IPage<Object> page, DistributionLoadscanAbnormalDTO distributionLoadscanAbnormal) {
+		//查询当前仓信息
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Objects.isNull(myCurrentWarehouse)){
+			//查询所有仓信息
+			List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
+			if (!warehouseList.isEmpty()) {
+				distributionLoadscanAbnormal.setWarehouseIds(warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()));
+			}
+			return R.fail("仓库信息错误");
+		}
+
+
+
+		return null;
+	}
+
 }

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java

@@ -219,9 +219,9 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceEntity.setServiceNum(orderInfoVO.getCustomOrderNo());
 			advanceEntity.setSenderFactory(vo.getOrgName());
 			// 门店是商场
-			advanceEntity.setDealerCode(orderInfoVO.getShopCode());
+			// advanceEntity.setDealerCode(orderInfoVO.getShopCode());
 			advanceEntity.setDealerName(orderInfoVO.getShopName());
-			advanceEntity.setStoreCode(orderInfoVO.getShopCode());
+			// advanceEntity.setStoreCode(orderInfoVO.getShopCode());
 			advanceEntity.setStoreName(orderInfoVO.getShopName());
 			// 安装是客户
 			advanceEntity.setCustomerName(orderInfoVO.getInstallLinker());
@@ -414,9 +414,9 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceEntity.setSenderFactory(IDict.getTextByCode(BusSourceEnums.class, order.getBusSource()));
 
 			advanceEntity.setOrderCode(orderInfo.getOmsExtOrderNo());
-			advanceEntity.setDealerCode(orderInfo.getShopCode());
+			// advanceEntity.setDealerCode(orderInfo.getShopCode());
 			advanceEntity.setDealerName(orderInfo.getShopName());
-			advanceEntity.setStoreCode(orderInfo.getShopCode());
+			// advanceEntity.setStoreCode(orderInfo.getShopCode());
 			advanceEntity.setStoreName(orderInfo.getShopName());
 			advanceEntity.setServiceNum(orderInfo.getOmsExtYsId());
 			// 安装

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -917,5 +917,46 @@ public class SyncOrderInfoToPlatform {
 		return ReturnT.SUCCESS;
 	}
 
+	@XxlJob("syncWaybillInfoParceList")
+	public ReturnT<String>  syncWaybillInfoParceList(String param) {
+		log.info("############syncWaybillInfoParceList: 同步运单下订单信息  开始");
+
+		if(StringUtil.isBlank(param)){
+			log.warn("###########syncWaybillOrderInfo: 仓库id为空");
+			throw new CustomerException(405,"仓库id为空");
+		}
+
+		List<JSONObject> list =  warehouseMappingDataService.findAllNeedWaybillList();
+
+		list.forEach(json -> {
+
+			Integer id = json.getInt("id");
+			String waybillNo = json.getStr("waybillNo");
+
+			WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+			if(Objects.isNull(warehouseWaybillEntity)){
+				log.warn("###########syncWaybillOrderInfo: 运单信息为空");
+				throw new CustomerException(405,"运单信息为空");
+			}
+
+			List<String> orderCodes = warehouseMappingDataService.findOrderCodeList(waybillNo);
+
+			Long waybillId = warehouseWaybillEntity.getId();
+			Long departureWarehouseId = warehouseWaybillEntity.getDepartureWarehouseId();
+			String departureWarehouseName = warehouseWaybillEntity.getDepartureWarehouseName();
+			Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();
+			String destinationWarehouseName = warehouseWaybillEntity.getDestinationWarehouseName();
+
+			warehouseMappingDataService.updateParcelListWaybillInfo(orderCodes,waybillId,waybillNo,departureWarehouseId,departureWarehouseName,destinationWarehouseId,destinationWarehouseName);
+
+
+			warehouseMappingDataService.updateRepairParcelListWaybillById(id,1);
+		});
+
+		log.info("############syncWaybillOrderInfo: 同步运单信息  完成");
+
+		return ReturnT.SUCCESS;
+	}
+
 
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java

@@ -138,5 +138,13 @@ public interface WarehouseMappingDataMapper {
     List<JSONObject> findSyncWaybillOrderInfo();
 
 	void updateSyncWaybillOrderRecordById(@Param("id") Integer id, @Param("status") int status);
+
+    List<JSONObject> findAllNeedWaybillList();
+
+	List<String> findOrderCodeList(@Param("waybillNo") String waybillNo);
+
+	void updateParcelListWaybillInfo(@Param("orderCodes") List<String> orderCodes, @Param("waybillId") Long waybillId, @Param("waybillNo") String waybillNo, @Param("departureWarehouseId") Long departureWarehouseId, @Param("departureWarehouseName") String departureWarehouseName, @Param("destinationWarehouseId") Long destinationWarehouseId, @Param("destinationWarehouseName") String destinationWarehouseName);
+
+	void updateRepairParcelListWaybillById(@Param("id") Integer id, @Param("status") int status);
 }
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -451,4 +451,40 @@
         where id = #{id}
     </update>
 
+    <select id="findAllNeedWaybillList" resultType="cn.hutool.json.JSONObject">
+        select id id,
+               waybill_no waybillNo,
+               warehouse_id warehouseId
+        from repair_parcel_list_waybill
+        where status = 0
+    </select>
+
+    <select id="findOrderCodeList" resultType="string">
+        select order_code
+        from logpm_trunkline_waybill_order
+        where waybill_no = #{waybillNo}
+        and is_deleted = 0
+    </select>
+
+    <update id="updateParcelListWaybillInfo">
+        update logpm_distribution_parcel_list
+        set ldpl.waybill_id = #{waybillId},
+            ldpl.waybill_number = #{waybillNo},
+            ldpl.send_warehouse_name = #{departureWarehouseName},
+            ldpl.send_warehouse_id = #{departureWarehouseId},
+            ldpl.accept_warehouse_id = #{destinationWarehouseId},
+            ldpl.accept_warehouse_name = #{destinationWarehouseName}
+        where ldpl.order_code in
+        <foreach collection="orderCodes" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updateRepairParcelListWaybillById" >
+        update repair_parcel_list_waybill
+        set status = #{status}
+        where id = #{id}
+    </update>
+
+
 </mapper>

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java

@@ -119,4 +119,12 @@ public interface IWarehouseMappingDataService {
     List<JSONObject> findSyncWaybillOrderInfo();
 
 	void updateSyncWaybillOrderRecordById(Integer id, int status);
+
+    List<JSONObject> findAllNeedWaybillList();
+
+	List<String> findOrderCodeList(String waybillNo);
+
+	void updateParcelListWaybillInfo(List<String> orderCodes, Long waybillId, String waybillNo, Long departureWarehouseId, String departureWarehouseName, Long destinationWarehouseId, String destinationWarehouseName);
+
+	void updateRepairParcelListWaybillById(Integer id, int status);
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java

@@ -285,4 +285,24 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer
 	public void updateSyncWaybillOrderRecordById(Integer id, int status) {
 		warehouseMappingDataMapper.updateSyncWaybillOrderRecordById(id,status);
 	}
+
+	@Override
+	public List<JSONObject> findAllNeedWaybillList() {
+		return warehouseMappingDataMapper.findAllNeedWaybillList();
+	}
+
+	@Override
+	public List<String> findOrderCodeList(String waybillNo) {
+		return warehouseMappingDataMapper.findOrderCodeList(waybillNo);
+	}
+
+	@Override
+	public void updateParcelListWaybillInfo(List<String> orderCodes, Long waybillId, String waybillNo, Long departureWarehouseId, String departureWarehouseName, Long destinationWarehouseId, String destinationWarehouseName) {
+		warehouseMappingDataMapper.updateParcelListWaybillInfo(orderCodes,waybillId,waybillNo,departureWarehouseId,departureWarehouseName,destinationWarehouseId,destinationWarehouseName);
+	}
+
+	@Override
+	public void updateRepairParcelListWaybillById(Integer id, int status) {
+		warehouseMappingDataMapper.updateRepairParcelListWaybillById(id,status);
+	}
 }

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

@@ -87,4 +87,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
 	void updateWaybillNoByAdvanceIds(@Param("advanceIds") List<Long> advanceIds, @Param("waybillNo") String waybillNo, @Param("waybillId") Long waybillId);
 
 	List<TrunklineAdvanceDetailVO> findListByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
+
+	void deleteByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
 }

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

@@ -565,4 +565,12 @@
         </foreach>
     </select>
 
+    <delete id="deleteByAdvanceIds" >
+        delete from logpm_trunkline_advance_detail
+        where advance_id in
+        <foreach collection="advanceIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>

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

@@ -104,4 +104,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
 	void updateWaybillNoByAdvanceIds(List<Long> advanceIds, String waybillNo, Long waybillId);
 
 	List<TrunklineAdvanceDetailVO> findListByAdvanceIds(List<Long> advanceIds);
+
+	void deleteByAdvanceIds(List<Long> advanceIds);
 }

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

@@ -1059,9 +1059,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			throw new CustomerException(405, "已有包件出库，不能删除");
 		}
 
-		for (Long advanceId : advanceIds) {
-			advanceDetailService.deleteByAdvanceId(advanceId);
-		}
+
+		advanceDetailService.deleteByAdvanceIds(advanceIds);
 		advanceService.deletedAdvance(advanceIds);
 
 		//删除所有在库包件，并更新订单信息

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

@@ -552,4 +552,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public List<TrunklineAdvanceDetailVO> findListByAdvanceIds(List<Long> advanceIds) {
 		return baseMapper.findListByAdvanceIds(advanceIds);
 	}
+
+	@Override
+	public void deleteByAdvanceIds(List<Long> advanceIds) {
+		baseMapper.deleteByAdvanceIds(advanceIds);
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehousingEntryDetailExcel.java

@@ -135,12 +135,12 @@ public class WarehousingEntryDetailExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("物品名称")
 	private String productName;
-//	/**
-//	 * 物品编码
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("物品编码")
-//	private String productCode;
+	/**
+	 * 物品编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物品编码")
+	private String productCode;
 //	/**
 //	 * 物品单位
 //	 */

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

@@ -594,14 +594,16 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				WarehouseWarehousingDetailEntity detail = new WarehouseWarehousingDetailEntity();
 				detail.setConditions("1");
 				String materialName = i.getProductName().trim();
-				BasicMaterialEntity entityByName = basicMaterialClient.findEntityByName(materialName);
-				if (!Objects.isNull(entityByName)){
-					detail.setSku(entityByName.getSku());
-					detail.setProductCode(entityByName.getProductCode());
-					detail.setProductName(entityByName.getName());
-					detail.setProductUnit(entityByName.getLogpmUnit());
-					detail.setPackagingSpecifications(entityByName.getPackingSpecification());
+				String productCode = i.getProductCode().trim();
+				BasicMaterialEntity entity = basicMaterialClient.findEntityByCodeAndName(productCode,materialName);
+				if (!Objects.isNull(entity)){
+					detail.setSku(entity.getSku());
+					detail.setProductCode(entity.getProductCode());
+					detail.setProductName(entity.getName());
+					detail.setProductUnit(entity.getLogpmUnit());
+					detail.setPackagingSpecifications(entity.getPackingSpecification());
 				}
+
 //				detail.setProductCode(i.getProductCode().trim());
 //				detail.setProductName(i.getProductName().trim());
 //				detail.setProductUnit(i.getProductUnit().trim());