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

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -51,6 +51,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -202,8 +203,9 @@ public class BasicMaterialController extends BladeController {
 			log.info("物料添加失败！");
 			return R.fail("添加失败，必填物料信息不完整为空！");
 		}
-
-		checkBasicMaterialEntity(basicMaterial);
+		if (Objects.isNull(basicMaterial.getId())){
+			checkBasicMaterialEntity(basicMaterial);
+		}
 
 		return R.status(basicMaterialService.saveOrUpdateOwn(basicMaterial));
 	}

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

@@ -236,7 +236,7 @@
         </where>
         ) AS c ON c.parcel_list_id = ldpl.id
         <where>
-            ldpl.is_deleted = 0
+            ldpl.is_deleted = 0 AND ldpl.is_transfer = 0
             <if test="param.warehouse !='' and param.warehouse != null">
                 and lww.name like concat('%',#{param.warehouse},'%')
             </if>
@@ -1205,7 +1205,7 @@
     </select>
     <select id="selectByOrderPackageCode"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
-        SELECT * FROM logpm_distribution_parcel_list WHERE order_package_code = #{orderPackageCode} and warehouse_id = #{warehouseId}
+        SELECT * FROM logpm_distribution_parcel_list WHERE order_package_code = #{orderPackageCode} and warehouse_id = #{warehouseId} AND is_transfer = 0
     </select>
     <select id="getPackageListByMap" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT

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

@@ -3626,6 +3626,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 				.eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 				.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+				.eq(DistributionParcelListEntity::getIsTransfer, 0)
 			);
 			DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
 			DistributionDeliverySelfEntity deliverySelfEntity = distributionDeliveryListService.getDriver(distributionDeliveryListEntity, user, null, driver);